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

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  08/01/31 14:26:19

Modified files:
        .              : ChangeLog 
        server         : font.cpp 

Log message:
        don't assign 0 to std::strings...
        actually simplify the code avoiding stream::read_string() and using
        stream::read_string(std::string&) instead.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.5535&r2=1.5536
http://cvs.savannah.gnu.org/viewcvs/gnash/server/font.cpp?cvsroot=gnash&r1=1.56&r2=1.57

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.5535
retrieving revision 1.5536
diff -u -b -r1.5535 -r1.5536
--- ChangeLog   31 Jan 2008 13:41:31 -0000      1.5535
+++ ChangeLog   31 Jan 2008 14:26:18 -0000      1.5536
@@ -1,5 +1,8 @@
 2008-01-31 Sandro Santilli <address@hidden>
 
+       * server/font.cpp: don't assign 0 to std::strings... actually simplify
+         the code avoiding stream::read_string() and using
+         stream::read_string(std::string&) instead.
        * server/movie_root.cpp (display): do nothing if the movie frame
          is null. Fixes bug #22189.
 

Index: server/font.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/font.cpp,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -b -r1.56 -r1.57
--- server/font.cpp     28 Jan 2008 15:16:50 -0000      1.56
+++ server/font.cpp     31 Jan 2008 14:26:19 -0000      1.57
@@ -17,7 +17,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
-/* $Id: font.cpp,v 1.56 2008/01/28 15:16:50 strk Exp $ */
+/* $Id: font.cpp,v 1.57 2008/01/31 14:26:19 strk Exp $ */
 
 // Based on the public domain work of Thatcher Ulrich <address@hidden> 2003
 
@@ -241,12 +241,7 @@
                // Inhibit compiler warning.
                reserved = reserved;
 
-               char* name = in->read_string_with_length();
-               if ( name )
-               {
-                       m_name = name;
-                       delete [] name;
-               }
+               in->read_string_with_length(m_name);
 
                in->ensureBytes(2); 
                boost::uint16_t glyph_count = in->read_u16();
@@ -399,12 +394,8 @@
             movie_definition* /*m*/) 
         {
             assert(tag == SWF::DEFINEFONTNAME);
-            char* disp_name = in->read_string();
-            char* copy_name = in->read_string();
-            m_display_name = disp_name;
-            delete [] disp_name;
-            m_copyright_name = copy_name;
-            delete [] copy_name;
+            in->read_string(m_display_name);
+            in->read_string(m_copyright_name);
         }
 
        // Read additional information about this font, from a
@@ -426,16 +417,7 @@
                        }
                }
 
-               char* name = in->read_string_with_length();
-               if ( name )
-               {
-                       m_name = name;
-                       delete [] name;
-               }
-               else
-               {
-                       m_name.clear();
-               }
+               in->read_string_with_length(m_name);
 
                in->ensureBytes(1);
                unsigned char   flags = in->read_u8();