Ticket #8280: scalers.diff

scummvm/common/scaler.cpp

@@ -233 +233 @@
 }
 
 template<int bitFormat>
-void TV2x(const uint8 *srcPtr, uint32 srcPitch, uint8 *dstPtr, uint32 dstPitch, 
+void doTV2x(const uint8 *srcPtr, uint32 srcPitch, uint8 *dstPtr, uint32 dstPitch, 
                                         int width, int height) {
         const uint32 nextlineSrc = srcPitch / sizeof(uint16);
         const uint16 *p = (const uint16 *)srcPtr;

scummvm/common/scaler/2xsai.cpp

@@ -62 +62 @@
 #define Q_INTERPOLATE   Q_INTERPOLATE<bitFormat>
 
 template<int bitFormat>
-void Super2xSaI(const uint8 *srcPtr, uint32 srcPitch, uint8 *dstPtr, uint32 dstPitch, int width, int height) {
+void doSuper2xSaI(const uint8 *srcPtr, uint32 srcPitch, uint8 *dstPtr, uint32 dstPitch, int width, int height) {
         const uint16 *bP;
         uint16 *dP;
         const uint32 nextlineSrc = srcPitch >> 1;
@@ -171 +171 @@
 MAKE_WRAPPER(Super2xSaI)
 
 template<int bitFormat>
-void SuperEagle(const uint8 *srcPtr, uint32 srcPitch, uint8 *dstPtr, uint32 dstPitch, int width, int height) {
+void doSuperEagle(const uint8 *srcPtr, uint32 srcPitch, uint8 *dstPtr, uint32 dstPitch, int width, int height) {
         const uint16 *bP;
         uint16 *dP;
         const uint32 nextlineSrc = srcPitch >> 1;
@@ -282 +282 @@
 MAKE_WRAPPER(SuperEagle)
 
 template<int bitFormat>
-void _2xSaI(const uint8 *srcPtr, uint32 srcPitch, uint8 *dstPtr, uint32 dstPitch, int width, int height) {
+void do_2xSaI(const uint8 *srcPtr, uint32 srcPitch, uint8 *dstPtr, uint32 dstPitch, int width, int height) {
         const uint16 *bP;
         uint16 *dP;
         const uint32 nextlineSrc = srcPitch >> 1;

scummvm/common/scaler/hq2x.cpp

@@ -82 +82 @@
  * Adapted for ScummVM to 16 bit output and optimized by Max Horn.
  */
 template<int bitFormat>
-void HQ2x(const uint8 *srcPtr, uint32 srcPitch, uint8 *dstPtr, uint32 dstPitch, int width, int height) {
+void doHQ2x(const uint8 *srcPtr, uint32 srcPitch, uint8 *dstPtr, uint32 dstPitch, int width, int height) {
         int  w[10];
   
         const uint32 nextlineSrc = srcPitch / sizeof(uint16);

scummvm/common/scaler/hq3x.cpp

@@ -85 +85 @@
  * Adapted for ScummVM to 16 bit output and optimized by Max Horn.
  */
 template<int bitFormat>
-void HQ3x(const uint8 *srcPtr, uint32 srcPitch, uint8 *dstPtr, uint32 dstPitch, int width, int height) {
+void doHQ3x(const uint8 *srcPtr, uint32 srcPitch, uint8 *dstPtr, uint32 dstPitch, int width, int height) {
         int   w[10];
   
         const uint32 nextlineSrc = srcPitch / sizeof(uint16);

scummvm/common/scaler/intern.h

@@ -30 +30 @@
 #include "common/util.h"
 
 
-template<int bitFormat>
-struct ColorMasks {
+namespace ColorMasks_565 {
+        const int highBits = 0xF7DEF7DE;
+        const int lowBits = 0x08210821;
+        const int qhighBits = 0xE79CE79C;
+        const int qlowBits = 0x18631863;
+        const int redblueMask = 0xF81F;
+        const int greenMask = 0x07E0;
 };
 
-struct ColorMasks<565> {
-        static const int highBits = 0xF7DEF7DE;
-        static const int lowBits = 0x08210821;
-        static const int qhighBits = 0xE79CE79C;
-        static const int qlowBits = 0x18631863;
-        static const int redblueMask = 0xF81F;
-        static const int greenMask = 0x07E0;
+namespace ColorMasks_555 {
+        const int highBits = 0x04210421;
+        const int lowBits = 0x04210421;
+        const int qhighBits = 0x739C739C;
+        const int qlowBits = 0x0C630C63;
+        const int redblueMask = 0x7C1F;
+        const int greenMask = 0x03E0;
 };
 
-struct ColorMasks<555> {
-        static const int highBits = 0x04210421;
-        static const int lowBits = 0x04210421;
-        static const int qhighBits = 0x739C739C;
-        static const int qlowBits = 0x0C630C63;
-        static const int redblueMask = 0x7C1F;
-        static const int greenMask = 0x03E0;
-};
+#define ColorMasks(bitFormat,member) (((bitFormat) == 555) ? ColorMasks_555::member : ColorMasks_565::member)
 
-#define highBits        ColorMasks<bitFormat>::highBits
-#define lowBits         ColorMasks<bitFormat>::lowBits
-#define qhighBits       ColorMasks<bitFormat>::qhighBits
-#define qlowBits        ColorMasks<bitFormat>::qlowBits
-#define redblueMask     ColorMasks<bitFormat>::redblueMask
-#define greenMask       ColorMasks<bitFormat>::greenMask
+#define highBits        ColorMasks(bitFormat,highBits)
+#define lowBits         ColorMasks(bitFormat,lowBits)
+#define qhighBits       ColorMasks(bitFormat,qhighBits)
+#define qlowBits        ColorMasks(bitFormat,qlowBits)
+#define redblueMask     ColorMasks(bitFormat,redblueMask)
+#define greenMask       ColorMasks(bitFormat,greenMask)
 
 
 extern int gBitFormat;
@@ -129 +127 @@
 #define MAKE_WRAPPER(FUNC) \
         void FUNC(const uint8 *srcPtr, uint32 srcPitch, uint8 *dstPtr, uint32 dstPitch, int width, int height) { \
                 if (gBitFormat == 565) \
-                        FUNC<565>(srcPtr, srcPitch, dstPtr, dstPitch, width, height); \
+                        do ## FUNC<565>(srcPtr, srcPitch, dstPtr, dstPitch, width, height); \
                 else \
-                        FUNC<555>(srcPtr, srcPitch, dstPtr, dstPitch, width, height); \
+                        do ## FUNC<555>(srcPtr, srcPitch, dstPtr, dstPitch, width, height); \
         }
 
 #endif