[Scummvm-cvs-logs] CVS: scummvm/common scaler.cpp,1.38,1.39

Torbj?rn Andersson eriktorbjorn at users.sourceforge.net
Sun Sep 21 08:51:09 CEST 2003


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

Modified Files:
	scaler.cpp 
Log Message:
Applied ScummVM formatting conventions


Index: scaler.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/common/scaler.cpp,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -d -r1.38 -r1.39
--- scaler.cpp	21 Sep 2003 12:10:30 -0000	1.38
+++ scaler.cpp	21 Sep 2003 15:46:27 -0000	1.39
@@ -736,8 +736,7 @@
 #define PIXEL22_5   *(q+2+nextlineDst2) = INTERPOLATE_1_1(w[6], w[8]);
 #define PIXEL22_C   *(q+2+nextlineDst2) = w[5];
 
-static inline bool diffYUV(unsigned int yuv1, unsigned int yuv2)
-{
+static inline bool diffYUV(unsigned int yuv1, unsigned int yuv2) {
 	static const  int   Ymask = 0x00FF0000;
 	static const  int   Umask = 0x0000FF00;
 	static const  int   Vmask = 0x000000FF;
@@ -751,8 +750,7 @@
 	    ( abs((yuv1 & Vmask) - (yuv2 & Vmask)) > trV ) );
[...6105 lines suppressed...]
 	int i, j, k, r, g, b, Y, u, v;
 
-	for (i=0; i<32; i++) {
+	for (i = 0; i < 32; i++) {
 		r = i << 3;
-		for (j=0; j<64; j++) {
+		for (j = 0; j < 64; j++) {
 			g = j << 2;
-			for (k=0; k<32; k++) {
+			for (k = 0; k < 32; k++) {
 				b = k << 3;
 				Y = (r + g + b) >> 2;
 				u = 128 + ((r - b) >> 2);
-				v = 128 + ((-r + 2*g -b)>>3);
-				RGBtoYUV[ (i << 11) + (j << 5) + k ] = (Y<<16) + (u<<8) + v;
+				v = 128 + ((-r + 2 * g -b) >> 3);
+				RGBtoYUV[ (i << 11) + (j << 5) + k ] = (Y << 16) + (u << 8) + v;
 			}
 		}
 	}





More information about the Scummvm-git-logs mailing list