[Scummvm-cvs-logs] SF.net SVN: scummvm:[42844] scummvm/trunk/graphics/scaler.cpp

lordhoto at users.sourceforge.net lordhoto at users.sourceforge.net
Mon Jul 27 19:04:06 CEST 2009


Revision: 42844
          http://scummvm.svn.sourceforge.net/scummvm/?rev=42844&view=rev
Author:   lordhoto
Date:     2009-07-27 17:04:06 +0000 (Mon, 27 Jul 2009)

Log Message:
-----------
Formatting.

Modified Paths:
--------------
    scummvm/trunk/graphics/scaler.cpp

Modified: scummvm/trunk/graphics/scaler.cpp
===================================================================
--- scummvm/trunk/graphics/scaler.cpp	2009-07-27 16:29:36 UTC (rev 42843)
+++ scummvm/trunk/graphics/scaler.cpp	2009-07-27 17:04:06 UTC (rev 42844)
@@ -189,22 +189,20 @@
 #ifndef DISABLE_SCALERS
 #ifdef USE_ARM_SCALER_ASM
 extern "C" void Normal2xAspectMask(const uint8  *srcPtr,
-                                   uint32  srcPitch,
-                                   uint8  *dstPtr,
-                                   uint32  dstPitch,
-                                   int     width,
-                                   int     height,
-                                   uint32  mask);
+                                         uint32  srcPitch,
+                                         uint8  *dstPtr,
+                                         uint32  dstPitch,
+                                         int     width,
+                                         int     height,
+                                         uint32  mask);
                                    
 void Normal2xAspect(const uint8  *srcPtr,
                           uint32  srcPitch,
                           uint8  *dstPtr,
                           uint32  dstPitch,
                           int     width,
-                          int     height)
-{
-	if (gBitFormat == 565)
-	{
+                          int     height) {
+	if (gBitFormat == 565) {
 		Normal2xAspectMask(srcPtr,
 		                   srcPitch,
 		                   dstPtr,
@@ -212,9 +210,7 @@
 		                   width,
 		                   height,
 		                   0x07e0F81F);
-	}
-	else
-	{
+	} else {
 		Normal2xAspectMask(srcPtr,
 		                   srcPitch,
 		                   dstPtr,
@@ -229,18 +225,18 @@
                                   uint32  srcPitch,
                                   uint8  *dstPtr,
                                   uint32  dstPitch,
-              		    int     width,
-              		    int     height);
+                                  int     width,
+                                  int     height);
 
 void Normal2x(const uint8  *srcPtr,
                     uint32  srcPitch,
                     uint8  *dstPtr,
                     uint32  dstPitch,
-		    int     width,
-		    int     height)
-{
+                    int     width,
+                    int     height) {
 	Normal2xARM(srcPtr, srcPitch, dstPtr, dstPitch, width, height);
 }
+
 #else
 /**
  * Trivial nearest-neighbour 2x scaler.


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




More information about the Scummvm-git-logs mailing list