[Gnash-commit] gnash ChangeLog server/types.h server/character...

[Benjamin Wolsey]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Benjamin Wolsey <bwy>   08/04/16 21:05:27

Modified files:
        .              : ChangeLog 
        server         : types.h character.cpp 
        testsuite/actionscript.all: MovieClip.as 

Log message:
                * server/types.h: drop some dead code. (PIXELS_TO_TWIPS) don't
                  divide by a float; it introduces unnecessary inaccuracy.
                * server/character.cpp: drop debugging calls I forgot to remove.
                  They weren't that helpful anyway.
                * testsuite/actionscript.all/MovieClip.as: tests passing.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.6304&r2=1.6305
http://cvs.savannah.gnu.org/viewcvs/gnash/server/types.h?cvsroot=gnash&r1=1.21&r2=1.22
http://cvs.savannah.gnu.org/viewcvs/gnash/server/character.cpp?cvsroot=gnash&r1=1.89&r2=1.90
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/actionscript.all/MovieClip.as?cvsroot=gnash&r1=1.125&r2=1.126

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.6304
retrieving revision 1.6305
diff -u -b -r1.6304 -r1.6305
--- ChangeLog   16 Apr 2008 20:26:43 -0000      1.6304
+++ ChangeLog   16 Apr 2008 21:05:25 -0000      1.6305
@@ -1,3 +1,11 @@
+2008-04-16 Benjamin Wolsey <address@hidden>
+
+       * server/types.h: drop some dead code. (PIXELS_TO_TWIPS) don't
+         divide by a float; it introduces unnecessary inaccuracy.
+       * server/character.cpp: drop debugging calls I forgot to remove.
+         They weren't that helpful anyway.
+       * testsuite/actionscript.all/MovieClip.as: tests passing.
+
 2008-04-16 Sandro Santilli <address@hidden>
 
        * configure.ac, testsuite/misc-ming.all/Makefile.am:

Index: server/types.h
===================================================================
RCS file: /sources/gnash/gnash/server/types.h,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -b -r1.21 -r1.22
--- server/types.h      27 Mar 2008 10:50:15 -0000      1.21
+++ server/types.h      16 Apr 2008 21:05:26 -0000      1.22
@@ -8,21 +8,10 @@
 #ifndef __TYPES_H__
 #define __TYPES_H__
 
-
-//#include "gnash.h" // what for ?
-
 #include <string>
 #include <boost/cstdint.hpp> // for boost::?int??_t 
 
-
-namespace gnash {
-       extern bool     s_verbose_action;
-       extern bool     s_verbose_parse;
-       extern bool     s_verbose_debug;
-}
-
-
-#define TWIPS_TO_PIXELS(x)     ((x) / 20.f)
+#define TWIPS_TO_PIXELS(x)     ((x) / 20.0)
 #define PIXELS_TO_TWIPS(x)     ((x) * 20)
 
 

Index: server/character.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/character.cpp,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -b -r1.89 -r1.90
--- server/character.cpp        16 Apr 2008 19:16:58 -0000      1.89
+++ server/character.cpp        16 Apr 2008 21:05:26 -0000      1.90
@@ -259,10 +259,8 @@
        else // setter
        {
                double newy = fn.arg(0).to_number();
-           log_debug("_y setter called with %d, to twips: %d", newy, 
PIXELS_TO_TWIPS(newy));
                matrix m = ptr->get_matrix();
                
m.set_y_translation(static_cast<int>(std::infinite_to_fzero(PIXELS_TO_TWIPS(newy))));
-               log_debug("_y trans now: %d", m.get_y_translation());
                ptr->set_matrix(m);
                ptr->transformedByScript(); // m_accept_anim_moves = false; 
        }

Index: testsuite/actionscript.all/MovieClip.as
===================================================================
RCS file: /sources/gnash/gnash/testsuite/actionscript.all/MovieClip.as,v
retrieving revision 1.125
retrieving revision 1.126
diff -u -b -r1.125 -r1.126
--- testsuite/actionscript.all/MovieClip.as     16 Apr 2008 19:36:17 -0000      
1.125
+++ testsuite/actionscript.all/MovieClip.as     16 Apr 2008 21:05:27 -0000      
1.126
@@ -20,9 +20,9 @@
 // compile this test case with Ming makeswf, and then
 // execute it like this gnash -1 -r 0 -v out.swf
 
-rcsid="$Id: MovieClip.as,v 1.125 2008/04/16 19:36:17 bwy Exp $";
+rcsid="$Id: MovieClip.as,v 1.126 2008/04/16 21:05:27 bwy Exp $";
 
-rcsid="$Id: MovieClip.as,v 1.125 2008/04/16 19:36:17 bwy Exp $";
+rcsid="$Id: MovieClip.as,v 1.126 2008/04/16 21:05:27 bwy Exp $";
 #include "check.as"
 
 // To be called at end of test
@@ -1310,7 +1310,7 @@
 
     // Gnash can't do this because _x and _y are floats at the
     // moment, but it probably should be able to.
-    xcheck_equals(static_clip._y, 0.05);
+    check_equals(static_clip._y, 0.05);
 
     // If it's not one twip, it's nothing
     static_clip._x += 0.04;
@@ -1324,17 +1324,10 @@
     
     static_clip._x = 20.09;
     check(static_clip._x > 20.049999 && static_clip._x < 20.050001);
-    xcheck_equals(static_clip._x, 0.05);
+    check_equals(static_clip._x, 20.05);
 
     // TODO: try with x/y being getter-setter of the localToGlobal and 
globalToLocal parameter
 
-    
-/*    static_clip._y = 160;*/
-/*    for (i = 0; )*/
-/*        static_clip._y -= (static_clip._y - 150) / 5;*/
-/*        trace (static_clip._y);*/
-/*    }*/
-    
 }
 else
 {