[Scummvm-cvs-logs] SF.net SVN: scummvm:[49106] scummvm/trunk/engines/mohawk/video/qt_player.h

[thebluegr at users.sourceforge.net]

Revision: 49106
          http://scummvm.svn.sourceforge.net/scummvm/?rev=49106&view=rev
Author:   thebluegr
Date:     2010-05-19 17:18:20 +0000 (Wed, 19 May 2010)

Log Message:
-----------
Reverted commit #49088, seems like to be a false positive from MSVC on the QTPlayer::*func pointer of the ParseTable struct (warning 4121, alignment of a member was sensitive to packing)

Modified Paths:
--------------
    scummvm/trunk/engines/mohawk/video/qt_player.h

Modified: scummvm/trunk/engines/mohawk/video/qt_player.h
===================================================================
--- scummvm/trunk/engines/mohawk/video/qt_player.h	2010-05-19 17:16:15 UTC (rev 49105)
+++ scummvm/trunk/engines/mohawk/video/qt_player.h	2010-05-19 17:18:20 UTC (rev 49106)
@@ -124,8 +124,6 @@
 	// This is the file handle from which data is read from. It can be the actual file handle or a decompressed stream.
 	Common::SeekableReadStream *_fd;
 
-#include "common/pack-start.h"	// START STRUCT PACKING
-
 	struct MOVatom {
 		uint32 type;
 		uint32 offset;
@@ -216,8 +214,6 @@
 		ScaleMode scaleMode;
 	};
 
-#include "common/pack-end.h"	// END STRUCT PACKING
-
 	const ParseTable *_parseTable;
 	bool _foundMOOV;
 	bool _foundMDAT;


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