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

[fingolfin at users.sourceforge.net]

Revision: 36099
          http://scummvm.svn.sourceforge.net/scummvm/?rev=36099&view=rev
Author:   fingolfin
Date:     2009-01-27 14:48:49 +0000 (Tue, 27 Jan 2009)

Log Message:
-----------
Re-enabled ASM versions of HQx scalers (oops)

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

Modified: scummvm/trunk/graphics/scaler/hq2x.cpp
===================================================================
--- scummvm/trunk/graphics/scaler/hq2x.cpp	2009-01-27 11:49:53 UTC (rev 36098)
+++ scummvm/trunk/graphics/scaler/hq2x.cpp	2009-01-27 14:48:49 UTC (rev 36099)
@@ -38,11 +38,11 @@
 
 }
 
-void HQ2x_ASM(const uint8 *srcPtr, uint32 srcPitch, uint8 *dstPtr, uint32 dstPitch, int width, int height) {
+void HQ2x(const uint8 *srcPtr, uint32 srcPitch, uint8 *dstPtr, uint32 dstPitch, int width, int height) {
 	hq2x_16(srcPtr, dstPtr, width, height, srcPitch, dstPitch);
 }
 
-#endif
+#else
 
 #define PIXEL00_0	*(q) = w5;
 #define PIXEL00_10	*(q) = interpolate16_3_1<ColorMask>(w5, w1);
@@ -118,3 +118,5 @@
 	else
 		HQ2x_555(srcPtr, srcPitch, dstPtr, dstPitch, width, height);
 }
+
+#endif // Assembly version

Modified: scummvm/trunk/graphics/scaler/hq3x.cpp
===================================================================
--- scummvm/trunk/graphics/scaler/hq3x.cpp	2009-01-27 11:49:53 UTC (rev 36098)
+++ scummvm/trunk/graphics/scaler/hq3x.cpp	2009-01-27 14:48:49 UTC (rev 36099)
@@ -39,11 +39,11 @@
 
 }
 
-void HQ3x_ASM(const uint8 *srcPtr, uint32 srcPitch, uint8 *dstPtr, uint32 dstPitch, int width, int height) {
+void HQ3x(const uint8 *srcPtr, uint32 srcPitch, uint8 *dstPtr, uint32 dstPitch, int width, int height) {
 	hq3x_16(srcPtr, dstPtr, width, height, srcPitch, dstPitch);
 }
 
-#endif
+#else
 
 #define PIXEL00_1M  *(q) = interpolate16_3_1<ColorMask>(w5, w1);
 #define PIXEL00_1U  *(q) = interpolate16_3_1<ColorMask>(w5, w2);
@@ -121,3 +121,5 @@
 	else
 		HQ3x_555(srcPtr, srcPitch, dstPtr, dstPitch, width, height);
 }
+
+#endif // Assembly version


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