[poppler] poppler/poppler: ArthurOutputDev.cc,1.7,1.8

[Brad Hards]

Update of /cvs/poppler/poppler/poppler
In directory gabe:/tmp/cvs-serv25223/poppler

Modified Files:
	ArthurOutputDev.cc 
Log Message:
Fix problem with drawing filled objects that was introduced in Rev 1.4.


Index: ArthurOutputDev.cc
===================================================================
RCS file: /cvs/poppler/poppler/poppler/ArthurOutputDev.cc,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- ArthurOutputDev.cc	1 Aug 2005 08:09:00 -0000	1.7
+++ ArthurOutputDev.cc	4 Aug 2005 10:15:23 -0000	1.8
@@ -212,7 +212,6 @@
   state->getFillRGB(&rgb);
   brushColour.setRgbF(rgb.r, rgb.g, rgb.b, brushColour.alphaF());
   m_currentBrush.setColor(brushColour);
-  m_painter->setBrush(m_currentBrush);
 }
 
 void ArthurOutputDev::updateStrokeColor(GfxState *state)
@@ -230,7 +229,6 @@
   QColor brushColour= m_currentBrush.color();
   brushColour.setAlphaF(state->getFillOpacity());
   m_currentBrush.setColor(brushColour);
-  m_painter->setBrush(m_currentBrush);
 }
 
 void ArthurOutputDev::updateStrokeOpacity(GfxState *state)
@@ -539,7 +537,18 @@
 	  qPath.closeSubpath();
 	}
       }
+      m_painter->save();
+      GfxRGB rgb;
+      QColor brushColour = m_currentBrush.color();
+      state->getFillRGB(&rgb);
+      brushColour.setRgbF(rgb.r, rgb.g, rgb.b, state->getFillOpacity());
+      m_painter->setBrush(brushColour);
+      QColor penColour = m_currentPen.color();
+      state->getStrokeRGB(&rgb);
+      penColour.setRgbF(rgb.r, rgb.g, rgb.b, state->getStrokeOpacity());
+      m_painter->setPen(penColour);
       m_painter->drawPath( qPath );
+      m_painter->restore();
     }
   }