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

[Benjamin Wolsey]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Benjamin Wolsey <bwy>   08/05/25 20:26:51

Modified files:
        .              : ChangeLog 
        server         : sprite_instance.cpp 

Log message:
                * server/sprite_instance.cpp: replace sprintf with 
boost::lexical_cast.
                  Remove some old header includes.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.6704&r2=1.6705
http://cvs.savannah.gnu.org/viewcvs/gnash/server/sprite_instance.cpp?cvsroot=gnash&r1=1.541&r2=1.542

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.6704
retrieving revision 1.6705
diff -u -b -r1.6704 -r1.6705
--- ChangeLog   25 May 2008 18:11:33 -0000      1.6704
+++ ChangeLog   25 May 2008 20:26:50 -0000      1.6705
@@ -1,3 +1,8 @@
+2008-05-25 Benjamin Wolsey <address@hidden>
+
+       * server/sprite_instance.cpp: replace sprintf with boost::lexical_cast.
+         Remove some old header includes.
+
 2008-05-25 Sandro Santilli <address@hidden>
 
        * gui/Player.cpp: don't forget to initialize hasOverriddenBaseUrl.

Index: server/sprite_instance.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/sprite_instance.cpp,v
retrieving revision 1.541
retrieving revision 1.542
diff -u -b -r1.541 -r1.542
--- server/sprite_instance.cpp  25 May 2008 10:05:21 -0000      1.541
+++ server/sprite_instance.cpp  25 May 2008 20:26:51 -0000      1.542
@@ -64,12 +64,9 @@
 #include <vector>
 #include <string>
 #include <cmath>
-#include <cstdio> // std::sprintf
-
-#include <functional> // for mem_fun, bind1st
-#include <algorithm> // for for_each
+#include <algorithm> // for std::swap
 #include <boost/algorithm/string/case_conv.hpp>
-
+#include <boost/lexical_cast.hpp>
 
 namespace gnash {
 
@@ -327,7 +324,6 @@
     }
   }
 
-  // TODO: Why not use to_int()?
   character* ch = sprite->add_empty_movieclip(fn.arg(0).to_string().c_str(),
                                               fn.arg(1).to_int());
   return as_value(ch);
@@ -338,7 +334,7 @@
   // TODO: make this a character::getDepth_method function...
   boost::intrusive_ptr<sprite_instance> sprite = 
ensureType<sprite_instance>(fn.this_ptr);
 
-  int n = sprite->get_depth();
+  const int n = sprite->get_depth();
 
   return as_value(n);
 }
@@ -350,7 +346,7 @@
   typedef boost::intrusive_ptr<character> CharPtr;
 
   SpritePtr sprite = ensureType<sprite_instance>(fn.this_ptr);
-  int this_depth = sprite->get_depth();
+  const int this_depth = sprite->get_depth();
 
   as_value rv;
 
@@ -569,8 +565,8 @@
 {
   boost::intrusive_ptr<sprite_instance> sprite = 
ensureType<sprite_instance>(fn.this_ptr);
 
-  size_t frame_count = sprite->get_frame_count();
-  size_t current_frame = sprite->get_current_frame();
+  const size_t frame_count = sprite->get_frame_count();
+  const size_t current_frame = sprite->get_current_frame();
   if (current_frame < frame_count)
   {
       sprite->goto_frame(current_frame + 1);
@@ -583,7 +579,7 @@
 {
   boost::intrusive_ptr<sprite_instance> sprite = 
ensureType<sprite_instance>(fn.this_ptr);
 
-  size_t current_frame = sprite->get_current_frame();
+  const size_t current_frame = sprite->get_current_frame();
   if (current_frame > 0)
   {
       sprite->goto_frame(current_frame - 1);
@@ -1878,9 +1874,8 @@
   gradients.reserve(ngradients);
   for (size_t i=0; i<ngradients; ++i)
   {
-    char buf[32];
-    std::sprintf(buf, SIZET_FMT, i);
-    string_table::key key = st.find(buf);
+
+    string_table::key key = st.find(boost::lexical_cast<std::string>(i));
 
     as_value colVal = colors->getMember(key);
     boost::uint32_t col = colVal.is_number() ? colVal.to_int() : 0;