[Libwpg-cvs] libwpg/src/lib WPGBitmap.cpp,1.15,1.16

[Fridrich S. <str...@us...>]

Update of /cvsroot/libwpg/libwpg/src/lib
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32645/src/lib

Modified Files:
	WPGBitmap.cpp 
Log Message:
fix some warnings

Index: WPGBitmap.cpp
===================================================================
RCS file: /cvsroot/libwpg/libwpg/src/lib/WPGBitmap.cpp,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- WPGBitmap.cpp	9 Apr 2008 09:41:58 -0000	1.15
+++ WPGBitmap.cpp	12 Apr 2008 23:10:00 -0000	1.16
@@ -39,18 +39,18 @@
 	Private(int w, int h): width(w), height(h), vFlip(false), hFlip(false), pixels(0) {}
 };
 
-libwpg::WPGBitmap::WPGBitmap(int width, int height): rect(), d(new Private(width, height))
+libwpg::WPGBitmap::WPGBitmap(int w, int h): rect(), d(new Private(w, h))
 {
-	d->pixels = new WPGColor[width*height];
+	d->pixels = new WPGColor[w*h];
 }
 
-libwpg::WPGBitmap::WPGBitmap(int width, int height, bool verticalFlip, bool horizontalFlip) :
+libwpg::WPGBitmap::WPGBitmap(int w, int h, bool verticalFlip, bool horizontalFlip) :
 	rect(),
-	d(new Private(width, height))
+	d(new Private(w, h))
 {
 	d->vFlip = verticalFlip;
 	d->hFlip = horizontalFlip;
-	d->pixels = new WPGColor[width*height];
+	d->pixels = new WPGColor[w*h];
 }
 
 libwpg::WPGBitmap::~WPGBitmap()
@@ -167,7 +167,7 @@
 					writeU8(tmpDIBBuffer, tmpBufferPosition, d->pixels[i*d->width + j].alpha);
 				}
 			else
-				for (int j = 0; j < d->width && tmpBufferPosition < tmpDIBFileSize; j++)
+				for (j = 0; j < d->width && tmpBufferPosition < tmpDIBFileSize; j++)
 				{
 					writeU8(tmpDIBBuffer, tmpBufferPosition, d->pixels[i*d->width + j].blue);
 					writeU8(tmpDIBBuffer, tmpBufferPosition, d->pixels[i*d->width + j].green);
@@ -176,7 +176,7 @@
 				}
 		}
 	else
-		for (int i = d->height - 1; i >= 0 && tmpBufferPosition < tmpDIBFileSize; i--)
+		for (i = d->height - 1; i >= 0 && tmpBufferPosition < tmpDIBFileSize; i--)
 		{
 			if (d->hFlip)
 				for (j = d->width - 1; j >= 0 && tmpBufferPosition < tmpDIBFileSize; j--)
@@ -187,7 +187,7 @@
 					writeU8(tmpDIBBuffer, tmpBufferPosition, d->pixels[i*d->width + j].alpha);
 				}
 			else
-				for (int j = 0; j < d->width && tmpBufferPosition < tmpDIBFileSize; j++)
+				for (j = 0; j < d->width && tmpBufferPosition < tmpDIBFileSize; j++)
 				{
 					writeU8(tmpDIBBuffer, tmpBufferPosition, d->pixels[i*d->width + j].blue);
 					writeU8(tmpDIBBuffer, tmpBufferPosition, d->pixels[i*d->width + j].green);