[Scummvm-cvs-logs] CVS: scummvm/common/scaler thumbnail.cpp,1.3,1.4

Lars Persson anotherguest at users.sourceforge.net
Sun Oct 2 14:02:17 CEST 2005


Update of /cvsroot/scummvm/scummvm/common/scaler
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13441/common/scaler

Modified Files:
	thumbnail.cpp 
Log Message:
1.Removed warning from symbian portdefs
2.Made thumbnail.cpp compile for VC6 (Symbian Emulator environment). Order of template declaration and includes causing the problems
3.Moved int i declaration from for;loop into local variable
4.Updated stdafx uio.h is not part of the Symbian build chain.

Index: thumbnail.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/common/scaler/thumbnail.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- thumbnail.cpp	30 Jul 2005 21:10:59 -0000	1.3
+++ thumbnail.cpp	30 Sep 2005 21:13:48 -0000	1.4
@@ -24,7 +24,6 @@
 #include "common/scummsys.h"
 #include "common/system.h"
 
-#include "common/scaler.h"
 #include "common/scaler/intern.h"
 
 template<int bitFormat>
@@ -69,6 +68,8 @@
 	}
 }
 
+#include "common/scaler.h"
+
 void createThumbnail(const uint8* src, uint32 srcPitch, uint8* dstPtr, uint32 dstPitch, int width, int height) {
 	// only 1/2 and 1/4 downscale supported
 	if (width != 320 && width != 640)





More information about the Scummvm-git-logs mailing list