[Libwpg-cvs] libwpg/src/conv/raw wpg2raw.cpp,1.11,1.12

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

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

Modified Files:
	wpg2raw.cpp 
Log Message:
first step in the struggle to simplify libwpg api

Index: wpg2raw.cpp
===================================================================
RCS file: /cvsroot/libwpg/libwpg/src/conv/raw/wpg2raw.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- wpg2raw.cpp	27 Jul 2008 20:56:16 -0000	1.11
+++ wpg2raw.cpp	24 Nov 2008 10:16:19 -0000	1.12
@@ -29,7 +29,8 @@
 #include <string.h>
 
 #include "libwpg.h"
-#include <libwpd-stream/WPXStreamImplementation.h>
+#include <libwpd-stream/libwpd-stream.h>
+#include <libwpd/libwpd.h>
 
 class RawPainter : public libwpg::WPGPaintInterface {
 public:
@@ -52,7 +53,7 @@
 	void drawPolygon(const libwpg::WPGPointArray& vertices);
 	void drawPath(const libwpg::WPGPath& path);
 	void drawBitmap(const libwpg::WPGBitmap& bitmap);
-	void drawImageObject(const libwpg::WPGBinaryData& binaryData);
+	void drawImageObject(const ::WPXPropertyList &propList, const ::WPXBinaryData& binaryData);
 };
 
 RawPainter::RawPainter(): libwpg::WPGPaintInterface()
@@ -153,7 +154,7 @@
 	printf("RawPainter::drawBitmap\n");
 }
 
-void RawPainter::drawImageObject(const libwpg::WPGBinaryData& /*binaryData*/)
+void RawPainter::drawImageObject(const ::WPXPropertyList& /* propList */, const ::WPXBinaryData& /*binaryData*/)
 {
 	printf("RawPainter::drawBinaryData\n");
 }