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

[Benjamin Wolsey]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Benjamin Wolsey <bwy>   08/05/23 07:33:26

Modified files:
        .              : ChangeLog 
        server         : sprite_instance.cpp 
        server/parser  : BitmapMovieDefinition.cpp 
                         bitmap_character_def.cpp sprite_definition.cpp 

Log message:
                * parser/BitmapMovieDefinition.cpp, 
parser/bitmap_character_def.cpp,
                  parser/sprite_definition.cpp, server/sprite_instance.cpp: 
minor
                  cleanups, drop (already unnecessary) "using namespace std;", 
wrap
                  log_parse in verbose parsing macro.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.6682&r2=1.6683
http://cvs.savannah.gnu.org/viewcvs/gnash/server/sprite_instance.cpp?cvsroot=gnash&r1=1.538&r2=1.539
http://cvs.savannah.gnu.org/viewcvs/gnash/server/parser/BitmapMovieDefinition.cpp?cvsroot=gnash&r1=1.19&r2=1.20
http://cvs.savannah.gnu.org/viewcvs/gnash/server/parser/bitmap_character_def.cpp?cvsroot=gnash&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/gnash/server/parser/sprite_definition.cpp?cvsroot=gnash&r1=1.34&r2=1.35

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.6682
retrieving revision 1.6683
diff -u -b -r1.6682 -r1.6683
--- ChangeLog   23 May 2008 06:00:59 -0000      1.6682
+++ ChangeLog   23 May 2008 07:33:25 -0000      1.6683
@@ -1,3 +1,10 @@
+2008-05-23 Benjamin Wolsey <address@hidden>
+
+       * parser/BitmapMovieDefinition.cpp, parser/bitmap_character_def.cpp,
+         parser/sprite_definition.cpp, server/sprite_instance.cpp: minor
+         cleanups, drop (already unnecessary) "using namespace std;", wrap
+         log_parse in verbose parsing macro.
+
 2008-05-23 Russ Nelson <address@hidden>
 
        * README.dump-gnash: I don't know where to put this information

Index: server/sprite_instance.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/sprite_instance.cpp,v
retrieving revision 1.538
retrieving revision 1.539
diff -u -b -r1.538 -r1.539
--- server/sprite_instance.cpp  19 May 2008 13:03:54 -0000      1.538
+++ server/sprite_instance.cpp  23 May 2008 07:33:26 -0000      1.539
@@ -64,15 +64,12 @@
 #include <vector>
 #include <string>
 #include <cmath>
+#include <cstdio> // std::sprintf
 
 #include <functional> // for mem_fun, bind1st
 #include <algorithm> // for for_each
 #include <boost/algorithm/string/case_conv.hpp>
 
-//#ifdef __sgi
-//extern double round(double);
-//#pragma optional round
-//#endif
 
 namespace gnash {
 
@@ -1882,7 +1879,7 @@
   for (size_t i=0; i<ngradients; ++i)
   {
     char buf[32];
-    sprintf(buf, SIZET_FMT, i);
+    std::sprintf(buf, SIZET_FMT, i);
     string_table::key key = st.find(buf);
 
     as_value colVal = colors->getMember(key);
@@ -4905,7 +4902,7 @@
 {
        if ( m_sound_stream_id == -1 ) return; // nothing to do
 
-       media::sound_handler* handler = get_sound_handler(); // TODO: chache ?
+       media::sound_handler* handler = get_sound_handler(); // TODO: cache ?
        if (handler)
        {
                handler->stop_sound(m_sound_stream_id);

Index: server/parser/BitmapMovieDefinition.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/parser/BitmapMovieDefinition.cpp,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20
--- server/parser/BitmapMovieDefinition.cpp     21 Apr 2008 11:27:45 -0000      
1.19
+++ server/parser/BitmapMovieDefinition.cpp     23 May 2008 07:33:26 -0000      
1.20
@@ -24,7 +24,6 @@
 #include "shape.h" // for class path and class edge
 #include "render.h" // for ::display
 
-using namespace std;
 
 namespace gnash {
 
@@ -50,17 +49,19 @@
        //mat.concatenate_scale(1.0/20.0);
        mat.set_scale(1.0/20.0, 1.0/20.0); // bitmap fills get matrix reversed
        fill_style bmFill(_bitmap.get(), mat);
-       size_t fillLeft = _shapedef->add_fill_style(bmFill);
+       const size_t fillLeft = _shapedef->add_fill_style(bmFill);
 
        // Define a rectangle filled with the bitmap style
 
        // We use one twip for each pixel in the image
        // The character will be scaled * 20
        // when placed in BitmapMovieInstance's DisplayList
-       float w = _framesize.width(); // /20;
-       float h = _framesize.height(); // /20;
+       const float w = _framesize.width(); // /20;
+       const float h = _framesize.height(); // /20;
 
+       IF_VERBOSE_PARSE(
        log_parse(_("Creating a shape_definition wrapping a %g x %g bitmap"), 
w, h);
+       );
 
        path bmPath(w, h, fillLeft, 0, 0, false);
        bmPath.drawLineTo(w, 0);

Index: server/parser/bitmap_character_def.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/parser/bitmap_character_def.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- server/parser/bitmap_character_def.cpp      21 Jan 2008 20:56:00 -0000      
1.10
+++ server/parser/bitmap_character_def.cpp      23 May 2008 07:33:26 -0000      
1.11
@@ -28,7 +28,6 @@
 #include <cassert>
 #include <memory> // for auto_ptr
 
-using namespace std;
 
 namespace gnash {
 

Index: server/parser/sprite_definition.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/parser/sprite_definition.cpp,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -b -r1.34 -r1.35
--- server/parser/sprite_definition.cpp 7 May 2008 10:07:46 -0000       1.34
+++ server/parser/sprite_definition.cpp 23 May 2008 07:33:26 -0000      1.35
@@ -30,7 +30,6 @@
 #include <string>
 #include <cassert>
 
-using namespace std;
 
 // Define the following macro to get a dump the prototype 
 // members of classes registered to definitions.
@@ -74,7 +73,7 @@
        m_frame_count = in->read_u16();
 
        IF_VERBOSE_PARSE (
-       log_parse(_("  frames = " SIZET_FMT), m_frame_count);
+        log_parse(_("  frames = %d"), m_frame_count);
        );
 
        m_loading_frame = 0;
@@ -106,8 +105,7 @@
                        ++m_loading_frame;
 
                        IF_VERBOSE_PARSE (
-                               log_parse(_("  show_frame "
-                                       SIZET_FMT "/" SIZET_FMT
+                               log_parse(_("  show_frame %d/%d"
                                        " (sprite)"),
                                        m_loading_frame,
                                        m_frame_count);