[Gnash-commit] gnash/server/parser movie_def_impl.cpp sprite_d...

[Vitaly Alexeev]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Vitaly Alexeev <alexeev>        06/09/23 16:22:43

Modified files:
        server/parser  : movie_def_impl.cpp sprite_definition.cpp 

Log message:
        The improved version of create_empty_movieclip(). Thanks Sandro Santilli

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/server/parser/movie_def_impl.cpp?cvsroot=gnash&r1=1.19&r2=1.20
http://cvs.savannah.gnu.org/viewcvs/gnash/server/parser/sprite_definition.cpp?cvsroot=gnash&r1=1.1&r2=1.2

Patches:
Index: movie_def_impl.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/parser/movie_def_impl.cpp,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20
--- movie_def_impl.cpp  21 Sep 2006 15:17:39 -0000      1.19
+++ movie_def_impl.cpp  23 Sep 2006 16:22:43 -0000      1.20
@@ -378,30 +378,6 @@
        m_jpeg_in(0),
        _loader(*this)
 {
-       // create empty movie_def_impl (it is used for createEmptyMovieClip() 
method)
-       if (m_create_bitmaps == DO_EMPTY_MOVIECLIP)
-       {
-               m_frame_count = 1;
-               m_version = 7;
-               m_loading_frame = 1;
-
-               m_frame_size.m_x_min = 0.0f;
-               m_frame_size.m_x_max = 1.0f;
-               m_frame_size.m_y_min = 0.0f;
-               m_frame_size.m_y_max = 1.0f;
-
-               m_file_length = 0;
-               m_loading_sound_stream = 0;
-               in = NULL;
-
-               m_playlist.resize(1);
-               m_playlist[0].push_back(new execute_tag());
-
-               m_init_action_list.resize(1);
-               m_init_action_list[0].push_back(new execute_tag());
-
-       }
-
 }
 
 movie_def_impl::~movie_def_impl()

Index: sprite_definition.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/parser/sprite_definition.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- sprite_definition.cpp       24 Aug 2006 00:57:20 -0000      1.1
+++ sprite_definition.cpp       23 Sep 2006 16:22:43 -0000      1.2
@@ -172,8 +172,20 @@
        m_frame_count(0),
        m_loading_frame(0)
 {
+       // create empty sprite_definition (it is used for 
createEmptyMovieClip() method)
+       if (m_movie_def == NULL && in == NULL)
+       {
+               m_frame_count = 1;
+               m_loading_frame = 1;
+
+               m_playlist.resize(1);
+               m_playlist[0].push_back(new execute_tag());
+       }
+       else
+       {
        assert(m_movie_def);
        read(in);
+       }
 }