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

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  06/12/01 16:43:56

Modified files:
        .              : ChangeLog 
        backend        : render_handler_agg.cpp 

Log message:
                * backend/render_handler_agg.cpp (set_invalidated_region):
                  Temporary hack to fix bug #18416, and a way to
                  show Udo a usage case. The real solution is use
                  Range2d<int> instead of m_clip_{x,y}{max,min}.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.1842&r2=1.1843
http://cvs.savannah.gnu.org/viewcvs/gnash/backend/render_handler_agg.cpp?cvsroot=gnash&r1=1.47&r2=1.48

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.1842
retrieving revision 1.1843
diff -u -b -r1.1842 -r1.1843
--- ChangeLog   1 Dec 2006 16:35:38 -0000       1.1842
+++ ChangeLog   1 Dec 2006 16:43:55 -0000       1.1843
@@ -1,5 +1,12 @@
 2006-12-01 Sandro Santilli <address@hidden>
 
+       * backend/render_handler_agg.cpp (set_invalidated_region):
+         Temporary hack to fix bug #18416, and a way to 
+         show Udo a usage case. The real solution is use
+         Range2d<int> instead of m_clip_{x,y}{max,min}.
+
+2006-12-01 Sandro Santilli <address@hidden>
+
        * server/Makefile.am, server/rect.cpp, server/rect.h,
          server/asobj/Makefile.am, server/parser/Makefile.am,
           server/parser/movie_definition.h, server/parser/video_stream_def.h,

Index: backend/render_handler_agg.cpp
===================================================================
RCS file: /sources/gnash/gnash/backend/render_handler_agg.cpp,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -b -r1.47 -r1.48
--- backend/render_handler_agg.cpp      30 Nov 2006 21:52:37 -0000      1.47
+++ backend/render_handler_agg.cpp      1 Dec 2006 16:43:56 -0000       1.48
@@ -16,7 +16,7 @@
 
  
 
-/* $Id: render_handler_agg.cpp,v 1.47 2006/11/30 21:52:37 strk Exp $ */
+/* $Id: render_handler_agg.cpp,v 1.48 2006/12/01 16:43:56 strk Exp $ */
 
 // Original version by Udo Giacomozzi and Hannes Mayr, 
 // INDUNET GmbH (www.indunet.it)
@@ -120,6 +120,7 @@
 #include "log.h"
 #include "render_handler.h"
 #include "render_handler_agg.h" 
+#include "Range2d.h"
 
 #include "shape_character_def.h" 
 #include "generic_character.h"  
@@ -1387,11 +1388,30 @@
       m_clip_xmax += 2;
       m_clip_ymax += 2;
   
+#if 1 // temporary and overkill solution to bug #18416, and an example
+      // of Range2d<> class use
+
+      using gnash::geometry::Range2d;
+
+      Range2d<int> clipbounds(m_clip_xmin, m_clip_ymin, m_clip_xmax, 
m_clip_ymax);
+      Range2d<int> visiblerect(0, 0, xres-1, yres-1);
+      Range2d<int> actualbounds = Intersection(clipbounds, visiblerect);
+
+      m_clip_xmin = actualbounds.getMinX();
+      m_clip_xmax = actualbounds.getMaxX();
+      m_clip_ymin = actualbounds.getMinY();
+      m_clip_ymax = actualbounds.getMaxY();
+
+#else // bogus implementation (can make min > max)
+
+      if (m_clip_xmin < 0) m_clip_xmin=0;    
       if (m_clip_xmin < 0) m_clip_xmin=0;    
       if (m_clip_ymin < 0) m_clip_ymin=0;    
       if (m_clip_xmax > xres-1) m_clip_xmax = xres-1;    
       if (m_clip_ymax > yres-1) m_clip_ymax = yres-1;
       
+#endif
+      
      }    
   
   }