[Gnash-commit] gnash ChangeLog server/text.cpp server/parser/t...

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  07/08/18 13:24:14

Modified files:
        .              : ChangeLog 
        server         : text.cpp 
        server/parser  : text_character_def.cpp 

Log message:
                * server/text.cpp (resolve_font): fix missing return.
                * server/parser/text_character_def.cpp: fix compiler warnings.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.4027&r2=1.4028
http://cvs.savannah.gnu.org/viewcvs/gnash/server/text.cpp?cvsroot=gnash&r1=1.36&r2=1.37
http://cvs.savannah.gnu.org/viewcvs/gnash/server/parser/text_character_def.cpp?cvsroot=gnash&r1=1.6&r2=1.7

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.4027
retrieving revision 1.4028
diff -u -b -r1.4027 -r1.4028
--- ChangeLog   18 Aug 2007 13:08:15 -0000      1.4027
+++ ChangeLog   18 Aug 2007 13:24:14 -0000      1.4028
@@ -1,5 +1,10 @@
 2007-08-18 Sandro Santilli <address@hidden>
 
+       * server/text.cpp (resolve_font): fix missing return.
+       * server/parser/text_character_def.cpp: fix compiler warnings.
+
+2007-08-18 Sandro Santilli <address@hidden>
+
        * gui/gui.{cpp,h}: add a getMovieInfo() function as a quick hack
          to print movie information.
        * gui/: gtk.cpp, gtksup.h: add a View->movieInfo menu item.

Index: server/text.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/text.cpp,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -b -r1.36 -r1.37
--- server/text.cpp     18 Aug 2007 08:04:59 -0000      1.36
+++ server/text.cpp     18 Aug 2007 13:24:14 -0000      1.37
@@ -17,7 +17,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
-/* $Id: text.cpp,v 1.36 2007/08/18 08:04:59 strk Exp $ */
+/* $Id: text.cpp,v 1.37 2007/08/18 13:24:14 strk Exp $ */
 
 // Based on the public domain work of Thatcher Ulrich <address@hidden> 2003
 
@@ -63,6 +63,8 @@
                        );
                        return false;
                }
+
+               return true;
        }
 
        void text_glyph_record::read(stream* in, int glyph_count,

Index: server/parser/text_character_def.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/parser/text_character_def.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- server/parser/text_character_def.cpp        18 Aug 2007 08:05:00 -0000      
1.6
+++ server/parser/text_character_def.cpp        18 Aug 2007 13:24:14 -0000      
1.7
@@ -72,7 +72,7 @@
                                }
 
                                IF_VERBOSE_PARSE(
-                               log_parse(_("  has_font: font id = %d (%p)"), 
font_id, (void*)style.getFont());
+                               log_parse(_("  has_font: font id = %d (%p)"), 
font_id, (const void*)style.getFont());
                                );
                        }
                        if (has_color)