[Libwpg-cvs] libwpg/src/conv/raw wpg2raw.cpp,1.22,1.23

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

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

Modified Files:
	wpg2raw.cpp 
Log Message:
Trying to finish the 0.2.0 series release

Index: wpg2raw.cpp
===================================================================
RCS file: /cvsroot/libwpg/libwpg/src/conv/raw/wpg2raw.cpp,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- wpg2raw.cpp	5 Dec 2008 15:17:25 -0000	1.22
+++ wpg2raw.cpp	7 Sep 2009 08:10:18 -0000	1.23
@@ -44,7 +44,7 @@
 	void startEmbeddedGraphics(const ::WPXPropertyList& propList);
 	void endEmbeddedGraphics();
 
-	void setStyle(const libwpg::WPGDashArray& dashArray, const libwpg::WPGGradient& gradient, const ::WPXPropertyList &propList);
+	void setStyle(const libwpg::WPGDashArray& dashArray, const ::WPXPropertyListVector& gradient, const ::WPXPropertyList &propList);
 
 	void drawRectangle(const ::WPXPropertyList &propList);
 	void drawEllipse(const ::WPXPropertyList& propList);
@@ -135,15 +135,9 @@
 	printf("RawPainter::endEmbeddedGraphics \n");
 }
 
-void RawPainter::setStyle(const libwpg::WPGDashArray& dashArray, const libwpg::WPGGradient& gradient, const ::WPXPropertyList &propList)
+void RawPainter::setStyle(const libwpg::WPGDashArray& dashArray, const ::WPXPropertyListVector& gradient, const ::WPXPropertyList &propList)
 {
-	libwpg::WPGGradient tmpGradient = gradient;
-	printf("RawPainter::setStyle(%s)\n", getPropString(propList).cstr());
-
-	if(propList["draw:fill"] && propList["draw:fill"]->getStr() == "gradient")
-	for(unsigned c = 0; c < tmpGradient.count(); c++)
-		printf("  Gradient stop %d: %f   RGB %s  Opacity %f\n", c+1,
-			tmpGradient.stopOffset(c), tmpGradient.stopColor(c).cstr(), tmpGradient.stopOpacity(c));
+	printf("RawPainter::setStyle(gradient: (%s), %s)\n", getPropString(gradient).cstr(), getPropString(propList).cstr());
 }
 
 void RawPainter::drawRectangle(const ::WPXPropertyList &propList)