From 14fae8db03e5a314ec19277ef497fbaae03d6177 Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Wed, 26 May 2010 11:56:58 +0000
Subject: Proper fix for the MSVC warning concerning packing: reordered the
 members of the ParseTable struct and removed the struct packing pragmas

svn-id: r49235
---
 graphics/video/qt_decoder.cpp | 50 +++++++++++++++++++++----------------------
 graphics/video/qt_decoder.h   |  8 ++-----
 2 files changed, 27 insertions(+), 31 deletions(-)

(limited to 'graphics')

diff --git a/graphics/video/qt_decoder.cpp b/graphics/video/qt_decoder.cpp
index 1628e0f308..244ed14a53 100644
--- a/graphics/video/qt_decoder.cpp
+++ b/graphics/video/qt_decoder.cpp
@@ -379,31 +379,31 @@ void QuickTimeDecoder::init() {
 
 void QuickTimeDecoder::initParseTable() {
 	static const ParseTable p[] = {
-		{ MKID_BE('dinf'), &QuickTimeDecoder::readDefault },
-		{ MKID_BE('dref'), &QuickTimeDecoder::readLeaf },
-		{ MKID_BE('edts'), &QuickTimeDecoder::readDefault },
-		{ MKID_BE('elst'), &QuickTimeDecoder::readELST },
-		{ MKID_BE('hdlr'), &QuickTimeDecoder::readHDLR },
-		{ MKID_BE('mdat'), &QuickTimeDecoder::readMDAT },
-		{ MKID_BE('mdhd'), &QuickTimeDecoder::readMDHD },
-		{ MKID_BE('mdia'), &QuickTimeDecoder::readDefault },
-		{ MKID_BE('minf'), &QuickTimeDecoder::readDefault },
-		{ MKID_BE('moov'), &QuickTimeDecoder::readMOOV },
-		{ MKID_BE('mvhd'), &QuickTimeDecoder::readMVHD },
-		{ MKID_BE('smhd'), &QuickTimeDecoder::readLeaf },
-		{ MKID_BE('stbl'), &QuickTimeDecoder::readDefault },
-		{ MKID_BE('stco'), &QuickTimeDecoder::readSTCO },
-		{ MKID_BE('stsc'), &QuickTimeDecoder::readSTSC },
-		{ MKID_BE('stsd'), &QuickTimeDecoder::readSTSD },
-		{ MKID_BE('stss'), &QuickTimeDecoder::readSTSS },
-		{ MKID_BE('stsz'), &QuickTimeDecoder::readSTSZ },
-		{ MKID_BE('stts'), &QuickTimeDecoder::readSTTS },
-		{ MKID_BE('tkhd'), &QuickTimeDecoder::readTKHD },
-		{ MKID_BE('trak'), &QuickTimeDecoder::readTRAK },
-		{ MKID_BE('udta'), &QuickTimeDecoder::readLeaf },
-		{ MKID_BE('vmhd'), &QuickTimeDecoder::readLeaf },
-		{ MKID_BE('cmov'), &QuickTimeDecoder::readCMOV },
-		{ MKID_BE('wave'), &QuickTimeDecoder::readWAVE },
+		{ &QuickTimeDecoder::readDefault, MKID_BE('dinf') },
+		{ &QuickTimeDecoder::readLeaf,    MKID_BE('dref') },
+		{ &QuickTimeDecoder::readDefault, MKID_BE('edts') },
+		{ &QuickTimeDecoder::readELST,    MKID_BE('elst') },
+		{ &QuickTimeDecoder::readHDLR,    MKID_BE('hdlr') },
+		{ &QuickTimeDecoder::readMDAT,    MKID_BE('mdat') },
+		{ &QuickTimeDecoder::readMDHD,    MKID_BE('mdhd') },
+		{ &QuickTimeDecoder::readDefault, MKID_BE('mdia') },
+		{ &QuickTimeDecoder::readDefault, MKID_BE('minf') },
+		{ &QuickTimeDecoder::readMOOV,    MKID_BE('moov') },
+		{ &QuickTimeDecoder::readMVHD,    MKID_BE('mvhd') },
+		{ &QuickTimeDecoder::readLeaf,    MKID_BE('smhd') },
+		{ &QuickTimeDecoder::readDefault, MKID_BE('stbl') },
+		{ &QuickTimeDecoder::readSTCO,    MKID_BE('stco') },
+		{ &QuickTimeDecoder::readSTSC,    MKID_BE('stsc') },
+		{ &QuickTimeDecoder::readSTSD,    MKID_BE('stsd') },
+		{ &QuickTimeDecoder::readSTSS,    MKID_BE('stss') },
+		{ &QuickTimeDecoder::readSTSZ,    MKID_BE('stsz') },
+		{ &QuickTimeDecoder::readSTTS,    MKID_BE('stts') },
+		{ &QuickTimeDecoder::readTKHD,    MKID_BE('tkhd') },
+		{ &QuickTimeDecoder::readTRAK,    MKID_BE('trak') },
+		{ &QuickTimeDecoder::readLeaf,    MKID_BE('udta') },
+		{ &QuickTimeDecoder::readLeaf,    MKID_BE('vmhd') },
+		{ &QuickTimeDecoder::readCMOV,    MKID_BE('cmov') },
+		{ &QuickTimeDecoder::readWAVE,    MKID_BE('wave') },
 		{ 0, 0 }
 	};
 
diff --git a/graphics/video/qt_decoder.h b/graphics/video/qt_decoder.h
index 659ad855e4..db4ff8180b 100644
--- a/graphics/video/qt_decoder.h
+++ b/graphics/video/qt_decoder.h
@@ -136,14 +136,10 @@ protected:
 		uint32 size;
 	};
 
-#include "common/pack-start.h"	// START STRUCT PACKING
-
 	struct ParseTable {
-		uint32 type;
 		int (QuickTimeDecoder::*func)(MOVatom atom);
-	} PACKED_STRUCT;
-
-#include "common/pack-end.h"	// END STRUCT PACKING
+		uint32 type;
+	};
 
 	struct MOVstts {
 		int count;
-- 
cgit v1.2.3