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

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  08/04/28 13:39:13

Modified files:
        .              : ChangeLog 
        server         : sprite_instance.cpp 

Log message:
        * server/sprite_instance.cpp: for lineStyle, since we now know SWF8
          support more args, log_unimpl for unhandled ones.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.6432&r2=1.6433
http://cvs.savannah.gnu.org/viewcvs/gnash/server/sprite_instance.cpp?cvsroot=gnash&r1=1.521&r2=1.522

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.6432
retrieving revision 1.6433
diff -u -b -r1.6432 -r1.6433
--- ChangeLog   28 Apr 2008 13:23:26 -0000      1.6432
+++ ChangeLog   28 Apr 2008 13:39:12 -0000      1.6433
@@ -1,5 +1,10 @@
 2008-04-28 Sandro Santilli <address@hidden>
 
+       * server/sprite_instance.cpp: for lineStyle, since we now know SWF8
+         support more args, log_unimpl for unhandled ones.
+
+2008-04-28 Sandro Santilli <address@hidden>
+
        * server/styles.{cpp,h}: add line_style.set_lerp, drop friendliness.
        * server/parser/morph2_character_def.cpp: use line_style.set_lerp
          rather then accessing its private members.

Index: server/sprite_instance.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/sprite_instance.cpp,v
retrieving revision 1.521
retrieving revision 1.522
diff -u -b -r1.521 -r1.522
--- server/sprite_instance.cpp  28 Apr 2008 12:33:11 -0000      1.521
+++ server/sprite_instance.cpp  28 Apr 2008 13:39:12 -0000      1.522
@@ -1331,6 +1331,12 @@
   return as_value();
 }
 
+// SWF6,7: lineStyle(thickness:Number, rgb:Number, alpha:Number) : Void
+//
+//  SWF8+: lineStyle(thickness:Number, rgb:Number, alpha:Number,
+//                   pixelHinting:Boolean, noScale:String,
+//                   capsStyle:String, jointStyle:String,
+//                   miterLimit:Number) : Void
 static as_value
 sprite_lineStyle(const fn_call& fn)
 {
@@ -1363,14 +1369,34 @@
     {
       float alphaval = fclamp(fn.arg(2).to_number(), 0, 100);
       a = boost::uint8_t( 255 * (alphaval/100) );
-      IF_VERBOSE_ASCODING_ERRORS(
+
       if ( fn.nargs > 3 )
       {
+        int swfVersion = sprite->getVM().getSWFVersion();
+        if ( swfVersion < 8 )
+        {
+          IF_VERBOSE_ASCODING_ERRORS(
         std::stringstream ss; fn.dump_args(ss);
         log_aserror(_("MovieClip.lineStyle(%s): args after the first three 
will be discarded"), ss.str());
-      }
       );
     }
+        else
+        {
+          log_unimpl(_("pixelHinting arg to MovieClip.lineStyle"));
+          if ( fn.nargs > 4 ) log_unimpl(_("noScale arg to 
MovieClip.lineStyle"));
+          if ( fn.nargs > 5 ) log_unimpl(_("capsStyle arg to 
MovieClip.lineStyle"));
+          if ( fn.nargs > 6 ) log_unimpl(_("jointStyle arg to 
MovieClip.lineStyle"));
+          if ( fn.nargs > 7 ) log_unimpl(_("miterLimit arg to 
MovieClip.lineStyle"));
+          IF_VERBOSE_ASCODING_ERRORS(
+          if ( fn.nargs > 8 ) 
+          {
+            std::stringstream ss; fn.dump_args(ss);
+            log_aserror(_("MovieClip.lineStyle(%s): args after the first eight 
will be discarded"), ss.str());
+          }
+          )
+        }
+      }
+    }
   }