From 4a33ef34a347568008d0d0da01e1fc4af360460f Mon Sep 17 00:00:00 2001
From: Robin Watts
Date: Sat, 22 Aug 2009 23:00:08 +0000
Subject: Eliminate more warnings for buildbot.

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

(limited to 'backends')

diff --git a/backends/platform/wince/CEScaler.cpp b/backends/platform/wince/CEScaler.cpp
index a7910cbdcc..517c86e3b9 100644
--- a/backends/platform/wince/CEScaler.cpp
+++ b/backends/platform/wince/CEScaler.cpp
@@ -27,24 +27,25 @@
 
 template<int bitFormat>
 void PocketPCPortraitTemplate(const uint8 *srcPtr, uint32 srcPitch, uint8 *dstPtr, uint32 dstPitch, int width, int height) {
-	uint8 *work;
+	uint16 *work;
 
+	// Various casts below go via (void *) to avoid warning. This is
+	// safe as these are all even addresses.
 	while (height--) {
-		work = dstPtr;
+		work = (uint16 *)(void *)dstPtr;
 
 		for (int i=0; i<width; i+=4) {
 			// Work with 4 pixels
-			// Cast via (void *) to avoid warning. This is safe.
 			uint16 color1 = *(((const uint16 *)(const void *)srcPtr) + i);
 			uint16 color2 = *(((const uint16 *)(const void *)srcPtr) + (i + 1));
 			uint16 color3 = *(((const uint16 *)(const void *)srcPtr) + (i + 2));
 			uint16 color4 = *(((const uint16 *)(const void *)srcPtr) + (i + 3));
 
-			*(((uint16 *)work) + 0) = interpolate32_3_1<bitFormat>(color1, color2);
-			*(((uint16 *)work) + 1) = interpolate32_1_1<bitFormat>(color2, color3);
-			*(((uint16 *)work) + 2) = interpolate32_3_1<bitFormat>(color4, color3);
+			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 += 3 * sizeof(uint16);
+			work += 3;
 		}
 		srcPtr += srcPitch;
 		dstPtr += dstPitch;
@@ -161,20 +162,20 @@ void PocketPCHalf(const uint8 *srcPtr, uint32 srcPitch, uint8 *dstPtr, uint32 ds
 
 template<int bitFormat>
 void PocketPCHalfZoomTemplate(const uint8 *srcPtr, uint32 srcPitch, uint8 *dstPtr, uint32 dstPitch, int width, int height) {
-	uint8 *work;
+	uint16 *work;
 
 	if (!height)
 		return;
 
+	// Various casts below go via (void *) to avoid warning. This is
+	// safe as these are all even addresses.
 	while (height--) {
-		work = dstPtr;
+		work = (uint16 *)(void *)dstPtr;
 
 		for (int i = 0; i < width; i += 2) {
-			uint16 color1 = *(((const uint16 *)srcPtr) + i);
-			uint16 color2 = *(((const uint16 *)srcPtr) + (i + 1));
-			*(((uint16 *)work) + 0) = interpolate32_1_1<bitFormat>(color1, color2);
-
-			work += sizeof(uint16);
+			uint16 color1 = *(((const uint16 *)(const void *)srcPtr) + i);
+			uint16 color2 = *(((const uint16 *)(const void *)srcPtr) + (i + 1));
+			*work++ = interpolate32_1_1<bitFormat>(color1, color2);
 		}
 		srcPtr += srcPitch;
 		dstPtr += dstPitch;
-- 
cgit v1.2.3