[Gnash-commit] gnash ChangeLog backend/render_handler_agg.cpp ...

[Bastiaan Jacques]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Bastiaan Jacques <bjacques>     08/03/04 00:21:14

Modified files:
        .              : ChangeLog 
        backend        : render_handler_agg.cpp render_handler_ogl.cpp 

Log message:
        Wallpaper over bug #22462: (NaN coordinates fed to renderer).

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.5789&r2=1.5790
http://cvs.savannah.gnu.org/viewcvs/gnash/backend/render_handler_agg.cpp?cvsroot=gnash&r1=1.128&r2=1.129
http://cvs.savannah.gnu.org/viewcvs/gnash/backend/render_handler_ogl.cpp?cvsroot=gnash&r1=1.106&r2=1.107

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.5789
retrieving revision 1.5790
diff -u -b -r1.5789 -r1.5790
--- ChangeLog   3 Mar 2008 20:35:38 -0000       1.5789
+++ ChangeLog   4 Mar 2008 00:21:13 -0000       1.5790
@@ -1,3 +1,8 @@
+2008-03-03 Bastiaan Jacques <address@hidden>
+
+       * backend/render_handler_{ogl,cairo}.cpp: Wallpaper over bug #22462:
+       - (NaN coordinates fed to renderer).
+
 2008-03-03  Dossy Shiobara <address@hidden>
 
        * macros/libXML.m4 (1.35): Improve detection of libxml2, especially

Index: backend/render_handler_agg.cpp
===================================================================
RCS file: /sources/gnash/gnash/backend/render_handler_agg.cpp,v
retrieving revision 1.128
retrieving revision 1.129
diff -u -b -r1.128 -r1.129
--- backend/render_handler_agg.cpp      23 Feb 2008 13:06:54 -0000      1.128
+++ backend/render_handler_agg.cpp      4 Mar 2008 00:21:14 -0000       1.129
@@ -17,7 +17,7 @@
 
  
 
-/* $Id: render_handler_agg.cpp,v 1.128 2008/02/23 13:06:54 bwy Exp $ */
+/* $Id: render_handler_agg.cpp,v 1.129 2008/03/04 00:21:14 bjacques Exp $ */
 
 // Original version by Udo Giacomozzi and Hannes Mayr, 
 // INDUNET GmbH (www.indunet.it)
@@ -1066,7 +1066,7 @@
     for (pno=0; pno<pcount; pno++) {
     
       path &the_path = paths_out[pno];     
-      point oldpnt(the_path.ap.x, the_path.ap.y);
+      point oldpnt((int)the_path.ap.x, (int)the_path.ap.y);
       point newpnt;
       mat.transform(&newpnt, oldpnt);
       the_path.ap.x = newpnt.x;    
@@ -1077,14 +1077,14 @@
       
         edge &the_edge = the_path.m_edges[eno];
         
-        oldpnt.x = the_edge.ap.x;
-        oldpnt.y = the_edge.ap.y;
+        oldpnt.x = (int)the_edge.ap.x;
+        oldpnt.y = (int)the_edge.ap.y;
         mat.transform(&newpnt, oldpnt);
         the_edge.ap.x = newpnt.x;
         the_edge.ap.y = newpnt.y;
         
-        oldpnt.x = the_edge.cp.x;
-        oldpnt.y = the_edge.cp.y;
+        oldpnt.x = (int)the_edge.cp.x;
+        oldpnt.y = (int)the_edge.cp.y;
         mat.transform(&newpnt, oldpnt);
         the_edge.cp.x = newpnt.x;
         the_edge.cp.y = newpnt.y;

Index: backend/render_handler_ogl.cpp
===================================================================
RCS file: /sources/gnash/gnash/backend/render_handler_ogl.cpp,v
retrieving revision 1.106
retrieving revision 1.107
diff -u -b -r1.106 -r1.107
--- backend/render_handler_ogl.cpp      19 Feb 2008 19:20:48 -0000      1.106
+++ backend/render_handler_ogl.cpp      4 Mar 2008 00:21:14 -0000       1.107
@@ -264,12 +264,12 @@
         it != end; ++it) {
       const edge& the_edge = *it;
       
-      point target(the_edge.ap.x, the_edge.ap.y);
+      point target((int)the_edge.ap.x, (int)the_edge.ap.y);
 
       if (the_edge.is_straight()) {
         shape_points.push_back(oglVertex(target));
       } else {
-        point control(the_edge.cp.x, the_edge.cp.y);
+        point control((int)the_edge.cp.x, (int)the_edge.cp.y);
         
         trace_curve(anchor, control, target, shape_points);
       }