[Gnash-commit] gnash/server styles.cpp

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  06/06/19 01:11:09

Modified files:
        server         : styles.cpp 

Log message:
        Fixed bug introduced in previous commit, stricter assertions.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/server/styles.cpp?cvsroot=gnash&r1=1.12&r2=1.13

Patches:
Index: styles.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/styles.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- styles.cpp  19 Jun 2006 00:05:16 -0000      1.12
+++ styles.cpp  19 Jun 2006 01:11:09 -0000      1.13
@@ -64,15 +64,16 @@
     if (m_type == SWF::FILL_SOLID)
     {
         // 0x00: solid fill
-        if (tag_type == SWF::DEFINESHAPE2)
+        if ( tag_type == SWF::DEFINESHAPE3 )
         {
-            m_color.read_rgb(in);
+            m_color.read_rgba(in);
         }
         else
         {
             // For DefineMorphShape tags we should use morph_fill_style 
-            assert( tag_type != SWF::DEFINEMORPHSHAPE );
-            m_color.read_rgba(in);
+            assert( tag_type == SWF::DEFINESHAPE
+               || tag_type == SWF::DEFINESHAPE2 );
+            m_color.read_rgb(in);
         }
 
         log_parse("  color: ");