[Gnash-commit] gnash ChangeLog server/swf/DefineFontAlignZones...

[Benjamin Wolsey]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Benjamin Wolsey <bwy>   08/06/03 08:30:07

Modified files:
        .              : ChangeLog 
        server/swf     : DefineFontAlignZonesTag.cpp DoInitActionTag.h 
                         RemoveObjectTag.cpp 

Log message:
                * server/swf/DoInitActionTag.h, server/swf/RemoveObjectTag.cpp,
                  server/swf/DefineFontAlignZonesTag.cpp: missing ensureBytes,
                  drop gnashconfig.h include.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.6782&r2=1.6783
http://cvs.savannah.gnu.org/viewcvs/gnash/server/swf/DefineFontAlignZonesTag.cpp?cvsroot=gnash&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/gnash/server/swf/DoInitActionTag.h?cvsroot=gnash&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/gnash/server/swf/RemoveObjectTag.cpp?cvsroot=gnash&r1=1.10&r2=1.11

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.6782
retrieving revision 1.6783
diff -u -b -r1.6782 -r1.6783
--- ChangeLog   3 Jun 2008 08:26:21 -0000       1.6782
+++ ChangeLog   3 Jun 2008 08:30:06 -0000       1.6783
@@ -4,6 +4,9 @@
        * server/parser/morph_character2_def.cpp: missing ensureBytes, const
          correct function, drop SIZET_FMT.
        * server/sprite_definition.cpp: missing ensureBytes.
+       * server/swf/DoInitActionTag.h, server/swf/RemoveObjectTag.cpp,
+         server/swf/DefineFontAlignZonesTag.cpp: missing ensureBytes,
+         drop gnashconfig.h include.
 
 2008-06-03 Benjamin Wolsey <address@hidden>
 

Index: server/swf/DefineFontAlignZonesTag.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/swf/DefineFontAlignZonesTag.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- server/swf/DefineFontAlignZonesTag.cpp      5 Mar 2008 03:56:03 -0000       
1.8
+++ server/swf/DefineFontAlignZonesTag.cpp      3 Jun 2008 08:30:07 -0000       
1.9
@@ -18,10 +18,6 @@
 //
 
 
-#ifdef HAVE_CONFIG_H
-#include "gnashconfig.h"
-#endif
-
 #include "font.h"
 #include "log.h"
 #include "shape.h"
@@ -43,6 +39,7 @@
 {
        assert(tag == SWF::DEFINEALIGNZONES); // 73
 
+    in->ensureBytes(1);
        unsigned short ref = in->read_u8(); // must reference a valid 
DEFINEFONT3 tag
        font* referencedFont = m->get_font(ref);
        if ( ! referencedFont )
@@ -54,6 +51,7 @@
                return;
        }
 
+    in->ensureBytes(1);
        unsigned flags = in->read_u8(); // 2bits are cms table, 6bits are 
reserved
 
        // TODO:
@@ -66,12 +64,7 @@
        );
 
        in->skip_to_tag_end();
-       static bool warned=false;
-       if ( ! warned ) {
-               log_unimpl(_("DefineFontAlignZoneTag"));
-               warned = true;
-       }
-
+       LOG_ONCE(log_unimpl(_("DefineFontAlignZoneTag")));
 
 }
 

Index: server/swf/DoInitActionTag.h
===================================================================
RCS file: /sources/gnash/gnash/server/swf/DoInitActionTag.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- server/swf/DoInitActionTag.h        30 Apr 2008 09:15:09 -0000      1.9
+++ server/swf/DoInitActionTag.h        3 Jun 2008 08:30:07 -0000       1.10
@@ -18,10 +18,6 @@
 #ifndef GNASH_SWF_DOINITACTIONTAG_H
 #define GNASH_SWF_DOINITACTIONTAG_H
 
-#ifdef HAVE_CONFIG_H
-#include "gnashconfig.h"
-#endif
-
 #include "ControlTag.h" // for inheritance
 #include "swf.h" // for tag_type definition
 #include "action_buffer.h" // for composition
@@ -70,6 +66,7 @@
 
     static void doInitActionLoader(stream* in, tag_type tag, movie_definition* 
m)
     {
+        in->ensureBytes(2);
         int cid = in->read_u16();
         DoInitActionTag* da = new DoInitActionTag(*in, *m, cid);
 

Index: server/swf/RemoveObjectTag.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/swf/RemoveObjectTag.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- server/swf/RemoveObjectTag.cpp      30 Apr 2008 09:15:11 -0000      1.10
+++ server/swf/RemoveObjectTag.cpp      3 Jun 2008 08:30:07 -0000       1.11
@@ -18,10 +18,6 @@
 //
 
 
-#ifdef HAVE_CONFIG_H
-#include "gnashconfig.h"
-#endif
-
 #include "RemoveObjectTag.h"
 #include "sprite_instance.h"
 #include "swf.h" // for tag_type definition
@@ -41,10 +37,12 @@
                // Older SWF's allow multiple objects at the same depth;
                // this m_id disambiguates.  Later SWF's just use one
                // object per depth.
+               in->ensureBytes(2);
                m_id = in->read_u16();
        }
 
-       m_depth = in->read_u16()+character::staticDepthOffset;
+    in->ensureBytes(2);
+       m_depth = in->read_u16() + character::staticDepthOffset;
 }
 
 void