[Gnash-commit] gnash ChangeLog server/shape_character_def.cpp

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  06/08/01 00:23:36

Modified files:
        .              : ChangeLog 
        server         : shape_character_def.cpp 

Log message:
        * server/shape_character_def.cpp: cleanups in read_fill_styles and 
read_line_styles.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.567&r2=1.568
http://cvs.savannah.gnu.org/viewcvs/gnash/server/shape_character_def.cpp?cvsroot=gnash&r1=1.3&r2=1.4

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.567
retrieving revision 1.568
diff -u -b -r1.567 -r1.568
--- ChangeLog   31 Jul 2006 23:26:33 -0000      1.567
+++ ChangeLog   1 Aug 2006 00:23:35 -0000       1.568
@@ -1,4 +1,9 @@
 
+2006-08-01 Sandro Santilli <address@hidden>
+
+       * server/shape_character_def.cpp: cleanups in read_fill_styles
+         and read_line_styles.
+
 2006-08-01 annonygmouse <address@hidden>
 
        * gui/gnash.cpp, gui/gtk.cpp, gui/gtksup.h, gui/gui.h, gui/sdl.cpp,

Index: server/shape_character_def.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/shape_character_def.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- server/shape_character_def.cpp      28 Jun 2006 23:27:44 -0000      1.3
+++ server/shape_character_def.cpp      1 Aug 2006 00:23:35 -0000       1.4
@@ -52,10 +52,10 @@
 
 // Read fill styles, and push them onto the given style array.
 static void
-read_fill_styles(std::vector<fill_style>* styles, stream* in,
+read_fill_styles(std::vector<fill_style>& styles, stream* in,
                int tag_type, movie_definition* m)
 {
-    assert(styles);
+    //assert(styles);
 
     // Get the count.
     int        fill_style_count = in->read_u8();
@@ -70,14 +70,15 @@
 
     // Read the styles.
     for (int i = 0; i < fill_style_count; i++) {
-       (*styles).resize((*styles).size() + 1);
-       (*styles)[(*styles).size() - 1].read(in, tag_type, m);
+       styles.resize(styles.size() + 1);
+       //styles[styles.size() - 1].read(in, tag_type, m);
+       styles.back().read(in, tag_type, m);
     }
 }
 
 
 static void
-read_line_styles(std::vector<line_style>* styles, stream* in, int tag_type)
+read_line_styles(std::vector<line_style>& styles, stream* in, int tag_type)
     // Read line styles and push them onto the back of the given array.
 {
     // Get the count.
@@ -96,8 +97,9 @@
 
     // Read the styles.
     for (int i = 0; i < line_style_count; i++) {
-       (*styles).resize((*styles).size() + 1);
-       (*styles)[(*styles).size() - 1].read(in, tag_type);
+       styles.resize(styles.size() + 1);
+       //styles[styles.size() - 1].read(in, tag_type);
+       styles.back().read(in, tag_type);
     }
 }
 
@@ -122,17 +124,14 @@
 {
     if (with_style) {
        m_bound.read(in);
-       read_fill_styles(&m_fill_styles, in, tag_type, m);
-       read_line_styles(&m_line_styles, in, tag_type);
+       read_fill_styles(m_fill_styles, in, tag_type, m);
+       read_line_styles(m_line_styles, in, tag_type);
     }
 
-    //
-    // SHAPE
-    //
     int        num_fill_bits = in->read_uint(4);
     int        num_line_bits = in->read_uint(4);
 
-    log_parse("  shape_character_def read: nfillbits = %d, nlinebits = %d\n", 
num_fill_bits, num_line_bits);
+    log_parse("  shape_character_def read: nfillbits = %d, nlinebits = %d", 
num_fill_bits, num_line_bits);
 
     // These are state variables that keep the
     // current position & style of the shape
@@ -265,8 +264,8 @@
 
                fill_base = m_fill_styles.size();
                line_base = m_line_styles.size();
-               read_fill_styles(&m_fill_styles, in, tag_type, m);
-               read_line_styles(&m_line_styles, in, tag_type);
+               read_fill_styles(m_fill_styles, in, tag_type, m);
+               read_line_styles(m_line_styles, in, tag_type);
                num_fill_bits = in->read_uint(4);
                num_line_bits = in->read_uint(4);
            }