[Gnash-commit] [SCM] Gnash branch, master, updated. release_0_8_9_final-1865-g2abc23e

[Bastiaan Jacques]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Gnash".

The branch, master has been updated
       via  2abc23e7f45e4ef7c3788464184ccaffdaf5df60 (commit)
      from  46d0198a6ea32c4447363230fbb2eb61362122c6 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://git.savannah.gnu.org/cgit//commit/?id=2abc23e7f45e4ef7c3788464184ccaffdaf5df60


commit 2abc23e7f45e4ef7c3788464184ccaffdaf5df60
Author: Bastiaan Jacques <address@hidden>
Date:   Fri Apr 18 23:42:58 2014 +0200

    Savannah #39989: permit empty morph shapes.

diff --git a/libcore/swf/DefineMorphShapeTag.cpp 
b/libcore/swf/DefineMorphShapeTag.cpp
index 4be974a..13927f8 100644
--- a/libcore/swf/DefineMorphShapeTag.cpp
+++ b/libcore/swf/DefineMorphShapeTag.cpp
@@ -146,7 +146,7 @@ DefineMorphShapeTag::read(SWFStream& in, TagType tag, 
movie_definition& md,
     _bounds = bounds1;
 
     assert((_shape1.subshapes().size() == _shape2.subshapes().size()) &&
-        (_shape2.subshapes().size() == 1));
+        (_shape2.subshapes().size() <= 1));
 }
 
 } // namespace SWF
diff --git a/testsuite/misc-ming.all/morph_test1.c 
b/testsuite/misc-ming.all/morph_test1.c
index 74184c5..c398a2e 100644
--- a/testsuite/misc-ming.all/morph_test1.c
+++ b/testsuite/misc-ming.all/morph_test1.c
@@ -95,7 +95,14 @@ main(int argc, char** argv)
      it = SWFMovie_add(mo, (SWFBlock)morph);
      SWFDisplayItem_setRatio(it, ratio);
      SWFMovie_nextFrame(mo);     
-  }  
+  }
+
+  /* Test for #39989 by adding an empty morph shape. */
+  morph = newSWFMorphShape();
+  startShape = SWFMorph_getShape1(morph);
+  endShape = SWFMorph_getShape2(morph);
+  it = SWFMovie_add(mo, (SWFBlock)morph);
+  SWFMovie_nextFrame(mo);
   
   //Output movie
   puts("Saving " OUTPUT_FILENAME );

-----------------------------------------------------------------------

Summary of changes:
 libcore/swf/DefineMorphShapeTag.cpp   |    2 +-
 testsuite/misc-ming.all/morph_test1.c |    9 ++++++++-
 2 files changed, 9 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
Gnash