libwpg-cvs

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

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

Modified Files:
	WPG2Parser.cpp 
Log Message:
trying to tweak a bit the styles

Index: WPG2Parser.cpp
===================================================================
RCS file: /cvsroot/libwpg/libwpg/src/lib/WPG2Parser.cpp,v
retrieving revision 1.104
retrieving revision 1.105
diff -u -d -r1.104 -r1.105
--- WPG2Parser.cpp	6 Jun 2010 21:06:16 -0000	1.104
+++ WPG2Parser.cpp	6 Jun 2010 21:23:25 -0000	1.105
@@ -643,16 +643,16 @@
 		return;
 	WPGGroupContext& context = m_groupStack.top();
 
-	if(context.compoundWindingRule)
-		m_style.insert("svg:fill-rule", "nonzero");
-	else
-		m_style.insert("svg:fill-rule", "evenodd");
-
 	WPXPropertyList tmpStyle = m_style;
 	
 	if (context.compoundFilled)
 		tmpStyle.insert("draw:fill", "none");
 
+	if(context.compoundWindingRule)
+		tmpStyle.insert("svg:fill-rule", "nonzero");
+	else
+		tmpStyle.insert("svg:fill-rule", "evenodd");
+
 	m_painter->setStyle( context.compoundFilled ? m_gradient : ::WPXPropertyListVector(), tmpStyle );
 
 	if (context.compoundClosed)
@@ -1381,9 +1381,9 @@
 		if (count > 2)
 		{
 			if(objCh.windingRule)
-				m_style.insert("svg:fill-rule", "nonzero");
+				tmpStyle.insert("svg:fill-rule", "nonzero");
 			else
-				m_style.insert("svg:fill-rule", "evenodd");
+				tmpStyle.insert("svg:fill-rule", "evenodd");
 
 			m_painter->setStyle( objCh.filled ? m_gradient : ::WPXPropertyListVector(), tmpStyle );
 
@@ -1487,9 +1487,9 @@
 	{
 		// otherwise draw directly
 		if(objCh.windingRule)
-			m_style.insert("svg:fill-rule", "nonzero");
+			tmpStyle.insert("svg:fill-rule", "nonzero");
 		else
-			m_style.insert("svg:fill-rule", "evenodd");
+			tmpStyle.insert("svg:fill-rule", "evenodd");
 		m_painter->setStyle( objCh.filled ? m_gradient : ::WPXPropertyListVector(), tmpStyle );
 		m_painter->drawPath(path);
 	}