[Gnash-commit] gnash ChangeLog server/parser/morph2_character_...

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  07/09/10 17:15:01

Modified files:
        .              : ChangeLog 
        server/parser  : morph2_character_def.cpp 

Log message:
                * server/parser/morph2_character_def.cpp (read):
                  Set shapes bounds *after* calling ::read() on them.
                  Fixes bug #21020.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.4263&r2=1.4264
http://cvs.savannah.gnu.org/viewcvs/gnash/server/parser/morph2_character_def.cpp?cvsroot=gnash&r1=1.15&r2=1.16

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.4263
retrieving revision 1.4264
diff -u -b -r1.4263 -r1.4264
--- ChangeLog   10 Sep 2007 16:53:28 -0000      1.4263
+++ ChangeLog   10 Sep 2007 17:15:00 -0000      1.4264
@@ -1,5 +1,11 @@
 2007-09-10 Sandro Santilli <address@hidden>
 
+       * server/parser/morph2_character_def.cpp (read):
+         Set shapes bounds *after* calling ::read() on them.
+         Fixes bug #21020.
+
+2007-09-10 Sandro Santilli <address@hidden>
+
        * server/bitmap_info.h: drop OGL-specific members.
        * libbase/image.{cpp,h}: cleanup the image_base interface:
          - make more members private to reduce chaces of buffer size

Index: server/parser/morph2_character_def.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/parser/morph2_character_def.cpp,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- server/parser/morph2_character_def.cpp      10 Sep 2007 04:29:54 -0000      
1.15
+++ server/parser/morph2_character_def.cpp      10 Sep 2007 17:15:01 -0000      
1.16
@@ -17,7 +17,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
-/* $Id: morph2_character_def.cpp,v 1.15 2007/09/10 04:29:54 cmusick Exp $ */
+/* $Id: morph2_character_def.cpp,v 1.16 2007/09/10 17:15:01 strk Exp $ */
 
 // Based on the public domain morph2.cpp of:
 // Thatcher Ulrich <address@hidden>, Mike Shaver <address@hidden> 2003,
@@ -219,8 +219,6 @@
                rect    bound1, bound2;
                bound1.read(in);
                bound2.read(in);
-               m_shape1->set_bound(bound1);
-               m_shape2->set_bound(bound2);
 
        if (tag_type == SWF::DEFINEMORPHSHAPE2 || tag_type == 
SWF::DEFINEMORPHSHAPE2_)
        {
@@ -260,6 +258,12 @@
                in->align();
                m_shape2->read(in, tag_type, false, md);
 
+               // Set bounds as read in *this* tags rather then
+               // the one computed from shape_character_def parser
+               // (does it make sense ?)
+               m_shape1->set_bound(bound1);
+               m_shape2->set_bound(bound2);
+
                assert(m_shape1->m_fill_styles.size() == 
m_shape2->m_fill_styles.size());
                assert(m_shape1->m_line_styles.size() == 
m_shape2->m_line_styles.size());