[Gnash-commit] gnash ChangeLog server/parser/action_buffer.cpp

[Sandro Santilli]

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

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

Log message:
                * server/parser/action_buffer.cpp (process_decl_dict): allow
                  overriding the constant pool. Fixes dict_override.swf

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.4584&r2=1.4585
http://cvs.savannah.gnu.org/viewcvs/gnash/server/parser/action_buffer.cpp?cvsroot=gnash&r1=1.25&r2=1.26

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.4584
retrieving revision 1.4585
diff -u -b -r1.4584 -r1.4585
--- ChangeLog   10 Oct 2007 07:01:01 -0000      1.4584
+++ ChangeLog   10 Oct 2007 07:15:09 -0000      1.4585
@@ -1,5 +1,7 @@
 2007-10-10 Sandro Santilli <address@hidden>
 
+       * server/parser/action_buffer.cpp (process_decl_dict): allow
+         overriding the constant pool. Fixes dict_override.swf
        * testsuite/misc-swfmill.all/: Makefile.am, dict_override.xml:
          New test for constant pool override (gnash fails, will fix next).
 

Index: server/parser/action_buffer.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/parser/action_buffer.cpp,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -b -r1.25 -r1.26
--- server/parser/action_buffer.cpp     4 Oct 2007 22:55:53 -0000       1.25
+++ server/parser/action_buffer.cpp     10 Oct 2007 07:15:09 -0000      1.26
@@ -17,7 +17,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
-/* $Id: action_buffer.cpp,v 1.25 2007/10/04 22:55:53 strk Exp $ */
+/* $Id: action_buffer.cpp,v 1.26 2007/10/10 07:15:09 strk Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -154,10 +154,10 @@
     }
     
     if (m_decl_dict_processed_at != -1)        {
-       log_msg(_("process_decl_dict(" SIZET_FMT ", " SIZET_FMT "): decl_dict 
was already processed at %d. "
-               "Skipping (or maybe we should append, or replace?)."),
+       log_debug(_("process_decl_dict(" SIZET_FMT ", " SIZET_FMT "): decl_dict 
was already processed at %d. "
+               "Overriding."),
                  start_pc, stop_pc, m_decl_dict_processed_at);
-       return;
+       //return;
     }
     
     m_decl_dict_processed_at = start_pc;