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

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  08/01/03 12:36:32

Modified files:
        .              : ChangeLog 
        server         : fill_style.cpp 

Log message:
        if no gradients are defined return the black color. Fixes an assertion 
failure
        on malformed or as-defined gradientrecord-less linear grads.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.5289&r2=1.5290
http://cvs.savannah.gnu.org/viewcvs/gnash/server/fill_style.cpp?cvsroot=gnash&r1=1.18&r2=1.19

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.5289
retrieving revision 1.5290
diff -u -b -r1.5289 -r1.5290
--- ChangeLog   2 Jan 2008 19:08:30 -0000       1.5289
+++ ChangeLog   3 Jan 2008 12:36:31 -0000       1.5290
@@ -1,3 +1,9 @@
+2008-01-03 Sandro Santilli <address@hidden>
+
+       * server/fill_style.cpp (sample_gradient): if no gradients
+         are defined return the black color. Fixes an assertion failure
+         on malformed or as-defined gradientrecord-less linear grads.
+
 2008-01-02 Sandro Santilli <address@hidden>
 
        * server/DynamicShape.{cpp,h},

Index: server/fill_style.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/fill_style.cpp,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- server/fill_style.cpp       2 Jan 2008 19:08:31 -0000       1.18
+++ server/fill_style.cpp       3 Jan 2008 12:36:32 -0000       1.19
@@ -320,7 +320,11 @@
                || m_type == SWF::FILL_RADIAL_GRADIENT
                || m_type == SWF::FILL_FOCAL_GRADIENT);
 
-       assert(m_gradients.size());
+       if ( m_gradients.empty() )
+       {
+               static const rgba black;
+               return black;
+       }
 
        // By specs, first gradient should *always* be 0, 
        // anyway a malformed SWF could break this,