[Gnash-commit] gnash ChangeLog gui/Player.cpp testsuite/action...

[Benjamin Wolsey]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Benjamin Wolsey <bwy>   08/04/05 11:08:19

Modified files:
        .              : ChangeLog 
        gui            : Player.cpp 
        testsuite/actionscript.all: Date.as 

Log message:
                * gui/Player.cpp: minor cleanups.
                * testsuite/asobj/Date.as: don't use == to compare double - it 
                  failed on one of the amd64-ubuntu machines.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.6187&r2=1.6188
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/Player.cpp?cvsroot=gnash&r1=1.96&r2=1.97
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/actionscript.all/Date.as?cvsroot=gnash&r1=1.48&r2=1.49

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.6187
retrieving revision 1.6188
diff -u -b -r1.6187 -r1.6188
--- ChangeLog   5 Apr 2008 10:19:24 -0000       1.6187
+++ ChangeLog   5 Apr 2008 11:08:18 -0000       1.6188
@@ -1,3 +1,9 @@
+2008-04-05 Benjamin Wolsey <address@hidden>
+
+       * gui/Player.cpp: minor cleanups.
+       * testsuite/asobj/Date.as: don't use == to compare double - it 
+         failed on one of the amd64-ubuntu machines.
+
 2008-04-04 Sandro Santilli <address@hidden>
 
        * server/as_object.{cpp,h}: add initial support for

Index: gui/Player.cpp
===================================================================
RCS file: /sources/gnash/gnash/gui/Player.cpp,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -b -r1.96 -r1.97
--- gui/Player.cpp      4 Apr 2008 19:52:54 -0000       1.96
+++ gui/Player.cpp      5 Apr 2008 11:08:19 -0000       1.97
@@ -46,7 +46,8 @@
 #include "log.h"
 #include <iostream>
 
-using namespace std;
+using std::endl;
+using std::cerr;
 using namespace gnash;
 
 namespace {
@@ -211,7 +212,7 @@
 
     RcInitFile& rcfile = RcInitFile::getDefaultInstance();
     URL vurl(_url);
-    //cout << "URL is " << vurl.str() << " (" << _url << ")" << endl;
+
     if ( vurl.protocol() == "file" )
     {
         const std::string& path = vurl.path();
@@ -248,7 +249,7 @@
             md = gnash::create_library_movie(url, _url.c_str(), false);
         }
     } catch (const GnashException& er) {
-        fprintf(stderr, "%s\n", er.what());
+        std::cerr << er.what() << std::endl;
         md = NULL;
     }
 
@@ -308,7 +309,7 @@
 
     // Parse parameters
     StringNoCaseEqual noCaseCompare;
-    for ( map<string,string>::const_iterator it=params.begin(),
+    for ( std::map<std::string,std::string>::const_iterator it=params.begin(),
         itEnd=params.end(); it != itEnd; ++it)
     {
         if ( noCaseCompare(it->first, "flashvars") )
@@ -341,16 +342,17 @@
     float movie_fps = _movieDef->get_frame_rate();
 
     if (! _width) {
-      _width = size_t(movie_width * _scale);
+      _width = static_cast<size_t>(movie_width * _scale);
     }
     if (! _height) {
-      _height = size_t(movie_height * _scale);
+      _height = static_cast<size_t>(movie_height * _scale);
     }
 
     if ( ! _width || ! _height )
     {
-        log_debug(_("Input movie has collapsed dimensions " SIZET_FMT "/"
-                SIZET_FMT ". Setting to 1/1 and going on."), _width, _height);
+        log_debug(_("Input movie has collapsed dimensions "
+                    "%d/%d. Setting to 1/1 and going on."),
+                     _width, _height);
         if ( ! _width ) _width = 1;
         if ( ! _height ) _height = 1;
     }
@@ -413,7 +415,7 @@
         std::stringstream request;
         request << "INVOKE " << command << ":" << args << endl;
 
-        string requestString = request.str();
+        std::string requestString = request.str();
         const char* cmd = requestString.c_str();
         size_t len = requestString.length();
         // TODO: should mutex-protect this ?

Index: testsuite/actionscript.all/Date.as
===================================================================
RCS file: /sources/gnash/gnash/testsuite/actionscript.all/Date.as,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -b -r1.48 -r1.49
--- testsuite/actionscript.all/Date.as  3 Apr 2008 10:52:31 -0000       1.48
+++ testsuite/actionscript.all/Date.as  5 Apr 2008 11:08:19 -0000       1.49
@@ -22,7 +22,7 @@
 // execute it like this gnash -1 -r 0 -v out.swf
 
 
-rcsid="$Id: Date.as,v 1.48 2008/04/03 10:52:31 bwy Exp $";
+rcsid="$Id: Date.as,v 1.49 2008/04/05 11:08:19 bwy Exp $";
 #include "check.as"
 
 check_equals(typeof(Date), 'function');
@@ -495,7 +495,7 @@
        check_equals(d.getSeconds(), 0);
        check_equals(d.getMilliseconds(), 1);
     delete d; var d = new Date(2000,0,1,0,0,0,-1);
-    note (d.valueOf());
+    //note (d.valueOf());
        check_equals(d.getFullYear(), 1999);
        check_equals(d.getMonth(), 11);
        check_equals(d.getDate(), 31);
@@ -639,7 +639,8 @@
 check_equals (Date.UTC(1970, 1).valueOf(), 2678400000);
 
 check_equals (Date.UTC(-1, -12).toString(), "-2272060800000");
-check_equals (Date.UTC(-1, 12).valueOf(), -2208988800000);
+check_equals ((Date.UTC(-1, 12).valueOf() < -2208988799999.5 &&
+               Date.UTC(-1, 12).valueOf() > -2208988800000.5), true);
 
 // Check if Date, concatenated to a string, is in human readable form
 d = new Date(2000, 1, 15, 0, 0, 0);