[Gnash-commit] gnash ChangeLog server/Makefile.am server/parse...

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  06/09/26 08:15:51

Modified files:
        .              : ChangeLog 
        server         : Makefile.am 
        server/parser  : bitmap_character_def.cpp bitmap_character_def.h 
Removed files:
        server         : bitmap_character_instance.cpp 
                         bitmap_character_instance.h 

Log message:
                  Removed bitmap_character_instance (bitmap characters never
                  get instantiated). Had bitmap_character directly derive
                  from ref_counted (it is *not* internally used as a 
character_def
                  becase it is stored in a separate container in movie_def_impl)

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.922&r2=1.923
http://cvs.savannah.gnu.org/viewcvs/gnash/server/Makefile.am?cvsroot=gnash&r1=1.66&r2=1.67
http://cvs.savannah.gnu.org/viewcvs/gnash/server/bitmap_character_instance.cpp?cvsroot=gnash&r1=1.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/gnash/server/bitmap_character_instance.h?cvsroot=gnash&r1=1.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/gnash/server/parser/bitmap_character_def.cpp?cvsroot=gnash&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/gnash/server/parser/bitmap_character_def.h?cvsroot=gnash&r1=1.7&r2=1.8

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.922
retrieving revision 1.923
diff -u -b -r1.922 -r1.923
--- ChangeLog   26 Sep 2006 07:42:26 -0000      1.922
+++ ChangeLog   26 Sep 2006 08:15:51 -0000      1.923
@@ -1,6 +1,14 @@
 2006-09-26 Sandro Santilli  <address@hidden>
 
        * server/parser/movie_def_impl.h: doxygen comments update.
+       * server/Makefile.am, server/bitmap_character_instance.cpp,
+         server/bitmap_character_instance.h,
+         server/parser/bitmap_character_def.cpp,
+         server/parser/bitmap_character_def.h:
+         Removed bitmap_character_instance (bitmap characters never
+         get instantiated). Had bitmap_character directly derive
+         from ref_counted (it is *not* internally used as a character_def
+         becase it is stored in a separate container in movie_def_impl)
 
 2006-09-25 Sandro Santilli  <address@hidden>
 

Index: server/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/server/Makefile.am,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -b -r1.66 -r1.67
--- server/Makefile.am  25 Sep 2006 15:17:42 -0000      1.66
+++ server/Makefile.am  26 Sep 2006 08:15:51 -0000      1.67
@@ -75,7 +75,6 @@
        as_environment.cpp       \
        as_function.cpp         \
        swf_function.cpp        \
-       bitmap_character_instance.cpp \
        character.cpp \
         textformat.cpp \
         timers.cpp \
@@ -117,7 +116,6 @@
        as_value.h \
        as_environment.h \
        as_function.h           \
-       bitmap_character_instance.h \
        builtin_function.h      \
        swf_function.h          \
        as_member.h \

Index: server/parser/bitmap_character_def.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/parser/bitmap_character_def.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- server/parser/bitmap_character_def.cpp      25 Sep 2006 15:17:42 -0000      
1.1
+++ server/parser/bitmap_character_def.cpp      26 Sep 2006 08:15:51 -0000      
1.2
@@ -47,7 +47,7 @@
 #endif
 
 #include "bitmap_character_def.h"
-#include "bitmap_character_instance.h"
+//#include "bitmap_character_instance.h"
 #include "gnash.h" // for bitmap_info
 #include "render.h"
 
@@ -78,6 +78,7 @@
        return _bitmap_info.get_ptr();
 }
 
+#if 0
 character*
 bitmap_character_def::create_character_instance(character* parent, int id)
 {
@@ -85,5 +86,6 @@
                this, parent, -1);
        return instance;
 }
+#endif
 
 } // namespace gnash

Index: server/parser/bitmap_character_def.h
===================================================================
RCS file: /sources/gnash/gnash/server/parser/bitmap_character_def.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- server/parser/bitmap_character_def.h        25 Sep 2006 16:33:01 -0000      
1.7
+++ server/parser/bitmap_character_def.h        26 Sep 2006 08:15:51 -0000      
1.8
@@ -44,7 +44,7 @@
 #endif
 
 #include "gnash.h" // for bitmap_info definition
-#include "character_def.h" // for character_def inheritance
+#include "ref_counted.h" // for character_def inheritance
 #include "action.h"
 #include "types.h"
 #include "container.h"
@@ -80,7 +80,7 @@
 /// or image::rgba pointer. We should probably move
 /// the methods for actually reading such tags instead.
 ///
-class bitmap_character_def : public character_def
+class bitmap_character_def : public ref_counted
 {
 
 public:
@@ -99,8 +99,10 @@
                _image.rgba = image;
        }
 
+#if 0
        virtual character* create_character_instance(character* parent,
                        int id);
