[Plib-cvs] plib/src/ssg pcx.h,1.1,1.2

[Wolfram K. <wol...@us...>]

Update of /cvsroot/plib/plib/src/ssg
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4995

Modified Files:
	pcx.h 
Log Message:
Fixing a major bug that meant it read a pixel too many.

Index: pcx.h
===================================================================
RCS file: /cvsroot/plib/plib/src/ssg/pcx.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- pcx.h	12 Dec 2003 17:23:51 -0000	1.1
+++ pcx.h	24 Jan 2004 17:26:08 -0000	1.2
@@ -55,13 +55,13 @@
 		UByte color = READ_BYTE;
 		if ((color &0xC0) != 0xC0)			// uncompressed?
 		{
+			*pBody++ = color;
+			x++;
 			if (x >= width) 
 			{ x=0; y++; 	// next line
 				if(y > ppcxHeader->ymax-ppcxHeader->y)
 					break;
 			}
-			*pBody++ = color;
-			x++;
 		}
 		else				
 		{
@@ -69,16 +69,17 @@
 			color = READ_BYTE;
 			for (counter=0; counter<length; counter++)
 			{
+				*pBody++ = color;
+				x++;
 				if (x >= width) 
 				{ x=0; y++; // next line
+					counter=length;
 					if(y > ppcxHeader->ymax-ppcxHeader->y)
-						break;
+						break; // breaks for (counter=0; counte...
 				}
-				x++;
-				*pBody++ = color;
 			}
 			if(y > ppcxHeader->ymax-ppcxHeader->y)
-				break;
+				break; // breaks for(;;)
 		}
 	}
 	return TRUE;