[Scummvm-cvs-logs] CVS: scummvm/common/scaler intern.h,1.6,1.7

Max Horn fingolfin at users.sourceforge.net
Thu Oct 2 16:10:13 CEST 2003


Update of /cvsroot/scummvm/scummvm/common/scaler
In directory sc8-pr-cvs1:/tmp/cvs-serv21853/scaler

Modified Files:
	intern.h 
Log Message:
according to tsuteiuQ, this helps MSVC6 (seems it can cope with the enums but not with static consts)

Index: intern.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/common/scaler/intern.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- intern.h	2 Oct 2003 15:00:36 -0000	1.6
+++ intern.h	2 Oct 2003 23:09:54 -0000	1.7
@@ -44,22 +44,26 @@
 
 template<>
 struct ColorMasks<565> {
-	static const int highBits = 0xF7DEF7DE;
-	static const int lowBits = 0x08210821;
-	static const int qhighBits = 0xE79CE79C;
-	static const int qlowBits = 0x18631863;
-	static const int redblueMask = 0xF81F;
-	static const int greenMask = 0x07E0;
+	enum {
+		highBits = 0xF7DEF7DE,
+		lowBits = 0x08210821,
+		qhighBits = 0xE79CE79C,
+		qlowBits = 0x18631863,
+		redblueMask = 0xF81F,
+		greenMask = 0x07E0
+	};
 };
 
 template<>
 struct ColorMasks<555> {
-	static const int highBits = 0x04210421;
-	static const int lowBits = 0x04210421;
-	static const int qhighBits = 0x739C739C;
-	static const int qlowBits = 0x0C630C63;
-	static const int redblueMask = 0x7C1F;
-	static const int greenMask = 0x03E0;
+	enum {
+		highBits = 0x7BDE7BDE,
+		lowBits = 0x04210421,
+		qhighBits = 0x739C739C,
+		qlowBits = 0x0C630C63,
+		redblueMask = 0x7C1F,
+		greenMask = 0x03E0
+	};
 };
 
 #define highBits	ColorMasks<bitFormat>::highBits





More information about the Scummvm-git-logs mailing list