[Libwpg-cvs] perfectspot/src canvas.cpp, 1.23, 1.24 renderer.cpp, 1.12, 1.13

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

Update of /cvsroot/libwpg/perfectspot/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15316/src

Modified Files:
	canvas.cpp renderer.cpp 
Log Message:
fix rendering of rectangles in perfectspot + add rendering of ellipses + Ariya, don't assume that the default values of a function parameters are there in each version of Qt4 :)

Index: renderer.cpp
===================================================================
RCS file: /cvsroot/libwpg/perfectspot/src/renderer.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- renderer.cpp	5 Oct 2007 11:04:31 -0000	1.12
+++ renderer.cpp	11 Jul 2008 22:42:47 -0000	1.13
@@ -166,13 +166,14 @@
 
 void Painter::drawRectangle(const WPGRect& rect, double rx, double ry)
 {
-  double roundx = rx * 100 / (rect.x2-rect.x1);
-  double roundy = ry * 100 / (rect.y2-rect.y1);
-  m_target->drawRoundRect((int)rect.x1, (int)rect.y1, (int)rect.x2, (int)rect.y2, (int)roundx, (int)roundy);
+  double roundx = rx * 200 / rect.width();
+  double roundy = ry * 200 / rect.height();
+  m_target->drawRoundRect((int)m_zoomX*rect.x1, (int)m_zoomY*rect.y1, (int)m_zoomX*rect.width(), (int)m_zoomY*rect.height(), (int)roundx, (int)roundy);
 }
 
 void Painter::drawEllipse(const WPGPoint& center, double rx, double ry)
 {
+	m_target->drawEllipse((int)m_zoomX*(center.x - rx), (int)m_zoomY*(center.y - ry), (int)2*m_zoomX*rx, (int)2*m_zoomY*ry);
 }
 
 void Painter::drawPolygon(const WPGPointArray& vertices)

Index: canvas.cpp
===================================================================
RCS file: /cvsroot/libwpg/perfectspot/src/canvas.cpp,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- canvas.cpp	9 Oct 2007 13:34:33 -0000	1.23
+++ canvas.cpp	11 Jul 2008 22:42:47 -0000	1.24
@@ -336,7 +336,7 @@
 
   // assume raster format, e.g. PNG, JPEG, ..
   else
-    return buffer.save(file);
+    return buffer.save(file, 0, -1);
 }
 
 #include "canvas.moc"