CVSROOT: /sources/gnash
Module name: gnash
Changes by: Sandro Santilli <strk> 07/09/26 19:46:29
Modified files:
. : ChangeLog
server/parser : morph2_character_def.cpp
Log message:
* server/parser/morph2_character_def.cpp (read):
Don't print malformed swf errors if number of paths in
defining
shapes don't match: only edges matter.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.4428&r2=1.4429
http://cvs.savannah.gnu.org/viewcvs/gnash/server/parser/morph2_character_def.cpp?cvsroot=gnash&r1=1.16&r2=1.17
Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.4428
retrieving revision 1.4429
diff -u -b -r1.4428 -r1.4429
--- ChangeLog 26 Sep 2007 19:14:07 -0000 1.4428
+++ ChangeLog 26 Sep 2007 19:46:28 -0000 1.4429
@@ -1,5 +1,8 @@
2007-09-26 Sandro Santilli <[EMAIL PROTECTED]>
+ * server/parser/morph2_character_def.cpp (read):
+ Don't print malformed swf errors if number of paths in defining
+ shapes don't match: only edges matter.
* gui/gtk.cpp (gdk_to_gnash_key): GDK_ooblique => GDK_oslash
(gtk-2.0 in debian stable doesn't define the former).
* server/: BevelFilter.h, BlurFilter.h, ConvolutionFilter.h,
Index: server/parser/morph2_character_def.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/parser/morph2_character_def.cpp,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- server/parser/morph2_character_def.cpp 10 Sep 2007 17:15:01 -0000
1.16
+++ server/parser/morph2_character_def.cpp 26 Sep 2007 19:46:29 -0000
1.17
@@ -17,7 +17,7 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
//
-/* $Id: morph2_character_def.cpp,v 1.16 2007/09/10 17:15:01 strk Exp $ */
+/* $Id: morph2_character_def.cpp,v 1.17 2007/09/26 19:46:29 strk Exp $ */
// Based on the public domain morph2.cpp of:
// Thatcher Ulrich <[EMAIL PROTECTED]>, Mike Shaver <[EMAIL PROTECTED]> 2003,
@@ -292,17 +292,9 @@
);
IF_VERBOSE_MALFORMED_SWF(
-
-
- if ( m_shape1->m_paths.size() != m_shape2->m_paths.size() )
- {
- log_swferror(_("Different number of paths "
- "in start (" SIZET_FMT ") and end (" SIZET_FMT
- ") shapes of a morph"),
- m_shape1->m_paths.size(),
- m_shape2->m_paths.size());
- }
- else if ( edges_count1 != edges_count2 )
+ // It is perfectly legal to have a different number of patsh,
+ // edges count should be the same instead
+ if ( edges_count1 != edges_count2 )
{
log_swferror(_("Different number of edges "
"in start (%u) and end (%u) shapes "
_______________________________________________
Gnash-commit mailing list
[email protected]
http://lists.gnu.org/mailman/listinfo/gnash-commit
