Fixed compiler warnings
authorSam Lantinga <slouken@libsdl.org>
Sun, 06 Mar 2011 21:17:09 -0800
changeset 5426 7a3982c50af8
parent 5425 346f095568ab
child 5427 d9b4fd6fcdc4
Fixed compiler warnings
src/video/SDL_blit.h
src/video/SDL_blit_auto.c
src/video/SDL_blit_slow.c
src/video/sdlgenblit.pl
--- a/src/video/SDL_blit.h	Sun Mar 06 21:15:46 2011 -0800
+++ b/src/video/SDL_blit.h	Sun Mar 06 21:17:09 2011 -0800
@@ -172,7 +172,7 @@
 		break;							   \
 									   \
 		default:						   \
-		        Pixel; /* stop gcc complaints */		   \
+		        Pixel = 0; /* stop gcc complaints */		   \
 		break;							   \
 	}								   \
 } while (0)
@@ -186,6 +186,7 @@
 		break;							   \
 									   \
 		case 3:	{						   \
+            Pixel = 0;                  \
                         if (SDL_BYTEORDER == SDL_LIL_ENDIAN) {		   \
 			        r = *((buf)+fmt->Rshift/8);		   \
 				g = *((buf)+fmt->Gshift/8);		   \
@@ -204,7 +205,9 @@
 		break;							   \
 									   \
 		default:						   \
-		        Pixel; /* stop gcc complaints */		   \
+                /* stop gcc complaints */		   \
+		        Pixel = 0;              \
+                r = g = b = 0;          \
 		break;							   \
 	}								   \
 } while (0)
@@ -277,43 +280,6 @@
 		break;							\
 	}								\
 }
-#define ASSEMBLE_RGB_AMASK(buf, bpp, fmt, r, g, b, Amask)		\
-{									\
-	switch (bpp) {							\
-		case 2: {						\
-			Uint16 *bufp;					\
-			Uint16 Pixel;					\
-									\
-			bufp = (Uint16 *)buf;				\
-			PIXEL_FROM_RGB(Pixel, fmt, r, g, b);		\
-			*bufp = Pixel | (*bufp & Amask);		\
-		}							\
-		break;							\
-									\
-		case 3: {						\
-                        if (SDL_BYTEORDER == SDL_LIL_ENDIAN) {		\
-			        *((buf)+fmt->Rshift/8) = r;		\
-				*((buf)+fmt->Gshift/8) = g;		\
-				*((buf)+fmt->Bshift/8) = b;		\
-			} else {					\
-			        *((buf)+2-fmt->Rshift/8) = r;		\
-				*((buf)+2-fmt->Gshift/8) = g;		\
-				*((buf)+2-fmt->Bshift/8) = b;		\
-			}						\
-		}							\
-		break;							\
-									\
-		case 4: {						\
-			Uint32 *bufp;					\
-			Uint32 Pixel;					\
-									\
-			bufp = (Uint32 *)buf;				\
-			PIXEL_FROM_RGB(Pixel, fmt, r, g, b);		\
-			*bufp = Pixel | (*bufp & Amask);		\
-		}							\
-		break;							\
-	}								\
-}
 
 /* FIXME: Should we rescale alpha into 0..255 here? */
 #define RGBA_FROM_PIXEL(Pixel, fmt, r, g, b, a)				\
@@ -367,6 +333,7 @@
 		break;							   \
 									   \
 		case 3:	{						   \
+            Pixel = 0; \
                         if (SDL_BYTEORDER == SDL_LIL_ENDIAN) {		   \
 			        r = *((buf)+fmt->Rshift/8);		   \
 				g = *((buf)+fmt->Gshift/8);		   \
@@ -386,7 +353,9 @@
 		break;							   \
 									   \
 		default:						   \
-		        Pixel; /* stop gcc complaints */		   \
+                /* stop gcc complaints */		   \
+		        Pixel = 0;              \
+                r = g = b = a = 0;      \
 		break;							   \
 	}								   \
 } while (0)