+#endif
 
        // Use the renderer to create a bitmap_info from the image
        // information. DO NOT CALL THIS FUNCTION FROM THE PARSER LIB !
@@ -114,11 +116,13 @@
        }
 #endif
 
+
 private:
 
        smart_ptr<gnash::bitmap_info> _bitmap_info;
 
        image_rgb_or_rgba _image;
+
 };
 
 

Index: server/bitmap_character_instance.cpp
===================================================================
RCS file: server/bitmap_character_instance.cpp
diff -N server/bitmap_character_instance.cpp
--- server/bitmap_character_instance.cpp        25 Sep 2006 15:17:42 -0000      
1.1
+++ /dev/null   1 Jan 1970 00:00:00 -0000
@@ -1,58 +0,0 @@
-// 
-//   Copyright (C) 2005, 2006 Free Software Foundation, Inc.
-// 
-// This program is free software; you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
-// (at your option) any later version.
-// 
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-// Linking Gnash statically or dynamically with other modules is making a
-// combined work based on Gnash. Thus, the terms and conditions of the GNU
-// General Public License cover the whole combination.
-//
-// As a special exception, the copyright holders of Gnash give you
-// permission to combine Gnash with free software programs or libraries
-// that are released under the GNU LGPL and with code included in any
-// release of Talkback distributed by the Mozilla Foundation. You may
-// copy and distribute such a system following the terms of the GNU GPL
-// for all but the LGPL-covered parts and Talkback, and following the
-// LGPL for the LGPL-covered parts.
-//
-// Note that people who make modified versions of Gnash are not obligated
-// to grant this special exception for their modified versions; it is their
-// choice whether to do so. The GNU General Public License gives permission
-// to release a modified version without this exception; this exception
-// also makes it possible to release a modified version which carries
-// forward this exception.
-// 
-//
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include "log.h" 
-#include "bitmap_character_def.h"
-#include "bitmap_character_instance.h"
-#include "gnash.h" // for bitmap_info
-#include "smart_ptr.h"
-
-namespace gnash {
-
-gnash::bitmap_info*
-bitmap_character_instance::get_bitmap_info()
-{
-       // the definition will create a bitmap_info
-       // on demand, using the renderer
-       return _def->get_bitmap_info();
-}
-
-} // namespace gnash

Index: server/bitmap_character_instance.h
===================================================================
RCS file: server/bitmap_character_instance.h
diff -N server/bitmap_character_instance.h
--- server/bitmap_character_instance.h  25 Sep 2006 15:17:42 -0000      1.1
+++ /dev/null   1 Jan 1970 00:00:00 -0000
@@ -1,85 +0,0 @@
-// 
-//   Copyright (C) 2005, 2006 Free Software Foundation, Inc.
-// 
-// This program is free software; you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
-// (at your option) any later version.
-// 
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-// Linking Gnash statically or dynamically with other modules is making a
-// combined work based on Gnash. Thus, the terms and conditions of the GNU
-// General Public License cover the whole combination.
-//
-// As a special exception, the copyright holders of Gnash give you
-// permission to combine Gnash with free software programs or libraries
-// that are released under the GNU LGPL and with code included in any
-// release of Talkback distributed by the Mozilla Foundation. You may
-// copy and distribute such a system following the terms of the GNU GPL
-// for all but the LGPL-covered parts and Talkback, and following the
-// LGPL for the LGPL-covered parts.
-//
-// Note that people who make modified versions of Gnash are not obligated
-// to grant this special exception for their modified versions; it is their
-// choice whether to do so. The GNU General Public License gives permission
-// to release a modified version without this exception; this exception
-// also makes it possible to release a modified version which carries
-// forward this exception.
-// 
-//
-//
-
-#ifndef GNASH_BITMAP_CHARACTER_INSTANCE_H
-#define GNASH_BITMAP_CHARACTER_INSTANCE_H
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include "gnash.h" // for bitmap_info definition
-//#include "character.h" // for inheritance
-#include "generic_character.h" // for inheritance
-#include "bitmap_character_def.h" // for composition
-#include "smart_ptr.h"
-
-namespace gnash {
-
-
-/// Bitmap character instance
-class bitmap_character_instance : public generic_character
-{
-public:
-       bitmap_character_instance(bitmap_character_def* def,
-                       character* parent, int id)
-               :
-               generic_character(def, parent, id),
-               _def(def)
-       {
-       }
-
-       gnash::bitmap_info* get_bitmap_info();
-
-private:
-
-       smart_ptr<bitmap_character_def> _def;
-
-};
-
-
-} // end namespace gnash
-
-
-#endif // GNASH_BITMAP_CHARACTER_INSTANCE_H
-
-
-// Local Variables:
-// mode: C++
-// indent-tabs-mode: t
-// End: