[Gnash-commit] gnash ChangeLog server/FreetypeGlyphsProvider.cpp [release_0_8_1]

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Branch:         release_0_8_1
Changes by:     Sandro Santilli <strk>  07/08/09 23:31:06

Modified files:
        .              : ChangeLog 
        server         : FreetypeGlyphsProvider.cpp 

Log message:
                * server/FreetypeGlyphsProvider.cpp (getGlyph): don't abort if
                  FT_Load_Char doesn't return an outline glyph, rather print
                  an UNIMPLEMENTED message and the type of glyph you got.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&only_with_tag=release_0_8_1&r1=1.3971.2.5&r2=1.3971.2.6
http://cvs.savannah.gnu.org/viewcvs/gnash/server/FreetypeGlyphsProvider.cpp?cvsroot=gnash&only_with_tag=release_0_8_1&r1=1.7&r2=1.7.2.1

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3971.2.5
retrieving revision 1.3971.2.6
diff -u -b -r1.3971.2.5 -r1.3971.2.6
--- ChangeLog   9 Aug 2007 23:24:36 -0000       1.3971.2.5
+++ ChangeLog   9 Aug 2007 23:31:05 -0000       1.3971.2.6
@@ -1,5 +1,8 @@
 2007-08-09 Sandro Santilli <address@hidden>
 
+       * server/FreetypeGlyphsProvider.cpp (getGlyph): don't abort if
+         FT_Load_Char doesn't return an outline glyph, rather print
+         an UNIMPLEMENTED message and the type of glyph you got.
        * server/swf/tag_loaders.cpp (ADPCMDecoder::adpcm_expand):
          Rather then throwing a ParseException, just print an error
          as it's much likely the error is in Gnash parser, rather

Index: server/FreetypeGlyphsProvider.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/FreetypeGlyphsProvider.cpp,v
retrieving revision 1.7
retrieving revision 1.7.2.1
diff -u -b -r1.7 -r1.7.2.1
--- server/FreetypeGlyphsProvider.cpp   24 Jul 2007 15:01:27 -0000      1.7
+++ server/FreetypeGlyphsProvider.cpp   9 Aug 2007 23:31:06 -0000       1.7.2.1
@@ -408,7 +408,13 @@
        log_debug("Advance value for glyph '%c' is %g (horiAdvance:%ld, 
scale:%g)", code, advance, m_face->glyph->metrics.horiAdvance, scale);
 #endif
 
-       assert(m_face->glyph->format == FT_GLYPH_FORMAT_OUTLINE);
+       if ( m_face->glyph->format != FT_GLYPH_FORMAT_OUTLINE )
+       {
+               log_unimpl("FT_Load_Char() returned a glyph format != 
FT_GLYPH_FORMAT_OUTLINE (%d)",
+                       m_face->glyph->format);
+               return 0;
+       }
+       //assert(m_face->glyph->format == FT_GLYPH_FORMAT_OUTLINE);
 
        FT_Outline* outline = &(m_face->glyph->outline);