[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnash-commit] gnash ChangeLog server/parser/sprite_definition...
From: |
Benjamin Wolsey |
Subject: |
[Gnash-commit] gnash ChangeLog server/parser/sprite_definition... |
Date: |
Wed, 07 May 2008 10:07:46 +0000 |
CVSROOT: /sources/gnash
Module name: gnash
Changes by: Benjamin Wolsey <bwy> 08/05/07 10:07:46
Modified files:
. : ChangeLog
server/parser : sprite_definition.cpp
Log message:
* server/parser/sprite_definition.cpp: drop loaded frame
assertion.
It's fine for this to exceed total frames. Fixes bug #23186.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.6538&r2=1.6539
http://cvs.savannah.gnu.org/viewcvs/gnash/server/parser/sprite_definition.cpp?cvsroot=gnash&r1=1.33&r2=1.34
Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.6538
retrieving revision 1.6539
diff -u -b -r1.6538 -r1.6539
--- ChangeLog 7 May 2008 09:41:12 -0000 1.6538
+++ ChangeLog 7 May 2008 10:07:45 -0000 1.6539
@@ -1,5 +1,10 @@
2008-05-07 Benjamin Wolsey <address@hidden>
+ * server/parser/sprite_definition.cpp: drop loaded frame assertion.
+ It's fine for this to exceed total frames. Fixes bug #23186.
+
+2008-05-07 Benjamin Wolsey <address@hidden>
+
* libbase/GnashException.h: make ActionException ctor protected
so that it can't be used directly. Add ActionParserException
subclass for bad action_buffer accesses. Make ActionTypeError
Index: server/parser/sprite_definition.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/parser/sprite_definition.cpp,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -b -r1.33 -r1.34
--- server/parser/sprite_definition.cpp 21 Apr 2008 11:27:45 -0000 1.33
+++ server/parser/sprite_definition.cpp 7 May 2008 10:07:46 -0000 1.34
@@ -169,7 +169,11 @@
sprite_definition::add_frame_name(const std::string& name)
{
//log_debug(_("labelframe: frame %d, name %s"), m_loading_frame, name);
- assert(m_loading_frame < m_frame_count);
+
+ // It's fine for loaded frames to exceed frame count. Should be
+ // adjusted at the end of parsing.
+ //
+ //assert(m_loading_frame < m_frame_count);
m_named_frames[name] = m_loading_frame;
}
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gnash-commit] gnash ChangeLog server/parser/sprite_definition...,
Benjamin Wolsey <=