[Libwpg-cvs] libwpg/src/lib WPGraphics.cpp,1.17,1.18

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

Update of /cvsroot/libwpg/libwpg/src/lib
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv19583/src/lib

Modified Files:
	WPGraphics.cpp 
Log Message:
Fix a regression that was introduced by code trying to load invalid documents :)

Index: WPGraphics.cpp
===================================================================
RCS file: /cvsroot/libwpg/libwpg/src/lib/WPGraphics.cpp,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- WPGraphics.cpp	7 Jun 2010 08:25:01 -0000	1.17
+++ WPGraphics.cpp	8 Jun 2010 05:09:26 -0000	1.18
@@ -130,6 +130,7 @@
 		tmpMajorVersion = (unsigned char)(header.majorVersion());
 		if (tmpMajorVersion == 0x01)
 		{
+			unsigned long returnPosition = graphics->tell();
 			/* Due to a bug in dumping mechanism, we produced
 			 * invalid WPG files by prepending a WPG1 header
 			 * to a valid WP file. Let us check this kind of files,
@@ -140,6 +141,9 @@
 				graphics->seek(header.startOfDocument() + 16, WPX_SEEK_SET);
 				tmpMajorVersion = (unsigned char)(header.majorVersion());
 			}
+			else
+				graphics->seek(returnPosition, WPX_SEEK_SET);
+			
 		}
 	}
 	else