[Gnash-commit] gnash ChangeLog gui/fb.cpp backend/render_handl...

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  06/10/18 15:40:47

Modified files:
        .              : ChangeLog 
        gui            : fb.cpp 
        backend        : render_handler_agg.cpp 

Log message:
        don't directly access rect private members.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.1302&r2=1.1303
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/fb.cpp?cvsroot=gnash&r1=1.16&r2=1.17
http://cvs.savannah.gnu.org/viewcvs/gnash/backend/render_handler_agg.cpp?cvsroot=gnash&r1=1.24&r2=1.25

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.1302
retrieving revision 1.1303
diff -u -b -r1.1302 -r1.1303
--- ChangeLog   18 Oct 2006 15:20:18 -0000      1.1302
+++ ChangeLog   18 Oct 2006 15:40:47 -0000      1.1303
@@ -1,5 +1,7 @@
 2006-10-18 Sandro Santilli <address@hidden>
 
+       * gui/fb.cpp, backend/render_handler_agg.cpp:
+         don't directly access rect private members.
        * gui/gui.cpp: let initial _last_invalidated_rect be null;
          don't directly access rect private members.
        * server/rect.h: added constructor taking all coordinates.

Index: gui/fb.cpp
===================================================================
RCS file: /sources/gnash/gnash/gui/fb.cpp,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- gui/fb.cpp  17 Oct 2006 09:25:59 -0000      1.16
+++ gui/fb.cpp  18 Oct 2006 15:40:47 -0000      1.17
@@ -423,7 +423,7 @@
   // forward to renderer
   _renderer->set_invalidated_region(bounds);
   
-  if (bounds.m_x_max - bounds.m_x_min > 1e10f) {
+  if (bounds.width() > 1e10f) {
     // Region is entire screen. Don't convert to integer as this will overflow.
     
     m_draw_minx=0;
@@ -434,8 +434,8 @@
   } else {
 
     // remember for renderBuffer()
-    _renderer->world_to_pixel(&m_draw_minx, &m_draw_miny, bounds.m_x_min, 
bounds.m_y_min);
-    _renderer->world_to_pixel(&m_draw_maxx, &m_draw_maxy, bounds.m_x_max, 
bounds.m_y_max);
+    _renderer->world_to_pixel(&m_draw_minx, &m_draw_miny, bounds.get_x_min(), 
bounds.get_y_min());
+    _renderer->world_to_pixel(&m_draw_maxx, &m_draw_maxy, bounds.get_x_max(), 
bounds.get_y_max());
   
     // add two pixels because of anti-aliasing...
     m_draw_minx = valid_x(m_draw_minx-2);

Index: backend/render_handler_agg.cpp
===================================================================
RCS file: /sources/gnash/gnash/backend/render_handler_agg.cpp,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -b -r1.24 -r1.25
--- backend/render_handler_agg.cpp      16 Oct 2006 17:28:21 -0000      1.24
+++ backend/render_handler_agg.cpp      18 Oct 2006 15:40:47 -0000      1.25
@@ -34,7 +34,7 @@
 // forward this exception.
  
 
-/* $Id: render_handler_agg.cpp,v 1.24 2006/10/16 17:28:21 udog Exp $ */
+/* $Id: render_handler_agg.cpp,v 1.25 2006/10/18 15:40:47 strk Exp $ */
 
 // Original version by Udo Giacomozzi and Hannes Mayr, 
 // INDUNET GmbH (www.indunet.it)
@@ -1279,7 +1279,7 @@
   
   virtual void set_invalidated_region(const rect bounds) {
   
-    if (bounds.m_x_max - bounds.m_x_min > 1e10f) {
+    if (bounds.width() > 1e10f) {
     
       // Region is entire rendering buffer. Don't convert to integer as 
       // this will overflow.
@@ -1290,8 +1290,8 @@
       
     } else {
     
-      world_to_pixel(&m_clip_xmin, &m_clip_ymin, bounds.m_x_min, 
bounds.m_y_min);
-      world_to_pixel(&m_clip_xmax, &m_clip_ymax, bounds.m_x_max, 
bounds.m_y_max);
+      world_to_pixel(&m_clip_xmin, &m_clip_ymin, bounds.get_x_min(), 
bounds.get_y_min());
+      world_to_pixel(&m_clip_xmax, &m_clip_ymax, bounds.get_x_max(), 
bounds.get_y_max());
       
       // add 2 pixels (GUI does that too)
       m_clip_xmin -= 2;