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

[Benjamin Wolsey]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Benjamin Wolsey <bwy>   08/06/20 14:13:46

Modified files:
        .              : ChangeLog 
        server         : sprite_instance.cpp 

Log message:
                * server/sprite_instance.cpp: stub SWF8 methods attachBitmap,
                  beginBitmapFill, getRect, and lineGradientStyle.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.6997&r2=1.6998
http://cvs.savannah.gnu.org/viewcvs/gnash/server/sprite_instance.cpp?cvsroot=gnash&r1=1.555&r2=1.556

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.6997
retrieving revision 1.6998
diff -u -b -r1.6997 -r1.6998
--- ChangeLog   20 Jun 2008 13:28:54 -0000      1.6997
+++ ChangeLog   20 Jun 2008 14:13:46 -0000      1.6998
@@ -1,5 +1,10 @@
 2008-06-20 Benjamin Wolsey <address@hidden>
 
+       * server/sprite_instance.cpp: stub SWF8 methods attachBitmap,
+         beginBitmapFill, getRect, and lineGradientStyle.
+
+2008-06-20 Benjamin Wolsey <address@hidden>
+
        * testsuite/actionscript.all/BitmapData.as: minor change.
        * server/asobj/flash/geom/Point_as.h: header cleanup.
        * server/asobj/flash/display/BitmapData_as.{h,cpp}: move class

Index: server/sprite_instance.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/sprite_instance.cpp,v
retrieving revision 1.555
retrieving revision 1.556
diff -u -b -r1.555 -r1.556
--- server/sprite_instance.cpp  20 Jun 2008 06:36:58 -0000      1.555
+++ server/sprite_instance.cpp  20 Jun 2008 14:13:46 -0000      1.556
@@ -1246,7 +1246,7 @@
   if ( fn.nargs < 2 )
   {
     IF_VERBOSE_ASCODING_ERRORS(
-      log_aserror(_("MovieClip.lineTo() needs at least two"));
+      log_aserror(_("MovieClip.lineTo() needs at least two arguments"));
     );
     return as_value();
   }
@@ -1998,6 +1998,47 @@
   return as_value();
 }
 
+
+static as_value
+sprite_beginBitmapFill(const fn_call& fn)
+{
+    boost::intrusive_ptr<sprite_instance> ptr = 
ensureType<sprite_instance>(fn.this_ptr);
+       UNUSED(ptr);
+       LOG_ONCE( log_unimpl (__FUNCTION__) );
+       return as_value();
+}
+
+
+static as_value
+sprite_getRect(const fn_call& fn)
+{
+    boost::intrusive_ptr<sprite_instance> ptr = 
ensureType<sprite_instance>(fn.this_ptr);
+       UNUSED(ptr);
+       LOG_ONCE( log_unimpl (__FUNCTION__) );
+       return as_value();
+}
+
+
+static as_value
+sprite_lineGradientStyle(const fn_call& fn)
+{
+    boost::intrusive_ptr<sprite_instance> ptr = 
ensureType<sprite_instance>(fn.this_ptr);
+       UNUSED(ptr);
+       LOG_ONCE( log_unimpl (__FUNCTION__) );
+       return as_value();
+}
+
+
+static as_value
+sprite_attachBitmap(const fn_call& fn)
+{
+    boost::intrusive_ptr<sprite_instance> ptr = 
ensureType<sprite_instance>(fn.this_ptr);
+       UNUSED(ptr);
+       LOG_ONCE( log_unimpl (__FUNCTION__) );
+       return as_value();
+}
+
+
 static as_value
 movieclip_ctor(const fn_call& /* fn */)
 {
@@ -2150,7 +2191,7 @@
 attachMovieClipInterface(as_object& o)
 {
   VM& vm = o.getVM();
-  int target_version = vm.getSWFVersion();
+    const int target_version = vm.getSWFVersion();
 
   // SWF5 or higher
   o.init_member("attachMovie", vm.getNative(900, 0)); 
@@ -2209,7 +2250,11 @@
   o.init_member("getInstanceAtDepth", new 
builtin_function(sprite_getInstanceAtDepth));
   if ( target_version  < 8 ) return;
 
-  // TODO: many more methods, see MovieClip class ...
+    // SWF8 or higher
+    o.init_member("attachBitmap", new builtin_function(sprite_attachBitmap));
+    o.init_member("beginBitmapFill", new 
builtin_function(sprite_beginBitmapFill));
+    o.init_member("getRect", new builtin_function(sprite_getRect));
+    o.init_member("lineGradientStyle", new 
builtin_function(sprite_lineGradientStyle));
 
 }
 
@@ -4947,7 +4992,7 @@
        InfoTree::iterator selfIt = character::getMovieInfo(tr, it);
        std::ostringstream os;
        os << m_display_list.size();
-       InfoTree::iterator localIter = tr.append_child(selfIt, 
StringPair(_("Childs"), os.str()));          
+       InfoTree::iterator localIter = tr.append_child(selfIt, 
StringPair(_("Children"), os.str()));        
        //localIter = tr.append_child(localIter, StringPair("child1", "fake"));
        //localIter = tr.append_child(localIter, StringPair("child2", "fake"));