[Libwpg-cvs] libwpg/src/conv/raw wpg2raw.cpp,1.14,1.15

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

Update of /cvsroot/libwpg/libwpg/src/conv/raw
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv16195/src/conv/raw

Modified Files:
	wpg2raw.cpp 
Log Message:
WPGRect gone + simplify WPGBitmap so that it doesn't duplicat functionalities in other classes

Index: wpg2raw.cpp
===================================================================
RCS file: /cvsroot/libwpg/libwpg/src/conv/raw/wpg2raw.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- wpg2raw.cpp	27 Nov 2008 14:15:17 -0000	1.14
+++ wpg2raw.cpp	27 Nov 2008 16:33:00 -0000	1.15
@@ -47,12 +47,12 @@
 	void setBrush(const libwpg::WPGBrush& brush);
 	void setFillRule(FillRule rule);
 
-	void drawRectangle(const libwpg::WPGRect& rect, double rx, double ry);
+	void drawRectangle(const ::WPXPropertyList &propList);
 	void drawEllipse(const ::WPXPropertyList& propList);
 	void drawPolyline(const ::WPXPropertyListVector& vertices);
 	void drawPolygon(const ::WPXPropertyListVector& vertices);
 	void drawPath(const ::WPXPropertyListVector& path);
-	void drawBitmap(const libwpg::WPGBitmap& bitmap);
+	void drawBitmap(const ::WPXPropertyList &propList, const libwpg::WPGBitmap& bitmap);
 	void drawImageObject(const ::WPXPropertyList &propList, const ::WPXBinaryData& binaryData);
 };
 
@@ -164,11 +164,9 @@
 	printf("RawPainter::setFillRule\n");
 }
 
-void RawPainter::drawRectangle(const libwpg::WPGRect& rect, double rx, double ry)
+void RawPainter::drawRectangle(const ::WPXPropertyList &propList)
 {
-	printf("RawPainter::drawRoundedRectangle ");
-	printf(" (%g %g)-(%g,%g)", rect.x1, rect.y1, rect.x2, rect.y2);
-	printf("  Roundndess: %g %g\n", rx, ry);
+	printf("RawPainter::drawRectangle (%s)\n", getPropString(propList).cstr());
 }
 
 void RawPainter::drawEllipse(const ::WPXPropertyList& propList)
@@ -191,9 +189,9 @@
 	printf("RawPainter::drawPath (%s)\n", getPropString(path).cstr());
 }
 
-void RawPainter::drawBitmap(const libwpg::WPGBitmap& /*bitmap*/)
+void RawPainter::drawBitmap(const ::WPXPropertyList &propList, const libwpg::WPGBitmap& /*bitmap*/)
 {
-	printf("RawPainter::drawBitmap\n");
+	printf("RawPainter::drawBitmap (%s)\n", getPropString(propList).cstr());
 }
 
 void RawPainter::drawImageObject(const ::WPXPropertyList& propList, const ::WPXBinaryData& /*binaryData*/)