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

[Rob Savoye]

CVSROOT:        /sources/gnash
Module name:    gnash
Branch:         
Changes by:     Rob Savoye <address@hidden>     06/04/20 19:58:31

Modified files:
        server         : font.cpp 
        .              : ChangeLog 

Log message:
        * server/font.cpp: Delete the pointer the proper way.
        * doc/C/gnash-man.xml: Add the -j and -k options to the man page.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/server/font.cpp.diff?tr1=1.6&tr2=1.7&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/ChangeLog.diff?tr1=1.216&tr2=1.217&r1=text&r2=text

Patches:
Index: gnash/ChangeLog
diff -u gnash/ChangeLog:1.216 gnash/ChangeLog:1.217
--- gnash/ChangeLog:1.216       Thu Apr 20 19:22:41 2006
+++ gnash/ChangeLog     Thu Apr 20 19:58:31 2006
@@ -1,5 +1,8 @@
 2006-04-20  Rob Savoye  <address@hidden>
 
+       * server/font.cpp: Delete the pointer the proper way.
+       * doc/C/gnash-man.xml: Add the -j and -k options to the man page.
+       
        * README: Clarify that no event handling means mouse clicks don't
        work with the SDL version of the plugin.
        * doc/C/internals.xml: Clarify that no event handling means mouse
Index: gnash/server/font.cpp
diff -u gnash/server/font.cpp:1.6 gnash/server/font.cpp:1.7
--- gnash/server/font.cpp:1.6   Sun Feb 26 21:44:53 2006
+++ gnash/server/font.cpp       Thu Apr 20 19:58:31 2006
@@ -37,11 +37,7 @@
                m_glyphs.resize(0);
 
                // Delete the name string.
-               if (m_name)
-               {
-                       delete [] m_name;
-                       m_name = NULL;
-               }
+               delete [] m_name;
        }
 
        shape_character_def*    font::get_glyph(int index) const
@@ -297,12 +293,8 @@
        // DefineFontInfo tag.  The caller has already read the tag
        // type and font id.
        {
-               if (m_name)
-               {
-                       delete m_name;
-                       m_name = NULL;
-               }
-
+               delete [] m_name;
+               
                m_name = in->read_string_with_length();
 
                unsigned char   flags = in->read_u8();