[Scummvm-cvs-logs] SF.net SVN: scummvm:[49235] scummvm/trunk/graphics/video

[thebluegr at users.sourceforge.net]

Revision: 49235
          http://scummvm.svn.sourceforge.net/scummvm/?rev=49235&view=rev
Author:   thebluegr
Date:     2010-05-26 11:56:58 +0000 (Wed, 26 May 2010)

Log Message:
-----------
Proper fix for the MSVC warning concerning packing: reordered the members of the ParseTable struct and removed the struct packing pragmas

Modified Paths:
--------------
    scummvm/trunk/graphics/video/qt_decoder.cpp
    scummvm/trunk/graphics/video/qt_decoder.h

Modified: scummvm/trunk/graphics/video/qt_decoder.cpp
===================================================================
--- scummvm/trunk/graphics/video/qt_decoder.cpp	2010-05-26 11:02:50 UTC (rev 49234)
+++ scummvm/trunk/graphics/video/qt_decoder.cpp	2010-05-26 11:56:58 UTC (rev 49235)
@@ -379,31 +379,31 @@
 
 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 }
 	};
 

Modified: scummvm/trunk/graphics/video/qt_decoder.h
===================================================================
--- scummvm/trunk/graphics/video/qt_decoder.h	2010-05-26 11:02:50 UTC (rev 49234)
+++ scummvm/trunk/graphics/video/qt_decoder.h	2010-05-26 11:56:58 UTC (rev 49235)
@@ -136,15 +136,11 @@
 		uint32 size;
 	};
 
-#include "common/pack-start.h"	// START STRUCT PACKING
-
 	struct ParseTable {
-		uint32 type;
 		int (QuickTimeDecoder::*func)(MOVatom atom);
-	} PACKED_STRUCT;
+		uint32 type;
+	};
 
-#include "common/pack-end.h"	// END STRUCT PACKING
-
 	struct MOVstts {
 		int count;
 		int duration;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.