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

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  07/12/21 12:26:27

Modified files:
        .              : ChangeLog 
        server         : sprite_instance.cpp 

Log message:
        get the bounding box arguments right in MovieClip.startDrag()

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.5238&r2=1.5239
http://cvs.savannah.gnu.org/viewcvs/gnash/server/sprite_instance.cpp?cvsroot=gnash&r1=1.417&r2=1.418

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.5238
retrieving revision 1.5239
diff -u -b -r1.5238 -r1.5239
--- ChangeLog   21 Dec 2007 02:27:52 -0000      1.5238
+++ ChangeLog   21 Dec 2007 12:26:26 -0000      1.5239
@@ -1,3 +1,8 @@
+2007-12-21 Sandro Santilli <[EMAIL PROTECTED]>
+
+       * server/sprite_instance.cpp (sprite_startDrag): get the bounding box
+         arguments right.
+
 2007-12-20 Sandro Santilli <[EMAIL PROTECTED]>
 
        * server/asobj/MovieClipLoader.cpp: don't abort if getProgress

Index: server/sprite_instance.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/sprite_instance.cpp,v
retrieving revision 1.417
retrieving revision 1.418
diff -u -b -r1.417 -r1.418
--- server/sprite_instance.cpp  19 Dec 2007 20:40:31 -0000      1.417
+++ server/sprite_instance.cpp  21 Dec 2007 12:26:26 -0000      1.418
@@ -797,7 +797,7 @@
        if ( txt_width < 0 )
        {
                IF_VERBOSE_ASCODING_ERRORS(
-               log_aserror(_("createTextField: negative width (%g)"
+               log_aserror(_("createTextField: negative width (%d)"
                        " - reverting sign"), txt_width);
                );
                txt_width = -txt_width;
@@ -807,7 +807,7 @@
        if ( txt_height < 0 )
        {
                IF_VERBOSE_ASCODING_ERRORS(
-               log_aserror(_("createTextField: negative height (%g)"
+               log_aserror(_("createTextField: negative height (%d)"
                        " - reverting sign"), txt_height);
                );
                txt_height = -txt_height;
@@ -1323,10 +1323,10 @@
 
         if ( fn.nargs >= 5)
         {
-            float y1 = PIXELS_TO_TWIPS(fn.arg(1).to_number());
-            float x1 = PIXELS_TO_TWIPS(fn.arg(2).to_number());
-            float y0 = PIXELS_TO_TWIPS(fn.arg(3).to_number());
-            float x0 = PIXELS_TO_TWIPS(fn.arg(4).to_number());
+            float x0 = PIXELS_TO_TWIPS(fn.arg(1).to_number());
+            float y0 = PIXELS_TO_TWIPS(fn.arg(2).to_number());
+            float x1 = PIXELS_TO_TWIPS(fn.arg(3).to_number());
+            float y1 = PIXELS_TO_TWIPS(fn.arg(4).to_number());
 
             // check for swapped values
             bool swapped = false;
@@ -1345,7 +1345,7 @@
             IF_VERBOSE_ASCODING_ERRORS(
             if ( swapped ) {
                 std::stringstream ss; fn.dump_args(ss);
-                log_aserror(_("Y values in MovieClip.startDrag(%s) swapped, 
fixing"), ss.str().c_str());
+                log_aserror(_("min/max bbox values in MovieClip.startDrag(%s) 
swapped, fixing"), ss.str().c_str());
             }
             );
 


_______________________________________________
Gnash-commit mailing list
Gnash-commit@gnu.org
http://lists.gnu.org/mailman/listinfo/gnash-commit