--- a/src/video/SDL_blit_auto.c	Sun Mar 06 21:15:46 2011 -0800
+++ b/src/video/SDL_blit_auto.c	Sun Mar 06 21:17:09 2011 -0800
@@ -30,7 +30,6 @@
 
 static void SDL_Blit_RGB888_RGB888_Scale(SDL_BlitInfo *info)
 {
-    const int flags = info->flags;
     int srcy, srcx;
     int posy, posx;
     int incy, incx;
@@ -41,7 +40,7 @@
     incx = (info->src_w << 16) / info->dst_w;
 
     while (info->dst_h--) {
-        Uint32 *src;
+        Uint32 *src = 0;
         Uint32 *dst = (Uint32 *)info->dst;
         int n = info->dst_w;
         srcx = -1;
@@ -136,7 +135,7 @@
     incx = (info->src_w << 16) / info->dst_w;
 
     while (info->dst_h--) {
-        Uint32 *src;
+        Uint32 *src = 0;
         Uint32 *dst = (Uint32 *)info->dst;
         int n = info->dst_w;
         srcx = -1;
@@ -246,7 +245,7 @@
     incx = (info->src_w << 16) / info->dst_w;
 
     while (info->dst_h--) {
-        Uint32 *src;
+        Uint32 *src = 0;
         Uint32 *dst = (Uint32 *)info->dst;
         int n = info->dst_w;
         srcx = -1;
@@ -368,7 +367,7 @@
     incx = (info->src_w << 16) / info->dst_w;
 
     while (info->dst_h--) {
-        Uint32 *src;
+        Uint32 *src = 0;
         Uint32 *dst = (Uint32 *)info->dst;
         int n = info->dst_w;
         srcx = -1;
@@ -434,7 +433,6 @@
 
 static void SDL_Blit_RGB888_BGR888_Scale(SDL_BlitInfo *info)
 {
-    const int flags = info->flags;
     Uint32 pixel;
     Uint32 R, G, B, A;
     int srcy, srcx;
@@ -447,7 +445,7 @@
     incx = (info->src_w << 16) / info->dst_w;
 
     while (info->dst_h--) {
-        Uint32 *src;
+        Uint32 *src = 0;
         Uint32 *dst = (Uint32 *)info->dst;
         int n = info->dst_w;
         srcx = -1;
@@ -545,7 +543,7 @@
     incx = (info->src_w << 16) / info->dst_w;
 
     while (info->dst_h--) {
-        Uint32 *src;
+        Uint32 *src = 0;
         Uint32 *dst = (Uint32 *)info->dst;
         int n = info->dst_w;
         srcx = -1;
@@ -655,7 +653,7 @@
     incx = (info->src_w << 16) / info->dst_w;
 
     while (info->dst_h--) {
-        Uint32 *src;
+        Uint32 *src = 0;
         Uint32 *dst = (Uint32 *)info->dst;
         int n = info->dst_w;
         srcx = -1;
@@ -777,7 +775,7 @@
     incx = (info->src_w << 16) / info->dst_w;
 
     while (info->dst_h--) {
-        Uint32 *src;
+        Uint32 *src = 0;
         Uint32 *dst = (Uint32 *)info->dst;
         int n = info->dst_w;
         srcx = -1;
@@ -843,7 +841,6 @@
 
 static void SDL_Blit_RGB888_ARGB8888_Scale(SDL_BlitInfo *info)
 {
-    const int flags = info->flags;
     Uint32 pixel;
     Uint32 R, G, B, A;
     int srcy, srcx;
@@ -856,7 +853,7 @@
     incx = (info->src_w << 16) / info->dst_w;
 
     while (info->dst_h--) {
-        Uint32 *src;
+        Uint32 *src = 0;
         Uint32 *dst = (Uint32 *)info->dst;
         int n = info->dst_w;
         srcx = -1;
@@ -954,7 +951,7 @@
     incx = (info->src_w << 16) / info->dst_w;
 
     while (info->dst_h--) {
-        Uint32 *src;
+        Uint32 *src = 0;
         Uint32 *dst = (Uint32 *)info->dst;
         int n = info->dst_w;
         srcx = -1;
@@ -1064,7 +1061,7 @@
     incx = (info->src_w << 16) / info->dst_w;
 
     while (info->dst_h--) {
-        Uint32 *src;
+        Uint32 *src = 0;
         Uint32 *dst = (Uint32 *)info->dst;
         int n = info->dst_w;
         srcx = -1;
@@ -1186,7 +1183,7 @@
     incx = (info->src_w << 16) / info->dst_w;
 
     while (info->dst_h--) {
-        Uint32 *src;
+        Uint32 *src = 0;
         Uint32 *dst = (Uint32 *)info->dst;
         int n = info->dst_w;
         srcx = -1;
@@ -1252,7 +1249,6 @@
 
 static void SDL_Blit_BGR888_RGB888_Scale(SDL_BlitInfo *info)
 {
-    const int flags = info->flags;
     Uint32 pixel;
     Uint32 R, G, B, A;
     int srcy, srcx;
@@ -1265,7 +1261,7 @@
     incx = (info->src_w << 16) / info->dst_w;
 
     while (info->dst_h--) {
-        Uint32 *src;
+        Uint32 *src = 0;
         Uint32 *dst = (Uint32 *)info->dst;
         int n = info->dst_w;
         srcx = -1;
@@ -1363,7 +1359,7 @@
     incx = (info->src_w << 16) / info->dst_w;
 
     while (info->dst_h--) {
-        Uint32 *src;
+        Uint32 *src = 0;
         Uint32 *dst = (Uint32 *)info->dst;
         int n = info->dst_w;
         srcx = -1;
@@ -1473,7 +1469,7 @@
     incx = (info->src_w << 16) / info->dst_w;
 
     while (info->dst_h--) {
-        Uint32 *src;
+        Uint32 *src = 0;
         Uint32 *dst = (Uint32 *)info->dst;
         int n = info->dst_w;
         srcx = -1;
@@ -1595,7 +1591,7 @@
     incx = (info->src_w << 16) / info->dst_w;
 
     while (info->dst_h--) {
-        Uint32 *src;
+        Uint32 *src = 0;
         Uint32 *dst = (Uint32 *)info->dst;
         int n = info->dst_w;
         srcx = -1;
@@ -1661,7 +1657,6 @@
 
 static void SDL_Blit_BGR888_BGR888_Scale(SDL_BlitInfo *info)
 {
-    const int flags = info->flags;
     int srcy, srcx;
     int posy, posx;
     int incy, incx;
@@ -1672,7 +1667,7 @@
     incx = (info->src_w << 16) / info->dst_w;
 
     while (info->dst_h--) {
-        Uint32 *src;
+        Uint32 *src = 0;
         Uint32 *dst = (Uint32 *)info->dst;
         int n = info->dst_w;
         srcx = -1;
@@ -1767,7 +1762,7 @@
     incx = (info->src_w << 16) / info->dst_w;
 
     while (info->dst_h--) {
-        Uint32 *src;
+        Uint32 *src = 0;
         Uint32 *dst = (Uint32 *)info->dst;
         int n = info->dst_w;
         srcx = -1;
@@ -1877,7 +1872,7 @@
     incx = (info->src_w << 16) / info->dst_w;
 
     while (info->dst_h--) {
-        Uint32 *src;
+        Uint32 *src = 0;
         Uint32 *dst = (Uint32 *)info->dst;
         int n = info->dst_w;
         srcx = -1;
@@ -1999,7 +1994,7 @@
     incx = (info->src_w << 16) / info->dst_w;
 
     while (info->dst_h--) {
-        Uint32 *src;
+        Uint32 *src = 0;
         Uint32 *dst = (Uint32 *)info->dst;
         int n = info->dst_w;
         srcx = -1;
@@ -2065,7 +2060,6 @@
 
 static void SDL_Blit_BGR888_ARGB8888_Scale(SDL_BlitInfo *info)
 {
-    const int flags = info->flags;
     Uint32 pixel;
     Uint32 R, G, B, A;
     int srcy, srcx;
@@ -2078,7 +2072,7 @@
     incx = (info->src_w << 16) / info->dst_w;
 
     while (info->dst_h--) {
-        Uint32 *src;
+        Uint32 *src = 0;
         Uint32 *dst = (Uint32 *)info->dst;
         int n = info->dst_w;
         srcx = -1;
@@ -2176,7 +2170,7 @@
     incx = (info->src_w << 16) / info->dst_w;
 
     while (info->dst_h--) {
-        Uint32 *src;
+        Uint32 *src = 0;
         Uint32 *dst = (Uint32 *)info->dst;
         int n = info->dst_w;
         srcx = -1;
@@ -2286,7 +2280,7 @@
     incx = (info->src_w << 16) / info->dst_w;
 
     while (info->dst_h--) {
-        Uint32 *src;
+        Uint32 *src = 0;
         Uint32 *dst = (Uint32 *)info->dst;
         int n = info->dst_w;
         srcx = -1;
@@ -2408,7 +2402,7 @@
     incx = (info->src_w << 16) / info->dst_w;
 
     while (info->dst_h--) {
-        Uint32 *src;
+        Uint32 *src = 0;
         Uint32 *dst = (Uint32 *)info->dst;
         int n = info->dst_w;
         srcx = -1;
@@ -2474,7 +2468,6 @@
 
 static void SDL_Blit_ARGB8888_RGB888_Scale(SDL_BlitInfo *info)
 {
-    const int flags = info->flags;
     Uint32 pixel;
     Uint32 R, G, B, A;
     int srcy, srcx;
@@ -2487,7 +2480,7 @@
     incx = (info->src_w << 16) / info->dst_w;
 
     while (info->dst_h--) {
-        Uint32 *src;
+        Uint32 *src = 0;
         Uint32 *dst = (Uint32 *)info->dst;
         int n = info->dst_w;
         srcx = -1;
@@ -2585,7 +2578,7 @@
     incx = (info->src_w << 16) / info->dst_w;
 
     while (info->dst_h--) {
-        Uint32 *src;
+        Uint32 *src = 0;
         Uint32 *dst = (Uint32 *)info->dst;
         int n = info->dst_w;
         srcx = -1;
@@ -2695,7 +2688,7 @@
     incx = (info->src_w << 16) / info->dst_w;
 
     while (info->dst_h--) {
-        Uint32 *src;
+        Uint32 *src = 0;
         Uint32 *dst = (Uint32 *)info->dst;
         int n = info->dst_w;
         srcx = -1;
@@ -2817,7 +2810,7 @@
     incx = (info->src_w << 16) / info->dst_w;
 
     while (info->dst_h--) {
-        Uint32 *src;
+        Uint32 *src = 0;
         Uint32 *dst = (Uint32 *)info->dst;
         int n = info->dst_w;
         srcx = -1;
@@ -2883,7 +2876,6 @@
 
 static void SDL_Blit_ARGB8888_BGR888_Scale(SDL_BlitInfo *info)
 {
-    const int flags = info->flags;
     Uint32 pixel;
     Uint32 R, G, B, A;
     int srcy, srcx;
@@ -2896,7 +2888,7 @@
     incx = (info->src_w << 16) / info->dst_w;
 
     while (info->dst_h--) {
-        Uint32 *src;
+        Uint32 *src = 0;
         Uint32 *dst = (Uint32 *)info->dst;
         int n = info->dst_w;
         srcx = -1;
@@ -2994,7 +2986,7 @@
     incx = (info->src_w << 16) / info->dst_w;
 
     while (info->dst_h--) {
-        Uint32 *src;
+        Uint32 *src = 0;
         Uint32 *dst = (Uint32 *)info->dst;
         int n = info->dst_w;
         srcx = -1;
@@ -3104,7 +3096,7 @@
     incx = (info->src_w << 16) / info->dst_w;
 
     while (info->dst_h--) {
-        Uint32 *src;
+        Uint32 *src = 0;
         Uint32 *dst = (Uint32 *)info->dst;
         int n = info->dst_w;
         srcx = -1;
@@ -3226,7 +3218,7 @@
     incx = (info->src_w << 16) / info->dst_w;
 
     while (info->dst_h--) {
-        Uint32 *src;
+        Uint32 *src = 0;
         Uint32 *dst = (Uint32 *)info->dst;
         int n = info->dst_w;
         srcx = -1;
@@ -3292,7 +3284,6 @@
 
 static void SDL_Blit_ARGB8888_ARGB8888_Scale(SDL_BlitInfo *info)
 {
-    const int flags = info->flags;
     int srcy, srcx;
     int posy, posx;
     int incy, incx;
@@ -3303,7 +3294,7 @@
     incx = (info->src_w << 16) / info->dst_w;
 
     while (info->dst_h--) {
-        Uint32 *src;
+        Uint32 *src = 0;
         Uint32 *dst = (Uint32 *)info->dst;
         int n = info->dst_w;
         srcx = -1;
@@ -3398,7 +3389,7 @@
     incx = (info->src_w << 16) / info->dst_w;
 
     while (info->dst_h--) {
-        Uint32 *src;
+        Uint32 *src = 0;
         Uint32 *dst = (Uint32 *)info->dst;
         int n = info->dst_w;
         srcx = -1;
@@ -3508,7 +3499,7 @@
     incx = (info->src_w << 16) / info->dst_w;
 
     while (info->dst_h--) {
-        Uint32 *src;
+        Uint32 *src = 0;
         Uint32 *dst = (Uint32 *)info->dst;
         int n = info->dst_w;
         srcx = -1;
@@ -3630,7 +3621,7 @@
     incx = (info->src_w << 16) / info->dst_w;
 
     while (info->dst_h--) {
-        Uint32 *src;
+        Uint32 *src = 0;
         Uint32 *dst = (Uint32 *)info->dst;
         int n = info->dst_w;
         srcx = -1;
@@ -3696,7 +3687,6 @@
 
 static void SDL_Blit_RGBA8888_RGB888_Scale(SDL_BlitInfo *info)
 {
-    const int flags = info->flags;
     Uint32 pixel;
     Uint32 R, G, B, A;
     int srcy, srcx;
@@ -3709,7 +3699,7 @@
     incx = (info->src_w << 16) / info->dst_w;
 
     while (info->dst_h--) {
-        Uint32 *src;
+        Uint32 *src = 0;
         Uint32 *dst = (Uint32 *)info->dst;
         int n = info->dst_w;
         srcx = -1;
@@ -3807,7 +3797,7 @@
     incx = (info->src_w << 16) / info->dst_w;
 
     while (info->dst_h--) {
-        Uint32 *src;
+        Uint32 *src = 0;
         Uint32 *dst = (Uint32 *)info->dst;
         int n = info->dst_w;
         srcx = -1;
@@ -3917,7 +3907,7 @@
     incx = (info->src_w << 16) / info->dst_w;
 
     while (info->dst_h--) {
-        Uint32 *src;
+        Uint32 *src = 0;
         Uint32 *dst = (Uint32 *)info->dst;
         int n = info->dst_w;
         srcx = -1;
@@ -4039,7 +4029,7 @@
     incx = (info->src_w << 16) / info->dst_w;
 
     while (info->dst_h--) {
-        Uint32 *src;
+        Uint32 *src = 0;
         Uint32 *dst = (Uint32 *)info->dst;
         int n = info->dst_w;
         srcx = -1;
@@ -4105,7 +4095,6 @@
 
 static void SDL_Blit_RGBA8888_BGR888_Scale(SDL_BlitInfo *info)
 {
-    const int flags = info->flags;
     Uint32 pixel;
     Uint32 R, G, B, A;
     int srcy, srcx;
@@ -4118,7 +4107,7 @@
     incx = (info->src_w << 16) / info->dst_w;
 
     while (info->dst_h--) {
-        Uint32 *src;
+        Uint32 *src = 0;
         Uint32 *dst = (Uint32 *)info->dst;
         int n = info->dst_w;
         srcx = -1;
@@ -4216,7 +4205,7 @@
     incx = (info->src_w << 16) / info->dst_w;
 
     while (info->dst_h--) {
-        Uint32 *src;
+        Uint32 *src = 0;
         Uint32 *dst = (Uint32 *)info->dst;
         int n = info->dst_w;
         srcx = -1;
@@ -4326,7 +4315,7 @@
     incx = (info->src_w << 16) / info->dst_w;
 
     while (info->dst_h--) {
-        Uint32 *src;
+        Uint32 *src = 0;
         Uint32 *dst = (Uint32 *)info->dst;
         int n = info->dst_w;
         srcx = -1;
@@ -4448,7 +4437,7 @@
     incx = (info->src_w << 16) / info->dst_w;
 
     while (info->dst_h--) {
-        Uint32 *src;
+        Uint32 *src = 0;
         Uint32 *dst = (Uint32 *)info->dst;
         int n = info->dst_w;
         srcx = -1;
@@ -4514,7 +4503,6 @@
 
 static void SDL_Blit_RGBA8888_ARGB8888_Scale(SDL_BlitInfo *info)
 {
-    const int flags = info->flags;
     Uint32 pixel;
     Uint32 R, G, B, A;
     int srcy, srcx;
@@ -4527,7 +4515,7 @@
     incx = (info->src_w << 16) / info->dst_w;
 
     while (info->dst_h--) {
-        Uint32 *src;
+        Uint32 *src = 0;
         Uint32 *dst = (Uint32 *)info->dst;
         int n = info->dst_w;
         srcx = -1;
@@ -4625,7 +4613,7 @@
     incx = (info->src_w << 16) / info->dst_w;
 
     while (info->dst_h--) {
-        Uint32 *src;
+        Uint32 *src = 0;
         Uint32 *dst = (Uint32 *)info->dst;
         int n = info->dst_w;
         srcx = -1;
@@ -4735,7 +4723,7 @@
     incx = (info->src_w << 16) / info->dst_w;
 
     while (info->dst_h--) {
-        Uint32 *src;
+        Uint32 *src = 0;
         Uint32 *dst = (Uint32 *)info->dst;
         int n = info->dst_w;
         srcx = -1;
@@ -4857,7 +4845,7 @@
     incx = (info->src_w << 16) / info->dst_w;
 
     while (info->dst_h--) {
-        Uint32 *src;
+        Uint32 *src = 0;
         Uint32 *dst = (Uint32 *)info->dst;
         int n = info->dst_w;
         srcx = -1;
@@ -4923,7 +4911,6 @@
 
 static void SDL_Blit_ABGR8888_RGB888_Scale(SDL_BlitInfo *info)
 {
-    const int flags = info->flags;
     Uint32 pixel;
     Uint32 R, G, B, A;
     int srcy, srcx;
@@ -4936,7 +4923,7 @@
     incx = (info->src_w << 16) / info->dst_w;
 
     while (info->dst_h--) {
-        Uint32 *src;
+        Uint32 *src = 0;
         Uint32 *dst = (Uint32 *)info->dst;
         int n = info->dst_w;
         srcx = -1;
@@ -5034,7 +5021,7 @@
     incx = (info->src_w << 16) / info->dst_w;
 
     while (info->dst_h--) {
-        Uint32 *src;
+        Uint32 *src = 0;
         Uint32 *dst = (Uint32 *)info->dst;
         int n = info->dst_w;
         srcx = -1;
@@ -5144,7 +5131,7 @@
     incx = (info->src_w << 16) / info->dst_w;
 
     while (info->dst_h--) {
-        Uint32 *src;
+        Uint32 *src = 0;
         Uint32 *dst = (Uint32 *)info->dst;
         int n = info->dst_w;
         srcx = -1;
@@ -5266,7 +5253,7 @@
     incx = (info->src_w << 16) / info->dst_w;
 
     while (info->dst_h--) {
-        Uint32 *src;
+        Uint32 *src = 0;
         Uint32 *dst = (Uint32 *)info->dst;
         int n = info->dst_w;
         srcx = -1;
@@ -5332,7 +5319,6 @@
 
 static void SDL_Blit_ABGR8888_BGR888_Scale(SDL_BlitInfo *info)
 {
-    const int flags = info->flags;
     Uint32 pixel;
     Uint32 R, G, B, A;
     int srcy, srcx;
@@ -5345,7 +5331,7 @@
     incx = (info->src_w << 16) / info->dst_w;
 
     while (info->dst_h--) {
-        Uint32 *src;
+        Uint32 *src = 0;
         Uint32 *dst = (Uint32 *)info->dst;
         int n = info->dst_w;
         srcx = -1;
@@ -5443,7 +5429,7 @@
     incx = (info->src_w << 16) / info->dst_w;
 
     while (info->dst_h--) {
-        Uint32 *src;
+        Uint32 *src = 0;
         Uint32 *dst = (Uint32 *)info->dst;
         int n = info->dst_w;
         srcx = -1;
@@ -5553,7 +5539,7 @@
     incx = (info->src_w << 16) / info->dst_w;
 
     while (info->dst_h--) {
-        Uint32 *src;
+        Uint32 *src = 0;
         Uint32 *dst = (Uint32 *)info->dst;
         int n = info->dst_w;
         srcx = -1;
@@ -5675,7 +5661,7 @@
     incx = (info->src_w << 16) / info->dst_w;
 
     while (info->dst_h--) {
-        Uint32 *src;
+        Uint32 *src = 0;
         Uint32 *dst = (Uint32 *)info->dst;
         int n = info->dst_w;
         srcx = -1;
@@ -5741,7 +5727,6 @@
 
 static void SDL_Blit_ABGR8888_ARGB8888_Scale(SDL_BlitInfo *info)
 {
-    const int flags = info->flags;
     Uint32 pixel;
     Uint32 R, G, B, A;
     int srcy, srcx;
@@ -5754,7 +5739,7 @@
     incx = (info->src_w << 16) / info->dst_w;
 
     while (info->dst_h--) {
-        Uint32 *src;
+        Uint32 *src = 0;
         Uint32 *dst = (Uint32 *)info->dst;
         int n = info->dst_w;
         srcx = -1;
@@ -5852,7 +5837,7 @@
     incx = (info->src_w << 16) / info->dst_w;
 
     while (info->dst_h--) {
-        Uint32 *src;
+        Uint32 *src = 0;
         Uint32 *dst = (Uint32 *)info->dst;
         int n = info->dst_w;
         srcx = -1;
@@ -5962,7 +5947,7 @@
     incx = (info->src_w << 16) / info->dst_w;
 
     while (info->dst_h--) {
-        Uint32 *src;
+        Uint32 *src = 0;
         Uint32 *dst = (Uint32 *)info->dst;
         int n = info->dst_w;
         srcx = -1;
@@ -6084,7 +6069,7 @@
     incx = (info->src_w << 16) / info->dst_w;
 
     while (info->dst_h--) {
-        Uint32 *src;
+        Uint32 *src = 0;
         Uint32 *dst = (Uint32 *)info->dst;
         int n = info->dst_w;
         srcx = -1;
@@ -6150,7 +6135,6 @@
 
 static void SDL_Blit_BGRA8888_RGB888_Scale(SDL_BlitInfo *info)
 {
-    const int flags = info->flags;
     Uint32 pixel;
     Uint32 R, G, B, A;
     int srcy, srcx;
@@ -6163,7 +6147,7 @@
     incx = (info->src_w << 16) / info->dst_w;
 
     while (info->dst_h--) {
-        Uint32 *src;
+        Uint32 *src = 0;
         Uint32 *dst = (Uint32 *)info->dst;
         int n = info->dst_w;
         srcx = -1;
@@ -6261,7 +6245,7 @@
     incx = (info->src_w << 16) / info->dst_w;
 
     while (info->dst_h--) {
-        Uint32 *src;
+        Uint32 *src = 0;
         Uint32 *dst = (Uint32 *)info->dst;
         int n = info->dst_w;
         srcx = -1;
@@ -6371,7 +6355,7 @@
     incx = (info->src_w << 16) / info->dst_w;
 
     while (info->dst_h--) {
-        Uint32 *src;
+        Uint32 *src = 0;
         Uint32 *dst = (Uint32 *)info->dst;
         int n = info->dst_w;
         srcx = -1;
@@ -6493,7 +6477,7 @@
     incx = (info->src_w << 16) / info->dst_w;
 
     while (info->dst_h--) {
-        Uint32 *src;
+        Uint32 *src = 0;
         Uint32 *dst = (Uint32 *)info->dst;
         int n = info->dst_w;
         srcx = -1;
@@ -6559,7 +6543,6 @@
 
 static void SDL_Blit_BGRA8888_BGR888_Scale(SDL_BlitInfo *info)
 {
-    const int flags = info->flags;
     Uint32 pixel;
     Uint32 R, G, B, A;
     int srcy, srcx;
@@ -6572,7 +6555,7 @@
     incx = (info->src_w << 16) / info->dst_w;
 
     while (info->dst_h--) {
-        Uint32 *src;
+        Uint32 *src = 0;
         Uint32 *dst = (Uint32 *)info->dst;
         int n = info->dst_w;
         srcx = -1;
@@ -6670,7 +6653,7 @@
     incx = (info->src_w << 16) / info->dst_w;
 
     while (info->dst_h--) {
-        Uint32 *src;
+        Uint32 *src = 0;
         Uint32 *dst = (Uint32 *)info->dst;
         int n = info->dst_w;
         srcx = -1;
@@ -6780,7 +6763,7 @@
     incx = (info->src_w << 16) / info->dst_w;
 
     while (info->dst_h--) {
-        Uint32 *src;
+        Uint32 *src = 0;
         Uint32 *dst = (Uint32 *)info->dst;
         int n = info->dst_w;
         srcx = -1;
@@ -6902,7 +6885,7 @@
     incx = (info->src_w << 16) / info->dst_w;
 
     while (info->dst_h--) {
-        Uint32 *src;
+        Uint32 *src = 0;
         Uint32 *dst = (Uint32 *)info->dst;
         int n = info->dst_w;
         srcx = -1;
@@ -6968,7 +6951,6 @@
 
 static void SDL_Blit_BGRA8888_ARGB8888_Scale(SDL_BlitInfo *info)
 {
-    const int flags = info->flags;
     Uint32 pixel;
     Uint32 R, G, B, A;
     int srcy, srcx;
@@ -6981,7 +6963,7 @@
     incx = (info->src_w << 16) / info->dst_w;
 
     while (info->dst_h--) {
-        Uint32 *src;
+        Uint32 *src = 0;
         Uint32 *dst = (Uint32 *)info->dst;
         int n = info->dst_w;
         srcx = -1;
@@ -7079,7 +7061,7 @@
     incx = (info->src_w << 16) / info->dst_w;
 
     while (info->dst_h--) {
-        Uint32 *src;
+        Uint32 *src = 0;
         Uint32 *dst = (Uint32 *)info->dst;
         int n = info->dst_w;
         srcx = -1;
@@ -7189,7 +7171,7 @@
     incx = (info->src_w << 16) / info->dst_w;
 
     while (info->dst_h--) {
-        Uint32 *src;
+        Uint32 *src = 0;
         Uint32 *dst = (Uint32 *)info->dst;
         int n = info->dst_w;
         srcx = -1;
@@ -7311,7 +7293,7 @@
     incx = (info->src_w << 16) / info->dst_w;
 
     while (info->dst_h--) {
-        Uint32 *src;
+        Uint32 *src = 0;
         Uint32 *dst = (Uint32 *)info->dst;
         int n = info->dst_w;
         srcx = -1;
--- a/src/video/SDL_blit_slow.c	Sun Mar 06 21:15:46 2011 -0800
+++ b/src/video/SDL_blit_slow.c	Sun Mar 06 21:17:09 2011 -0800
@@ -54,7 +54,7 @@
     incx = (info->src_w << 16) / info->dst_w;
 
     while (info->dst_h--) {
-        Uint8 *src;
+        Uint8 *src = 0;
         Uint8 *dst = (Uint8 *) info->dst;
         int n = info->dst_w;
         srcx = -1;
--- a/src/video/sdlgenblit.pl	Sun Mar 06 21:15:46 2011 -0800
+++ b/src/video/sdlgenblit.pl	Sun Mar 06 21:17:09 2011 -0800
@@ -274,8 +274,12 @@
     output_copyfuncname("static void", $src, $dst, $modulate, $blend, $scale, 1, "\n");
     print FILE <<__EOF__;
 {
+__EOF__
+    if ( $modulate || $blend ) {
+        print FILE <<__EOF__;
     const int flags = info->flags;
 __EOF__
+    }
     if ( $modulate ) {
         print FILE <<__EOF__;
     const Uint32 modulateR = info->r;
@@ -309,7 +313,7 @@
     incx = (info->src_w << 16) / info->dst_w;
 
     while (info->dst_h--) {
-        $format_type{$src} *src;
+        $format_type{$src} *src = 0;
         $format_type{$dst} *dst = ($format_type{$dst} *)info->dst;
         int n = info->dst_w;
         srcx = -1;