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

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  07/07/24 19:57:11

Modified files:
        .              : ChangeLog 
        server         : text.cpp 

Log message:
                * server/text.cpp (display_glyph_records): don't render invalid 
glyphs
                  as empty boxes, unless a DRAW_INVALID_GLYPHS_AS_EMPTY_BOXES 
macro
                  is defined.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.3813&r2=1.3814
http://cvs.savannah.gnu.org/viewcvs/gnash/server/text.cpp?cvsroot=gnash&r1=1.34&r2=1.35

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3813
retrieving revision 1.3814
diff -u -b -r1.3813 -r1.3814
--- ChangeLog   24 Jul 2007 19:51:27 -0000      1.3813
+++ ChangeLog   24 Jul 2007 19:57:10 -0000      1.3814
@@ -1,5 +1,8 @@
 2007-07-24 Sandro Santilli <address@hidden>
 
+       * server/text.cpp (display_glyph_records): don't render invalid glyphs
+         as empty boxes, unless a DRAW_INVALID_GLYPHS_AS_EMPTY_BOXES macro
+         is defined.
        * server/edit_text_character.cpp (setEmbedFonts):
          Set _embedFonts *before* calling format_text, or
          glyph indexes will be messed up.

Index: server/text.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/text.cpp,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -b -r1.34 -r1.35
--- server/text.cpp     24 Jul 2007 19:43:30 -0000      1.34
+++ server/text.cpp     24 Jul 2007 19:57:10 -0000      1.35
@@ -17,7 +17,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
-/* $Id: text.cpp,v 1.34 2007/07/24 19:43:30 strk Exp $ */
+/* $Id: text.cpp,v 1.35 2007/07/24 19:57:10 strk Exp $ */
 
 // Based on the public domain work of Thatcher Ulrich <address@hidden> 2003
 
@@ -38,6 +38,11 @@
 // for text rendering
 //#define GNASH_DEBUG_TEXT_RENDERING 1
 
+// Define the following macro to have invalid glyphs drawn as
+// empty boxes
+//#define DRAW_INVALID_GLYPHS_AS_EMPTY_BOXES 1
+
+
 namespace gnash {
 
        void text_style::resolve_font(movie_definition* root_def) const
@@ -161,8 +166,10 @@
                                if (index == -1)
                                {
 #ifdef GNASH_DEBUG_TEXT_RENDERING
-log_error(_("invalid glyph, render as an empty box"));
+log_error(_("invalid glyph (-1)"));
 #endif
+
+#ifdef DRAW_INVALID_GLYPHS_AS_EMPTY_BOXES
                                        render::set_matrix(mat);
 
                                        // The EM square is 1024x1024, but 
usually isn't filled up.
@@ -178,6 +185,8 @@
                                                 32,   32
                                        };
                                        
render::draw_line_strip(s_empty_char_box, 5, transformed_color);  
+#endif
+
                                }
                                else
                                {