[Gnash-commit] gnash ChangeLog server/asobj/Color.cpp testsuit...

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  07/11/17 11:50:36

Modified files:
        .              : ChangeLog 
        server/asobj   : Color.cpp 
        testsuite/swfdec: PASSING 

Log message:
        (getTransform): truncate values to integers.
        Fixes color1.swf from swfdec testsuite.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.4889&r2=1.4890
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/Color.cpp?cvsroot=gnash&r1=1.16&r2=1.17
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/swfdec/PASSING?cvsroot=gnash&r1=1.62&r2=1.63

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.4889
retrieving revision 1.4890
diff -u -b -r1.4889 -r1.4890
--- ChangeLog   17 Nov 2007 11:15:57 -0000      1.4889
+++ ChangeLog   17 Nov 2007 11:50:35 -0000      1.4890
@@ -1,5 +1,8 @@
 2007-11-17 Sandro Santilli <address@hidden>
 
+       * server/asobj/Color.cpp (color_gettransform): truncate
+         values to integers.
+       * testsuite/swfdec/PASSING: color1.swf succeeds
        * testsuite/swfdec/Makefile.am: split swfdec test runners in
          more groups (groups of 3 letters the name starts with)
 

Index: server/asobj/Color.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/Color.cpp,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- server/asobj/Color.cpp      8 Nov 2007 22:40:43 -0000       1.16
+++ server/asobj/Color.cpp      17 Nov 2007 11:50:35 -0000      1.17
@@ -209,18 +209,19 @@
 
        cxform cx = obj->getTransform();
 
-       // TODO: convert to as_object...
+       // Convert to as_object
+
        as_object* ret = new as_object(getObjectInterface());
 
-       ret->init_member("ra", cx.m_[0][0]*100);
-       ret->init_member("ga", cx.m_[1][0]*100);
-       ret->init_member("ba", cx.m_[2][0]*100);
-       ret->init_member("aa", cx.m_[3][0]*100);
-
-       ret->init_member("rb", cx.m_[0][1]);
-       ret->init_member("gb", cx.m_[1][1]);
-       ret->init_member("bb", cx.m_[2][1]);
-       ret->init_member("ab", cx.m_[3][1]);
+       ret->init_member("ra", int(cx.m_[0][0]*100));
+       ret->init_member("ga", int(cx.m_[1][0]*100));
+       ret->init_member("ba", int(cx.m_[2][0]*100));
+       ret->init_member("aa", int(cx.m_[3][0]*100));
+
+       ret->init_member("rb", int(cx.m_[0][1]));
+       ret->init_member("gb", int(cx.m_[1][1]));
+       ret->init_member("bb", int(cx.m_[2][1]));
+       ret->init_member("ab", int(cx.m_[3][1]));
 
        return ret;
 }

Index: testsuite/swfdec/PASSING
===================================================================
RCS file: /sources/gnash/gnash/testsuite/swfdec/PASSING,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -b -r1.62 -r1.63
--- testsuite/swfdec/PASSING    15 Nov 2007 22:23:35 -0000      1.62
+++ testsuite/swfdec/PASSING    17 Nov 2007 11:50:35 -0000      1.63
@@ -63,6 +63,7 @@
 color-setRGB.swf:0841414e9ac7d2f9b57e40aec3d2f44f
 color-setTransform-empty.swf:2a72a5273ab8713ee289ff1726b0959c
 color-setTransform-negative.swf:0bc0510c35fc5c82de31b0db887fe535
+color1.swf:3cc52a41193d342cfdfaeffe56edc3db
 comparisons-5.swf:d4dfeb4ec80ec1f5a7390eb699e269ee
 comparisons-6.swf:5a7bf1ffb3a4dd23828d6e180f1871b0
 comparisons-7.swf:2e53fca820ad47ebb1bfef696f61527a