[Gnash-commit] [SCM] Gnash branch, master, updated. release_0_8_9_final-1889-g608ce8e

[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  608ce8e1577d2bb0bc7c6cdf726cc0be8f1200ee (commit)
      from  7fc40410107c6c348fa18c5e726cf036d038a7b8 (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=608ce8e1577d2bb0bc7c6cdf726cc0be8f1200ee


commit 608ce8e1577d2bb0bc7c6cdf726cc0be8f1200ee
Author: Bastiaan Jacques <address@hidden>
Date:   Mon Apr 21 17:30:35 2014 +0200

    Savannah #39989: Don't assert for empty morph shapes.

diff --git a/libcore/swf/ShapeRecord.cpp b/libcore/swf/ShapeRecord.cpp
index 23d8b0a..9e362de 100644
--- a/libcore/swf/ShapeRecord.cpp
+++ b/libcore/swf/ShapeRecord.cpp
@@ -198,7 +198,9 @@ void
 ShapeRecord::setLerp(const ShapeRecord& aa, const ShapeRecord& bb,
         const double ratio)
 {
-       assert(_subshapes.size() == 1);
+    if (_subshapes.empty()) {
+       return;
+    }
 
     // Update current bounds.
     _bounds.set_lerp(aa.getBounds(), bb.getBounds(), ratio);
diff --git a/testsuite/misc-ming.all/morph_test1runner.cpp 
b/testsuite/misc-ming.all/morph_test1runner.cpp
index b7b265e..e87a11d 100644
--- a/testsuite/misc-ming.all/morph_test1runner.cpp
+++ b/testsuite/misc-ming.all/morph_test1runner.cpp
@@ -83,5 +83,9 @@ main(int /*argc*/, char** /*argv*/)
   tester.advance(); 
   // fill color: 0.0*red + 1.0*green
   check_pixel(750, 550, 50, rgba(0,255,0,255), 2); // morph ratio = 1.0
+
+  // Frame 8
+  tester.advance();
+  // #39989. Nothing to check: empty morph shape.
 }
 

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

Summary of changes:
 libcore/swf/ShapeRecord.cpp                   |    4 +++-
 testsuite/misc-ming.all/morph_test1runner.cpp |    4 ++++
 2 files changed, 7 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
Gnash