From d239d5c2f82c1e2dea09ed27475ec136a7ea3b5f Mon Sep 17 00:00:00 2001
From: Max Horn
Date: Mon, 8 Mar 2010 10:29:35 +0000
Subject: SCALERS: Change 'bitformat' template params to 'colormasks'; get rid
 of some #defines

svn-id: r48187
---
 backends/platform/wince/CEScaler.cpp | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'backends/platform')

diff --git a/backends/platform/wince/CEScaler.cpp b/backends/platform/wince/CEScaler.cpp
index adf6d1c5eb..546f8546c9 100644
--- a/backends/platform/wince/CEScaler.cpp
+++ b/backends/platform/wince/CEScaler.cpp
@@ -25,7 +25,7 @@
 #include "graphics/scaler/intern.h"
 #include "CEScaler.h"
 
-template<int bitFormat>
+template<typename ColorMask>
 void PocketPCPortraitTemplate(const uint8 *srcPtr, uint32 srcPitch, uint8 *dstPtr, uint32 dstPitch, int width, int height) {
 	uint16 *work;
 
@@ -41,9 +41,9 @@ void PocketPCPortraitTemplate(const uint8 *srcPtr, uint32 srcPitch, uint8 *dstPt
 			uint16 color3 = *(((const uint16 *)(const void *)srcPtr) + (i + 2));
 			uint16 color4 = *(((const uint16 *)(const void *)srcPtr) + (i + 3));
 
-			work[0] = interpolate32_3_1<bitFormat>(color1, color2);
-			work[1] = interpolate32_1_1<bitFormat>(color2, color3);
-			work[2] = interpolate32_3_1<bitFormat>(color4, color3);
+			work[0] = interpolate32_3_1<ColorMask>(color1, color2);
+			work[1] = interpolate32_1_1<ColorMask>(color2, color3);
+			work[2] = interpolate32_3_1<ColorMask>(color4, color3);
 
 			work += 3;
 		}
@@ -128,7 +128,7 @@ void SmartphoneLandscape(const uint8 *srcPtr, uint32 srcPitch, uint8 *dstPtr, ui
 
 #else
 
-template<int bitFormat>
+template<typename ColorMask>
 void SmartphoneLandscapeTemplate(const uint8 *srcPtr, uint32 srcPitch, uint8 *dstPtr, uint32 dstPitch, int width, int height) {
 	uint8 *work;
 	int line = 0;
@@ -142,8 +142,8 @@ void SmartphoneLandscapeTemplate(const uint8 *srcPtr, uint32 srcPitch, uint8 *ds
 			uint16 color2 = *(((const uint16 *)srcPtr) + (i + 1));
 			uint16 color3 = *(((const uint16 *)srcPtr) + (i + 2));
 
-			*(((uint16 *)work) + 0) = interpolate32_3_1<bitFormat>(color1, color2);
-			*(((uint16 *)work) + 1) = interpolate32_3_1<bitFormat>(color3, color2);
+			*(((uint16 *)work) + 0) = interpolate32_3_1<ColorMask>(color1, color2);
+			*(((uint16 *)work) + 1) = interpolate32_3_1<ColorMask>(color3, color2);
 
 			work += 2 * sizeof(uint16);
 		}
-- 
cgit v1.2.3