[Scummvm-cvs-logs] SF.net SVN: scummvm:[33934] scummvm/trunk

[fingolfin at users.sourceforge.net]

Revision: 33934
          http://scummvm.svn.sourceforge.net/scummvm/?rev=33934&view=rev
Author:   fingolfin
Date:     2008-08-16 11:37:36 +0000 (Sat, 16 Aug 2008)

Log Message:
-----------
Replaced ARM_USE_GFX_ASM by USE_ARM_GFX_ASM

Modified Paths:
--------------
    scummvm/trunk/backends/platform/symbian/src/portdefs.h
    scummvm/trunk/engines/scumm/gfx.cpp

Modified: scummvm/trunk/backends/platform/symbian/src/portdefs.h
===================================================================
--- scummvm/trunk/backends/platform/symbian/src/portdefs.h	2008-08-16 08:57:07 UTC (rev 33933)
+++ scummvm/trunk/backends/platform/symbian/src/portdefs.h	2008-08-16 11:37:36 UTC (rev 33934)
@@ -134,7 +134,6 @@
 
 #ifndef __WINS__
 #define USE_ARM_GFX_ASM
-#define ARM_USE_GFX_ASM
 #define USE_ARM_SMUSH_ASM
 #define USE_ARM_COSTUME_ASM
 #define USE_ARM_SOUND_ASM

Modified: scummvm/trunk/engines/scumm/gfx.cpp
===================================================================
--- scummvm/trunk/engines/scumm/gfx.cpp	2008-08-16 08:57:07 UTC (rev 33933)
+++ scummvm/trunk/engines/scumm/gfx.cpp	2008-08-16 11:37:36 UTC (rev 33934)
@@ -46,7 +46,7 @@
 
 static void blit(byte *dst, int dstPitch, const byte *src, int srcPitch, int w, int h);
 static void fill(byte *dst, int dstPitch, byte color, int w, int h);
-#ifndef ARM_USE_GFX_ASM
+#ifndef USE_ARM_GFX_ASM
 static void copy8Col(byte *dst, int dstPitch, const byte *src, int height);
 #endif
 static void clear8Col(byte *dst, int dstPitch, int height);
@@ -625,7 +625,7 @@
 		//     (b) RLE encode the _textSurface row-wise. This is an improved variant of (a),
 		//         but also more complicated to implement, and incurs a bigger overhead when
 		//         writing to the text surface.
-#ifdef ARM_USE_GFX_ASM
+#ifdef USE_ARM_GFX_ASM
 		asmDrawStripToScreen(height, width, text, src, dst, vs->pitch, width, _textSurface.pitch);
 #else
 		for (int h = 0; h < height * m; ++h) {
@@ -1078,7 +1078,7 @@
 	}
 }
 
-#ifdef ARM_USE_GFX_ASM
+#ifdef USE_ARM_GFX_ASM
 
 #define copy8Col(A,B,C,D) asmCopy8Col(A,B,C,D)
 
@@ -1098,7 +1098,7 @@
 	} while (--height);
 }
 
-#endif /* ARM_USE_GFX_ASM */
+#endif /* USE_ARM_GFX_ASM */
 
 static void clear8Col(byte *dst, int dstPitch, int height) {
 	do {


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