[Scummvm-cvs-logs] SF.net SVN: scummvm: [26660] scummvm/trunk/backends/platform/wince/CEScaler .cpp

[knakos at users.sourceforge.net]

Revision: 26660
          http://scummvm.svn.sourceforge.net/scummvm/?rev=26660&view=rev
Author:   knakos
Date:     2007-04-28 10:37:41 -0700 (Sat, 28 Apr 2007)

Log Message:
-----------
more logical formatting for scaler code, at least for me :-)

Modified Paths:
--------------
    scummvm/trunk/backends/platform/wince/CEScaler.cpp

Modified: scummvm/trunk/backends/platform/wince/CEScaler.cpp
===================================================================
--- scummvm/trunk/backends/platform/wince/CEScaler.cpp	2007-04-28 17:35:18 UTC (rev 26659)
+++ scummvm/trunk/backends/platform/wince/CEScaler.cpp	2007-04-28 17:37:41 UTC (rev 26660)
@@ -1,5 +1,5 @@
 /* ScummVM - Scumm Interpreter
- * Copyright (C) 2001-2006 The ScummVM project
+ * Copyright (C) 2001-2007 The ScummVM project
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -89,42 +89,39 @@
 	unsigned int p2;
 	uint16 * inbuf;
 	uint16 * outbuf;
-	inbuf=(uint16 *)srcPtr;
-	outbuf=(uint16 *)dstPtr;
+	inbuf = (uint16 *)srcPtr;
+	outbuf = (uint16 *)dstPtr;
 
 	uint16 srcPitch16 = (uint16)(srcPitch / sizeof(uint16));
 	uint16 dstPitch16 = (uint16)(dstPitch / sizeof(uint16));
 
-	for (i=0; i<((height)/6); i++) {
-        for (j=0; j<width; j++) {
-			p1=*((uint16*)inbuf+j);
-			inbuf+=srcPitch16;
-			*((uint16*)outbuf+j)=p1;
-			outbuf+=dstPitch16;
-			p2=*((uint16*)inbuf+j);
-			inbuf+=srcPitch16;
-			*((uint16*)outbuf+j)=MAKEPIXEL(P20(RB(p1))+P80(RB(p2)),P20(G(p1))+P80(G(p2)));  
-			outbuf+=dstPitch16;
-			p1=p2; 
-			p2=*((uint16*)inbuf+j);
-			inbuf+=srcPitch16;
-			*((uint16*)outbuf+j)=MAKEPIXEL(P40(RB(p1))+P60(RB(p2)),P40(G(p1))+P60(G(p2)));  
-			outbuf+=dstPitch16;
-			p1=p2;
-			p2=*((uint16*)inbuf+j);
-			inbuf+=srcPitch16;
-			*((uint16*)outbuf+j)=MAKEPIXEL(P60(RB(p1))+P40(RB(p2)),P60(G(p1))+P40(G(p2)));  
-			outbuf+=dstPitch16;
-			p1=p2;
-			p2=*((uint16*)inbuf+j);
-			*((uint16*)outbuf+j)=MAKEPIXEL(P80(RB(p1))+P20(RB(p2)),P80(G(p1))+P20(G(p2)));  
-			outbuf+=dstPitch16;
-			*((uint16*)outbuf+j)=p2;
-			inbuf=inbuf-srcPitch16*4;   
-			outbuf=outbuf-dstPitch16*5; 
+	for (i = 0; i < height/6; i++) {
+		for (j=0; j < width; j++) {
+			p1 = *((uint16*)inbuf+j); inbuf += srcPitch16;
+			*((uint16*)outbuf+j) = p1; outbuf += dstPitch16;
+
+			p2 = *((uint16*)inbuf+j); inbuf += srcPitch16;
+			*((uint16*)outbuf+j) = MAKEPIXEL(P20(RB(p1))+P80(RB(p2)),P20(G(p1))+P80(G(p2)));  outbuf += dstPitch16;
+
+			p1 = p2; 
+			p2 = *((uint16*)inbuf+j); inbuf += srcPitch16;
+			*((uint16*)outbuf+j) = MAKEPIXEL(P40(RB(p1))+P60(RB(p2)),P40(G(p1))+P60(G(p2)));  outbuf += dstPitch16;
+
+			p1 = p2;
+			p2 = *((uint16*)inbuf+j); inbuf += srcPitch16;
+			*((uint16*)outbuf+j) = MAKEPIXEL(P60(RB(p1))+P40(RB(p2)),P60(G(p1))+P40(G(p2)));  outbuf += dstPitch16;
+
+			p1 = p2;
+			p2 = *((uint16*)inbuf+j);
+			*((uint16*)outbuf+j) = MAKEPIXEL(P80(RB(p1))+P20(RB(p2)),P80(G(p1))+P20(G(p2)));  outbuf += dstPitch16;
+
+			*((uint16*)outbuf+j) = p2;
+			
+			inbuf = inbuf - srcPitch16*4;   
+			outbuf = outbuf - dstPitch16*5; 
 		}      
-        inbuf=inbuf+srcPitch16*5;
-        outbuf=outbuf+dstPitch16*6;
+		inbuf = inbuf + srcPitch16*5;
+		outbuf = outbuf + dstPitch16*6;
 	}
 }
 


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