[Gnash-commit] gnash ChangeLog server/rect.cpp

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  06/12/05 23:05:00

Modified files:
        .              : ChangeLog 
        server         : rect.cpp 

Log message:
                * server/rect.cpp (expand_to_rect): handled world rects.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.1861&r2=1.1862
http://cvs.savannah.gnu.org/viewcvs/gnash/server/rect.cpp?cvsroot=gnash&r1=1.5&r2=1.6

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.1861
retrieving revision 1.1862
diff -u -b -r1.1861 -r1.1862
--- ChangeLog   5 Dec 2006 22:37:01 -0000       1.1861
+++ ChangeLog   5 Dec 2006 23:05:00 -0000       1.1862
@@ -1,5 +1,6 @@
 2006-12-05 Sandro Santilli <address@hidden>
 
+       * server/rect.cpp (expand_to_rect): handled world rects.
        * server/asobj/MovieClipLoader.cpp (loadClip): use smart
          pointers (to avoid testInvariant failures in sprite_instance).
        * server/types.{cpp,h} (rgba::print): made a const method.

Index: server/rect.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/rect.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- server/rect.cpp     1 Dec 2006 16:35:38 -0000       1.5
+++ server/rect.cpp     5 Dec 2006 23:05:00 -0000       1.6
@@ -87,7 +87,12 @@
 
 void  rect::expand_to_rect(const rect& r) 
 {
-       if ( r.is_null() ) return; // nothing to do
+       if ( is_world() || r.is_null() ) return; // nothing to do
+       if ( r.is_world() ) 
+       {
+               set_world();
+               return;
+       }
 
        point tmp;
        tmp = r.get_corner(0);  expand_to_point(tmp.m_x, tmp.m_y);