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

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  06/10/18 10:31:32

Modified files:
        .              : ChangeLog 
        server         : rect.cpp 

Log message:
                * server/rect.cpp (expand_to_transformed_rect): do nothing
                  when rect to expand to is null.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.1280&r2=1.1281
http://cvs.savannah.gnu.org/viewcvs/gnash/server/rect.cpp?cvsroot=gnash&r1=1.1&r2=1.2

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.1280
retrieving revision 1.1281
diff -u -b -r1.1280 -r1.1281
--- ChangeLog   18 Oct 2006 08:16:06 -0000      1.1280
+++ ChangeLog   18 Oct 2006 10:31:32 -0000      1.1281
@@ -1,4 +1,10 @@
-2006-10-16 Hannes Mayr <address@hidden>
+2006-10-18 Sandro Santilli <address@hidden>
+
+       * server/rect.cpp (expand_to_transformed_rect): do nothing
+         when rect to expand to is null.
+
+2006-10-18 Hannes Mayr <address@hidden>
+
        * configure.ac: Added Option 'no' to --enable-sound's help output.
 
 2006-10-18 Markus Gothe <address@hidden>

Index: server/rect.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/rect.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- server/rect.cpp     17 Oct 2006 15:32:48 -0000      1.1
+++ server/rect.cpp     18 Oct 2006 10:31:32 -0000      1.2
@@ -175,7 +175,10 @@
 
 void   rect::expand_to_transformed_rect(const matrix& m, const rect& r)
 {
-       assert ( ! r.is_null() ); // caller should check this
+       // a null rectangle will always be null, no matter
+       // how you transform it.
+       if ( r.is_null() ) return;
+
        // Get the transformed bounding box.
        point   p0, p1, p2, p3;
        m.transform(&p0, r.get_corner(0));