[Gnash-commit] gnash ChangeLog server/parser/morph2_character_...

[Benjamin Wolsey]

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

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

Log message:
                * server/parser/morph_character2_def.cpp: missing ensureBytes, 
const
                  correct function, drop SIZET_FMT.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.6780&r2=1.6781
http://cvs.savannah.gnu.org/viewcvs/gnash/server/parser/morph2_character_def.cpp?cvsroot=gnash&r1=1.26&r2=1.27

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.6780
retrieving revision 1.6781
diff -u -b -r1.6780 -r1.6781
--- ChangeLog   3 Jun 2008 08:23:01 -0000       1.6780
+++ ChangeLog   3 Jun 2008 08:25:08 -0000       1.6781
@@ -1,6 +1,8 @@
 2008-06-03 Benjamin Wolsey <address@hidden>
 
        * server/fill_style.cpp: missing ensureBytes.
+       * server/parser/morph_character2_def.cpp: missing ensureBytes, const
+         correct function, drop SIZET_FMT.
 
 2008-06-03 Benjamin Wolsey <address@hidden>
 

Index: server/parser/morph2_character_def.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/parser/morph2_character_def.cpp,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -b -r1.26 -r1.27
--- server/parser/morph2_character_def.cpp      18 May 2008 20:36:13 -0000      
1.26
+++ server/parser/morph2_character_def.cpp      3 Jun 2008 08:25:09 -0000       
1.27
@@ -46,7 +46,7 @@
        {}
 
        /// Return number of edges in the path list
-       size_t size()
+       size_t size() const
        {
                return _nedges;
        }
@@ -215,6 +215,8 @@
                inner_bound2.read(in);
                // This should be used -- first 6 bits reserved, then 
'non-scaling' stroke,
                // then 'scaling' stroke -- these can be used to optimize 
morphing.
+               
+               in->ensureBytes(1);
                static_cast<void>(in->read_u8());
        }
 
@@ -272,8 +274,8 @@
 
                IF_VERBOSE_PARSE(
                  log_parse("morph: "
-                         "startShape(paths:" SIZET_FMT ", edges:%u), "
-                         "endShape(paths:" SIZET_FMT ", edges:%u)",
+                         "startShape(paths:%d, edges:%u), "
+                         "endShape(paths:%d, edges:%u)",
                          m_shape1->m_paths.size(), edges_count1,
                          m_shape2->m_paths.size(), edges_count2);
                );