[Libwpg-cvs] libwpg/src/lib WPG2Parser.cpp,1.5,1.6

[Ariya H. <ar...@us...>]

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

Modified Files:
	WPG2Parser.cpp 
Log Message:
sanity check regarding dimension
based on patch by Fridrich


Index: WPG2Parser.cpp
===================================================================
RCS file: /cvsroot/libwpg/libwpg/src/lib/WPG2Parser.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- WPG2Parser.cpp	17 Jun 2006 08:11:53 -0000	1.5
+++ WPG2Parser.cpp	18 Jun 2006 07:26:30 -0000	1.6
@@ -308,10 +308,10 @@
 	unsigned long imageY2 = (m_doublePrecision) ? readU32() : readU16();
 
     // used to adjust coordinates	
-    m_xofs = imageX1;
-    m_yofs = imageY1;
-    m_width = imageX2-imageX1;
-    m_height = imageY2-imageY1;
+    m_xofs = (imageX1 < imageX2) ? imageX1 : imageX2;
+    m_yofs = (imageY1 < imageY2) ? imageY1 : imageX2;
+    m_width = (imageX2 > imageX1 ) ? imageX2-imageX1 : imageX1-imageX2;
+    m_height = (imageY2 > imageY1) ? imageY2-imageY1 : imageY1-imageY2;
 	
 	WPG_DEBUG_MSG(("StartWPG\n"));
 	WPG_DEBUG_MSG(("  Horizontal unit of measure : %d pixels/inch\n", horizontalUnit));