[Scummvm-cvs-logs] CVS: scummvm/scumm/smush codec37.cpp,1.12,1.13

[Jonathan Gray]

Update of /cvsroot/scummvm/scummvm/scumm/smush
In directory sc8-pr-cvs1:/tmp/cvs-serv13162

Modified Files:
	codec37.cpp 
Log Message:
fix shadowed variable problems

Index: codec37.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/smush/codec37.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- codec37.cpp	3 Mar 2003 20:22:00 -0000	1.12
+++ codec37.cpp	3 Mar 2003 21:48:22 -0000	1.13
@@ -327,11 +327,11 @@
 
 #define LITERAL_4X4(src, dst, pitch)				\
 	do {							\
-		int i;						\
+		int x;						\
 		DECLARE_LITERAL_TEMP(t);			\
 		READ_LITERAL_PIXEL(src, t);			\
-		for(i=0; i<4; i++) {				\
-			WRITE_4X1_LINE(dst + pitch * i, t);	\
+		for(x=0; x<4; x++) {				\
+			WRITE_4X1_LINE(dst + pitch * x, t);	\
 		}						\
 		dst += 4;					\
 	} while(0)
@@ -341,11 +341,11 @@
 
 #define LITERAL_4X1(src, dst, pitch)				\
 	do {							\
-  		int i;						\
+  		int x;						\
 		DECLARE_LITERAL_TEMP(t);			\
-		for(i=0; i<4; i++) {				\
+		for(x=0; x<4; x++) {				\
 			READ_LITERAL_PIXEL(src, t);		\
-			WRITE_4X1_LINE(dst + pitch * i, t);	\
+			WRITE_4X1_LINE(dst + pitch * x, t);	\
 		}						\
 		dst += 4;					\
 	} while(0)
@@ -355,9 +355,9 @@
 
 #define LITERAL_1X1(src, dst, pitch)				\
 	do {							\
-		int i;						\
-		for(i=0; i<4; i++) {				\
-			COPY_4X1_LINE(dst + pitch * i, src);	\
+		int x;						\
+		for(x=0; x<4; x++) {				\
+			COPY_4X1_LINE(dst + pitch * x, src);	\
 			src += 4;				\
 		}						\
 		dst += 4;					\
@@ -368,9 +368,9 @@
 
 #define COPY_4X4(dst2, dst, pitch)					  \
 	do {								  \
-		int i;							  \
-		for(i=0; i<4; i++) {					  \
-			COPY_4X1_LINE(dst + pitch * i, dst2 + pitch * i); \
+		int x;							  \
+		for(x=0; x<4; x++) {					  \
+			COPY_4X1_LINE(dst + pitch * x, dst2 + pitch * x); \
 		}							  \
 		dst += 4;						  \
 	} while(0)