[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnash-commit] gnash ChangeLog server/FreetypeGlyphsProvider.cpp
From: |
Sandro Santilli |
Subject: |
[Gnash-commit] gnash ChangeLog server/FreetypeGlyphsProvider.cpp |
Date: |
Thu, 09 Aug 2007 23:29:53 +0000 |
CVSROOT: /sources/gnash
Module name: gnash
Changes by: Sandro Santilli <strk> 07/08/09 23:29:53
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&r1=1.3978&r2=1.3979
http://cvs.savannah.gnu.org/viewcvs/gnash/server/FreetypeGlyphsProvider.cpp?cvsroot=gnash&r1=1.7&r2=1.8
Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3978
retrieving revision 1.3979
diff -u -b -r1.3978 -r1.3979
--- ChangeLog 9 Aug 2007 23:24:43 -0000 1.3978
+++ ChangeLog 9 Aug 2007 23:29:53 -0000 1.3979
@@ -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.8
diff -u -b -r1.7 -r1.8
--- server/FreetypeGlyphsProvider.cpp 24 Jul 2007 15:01:27 -0000 1.7
+++ server/FreetypeGlyphsProvider.cpp 9 Aug 2007 23:29:53 -0000 1.8
@@ -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);
- [Gnash-commit] gnash ChangeLog server/FreetypeGlyphsProvider.cpp,
Sandro Santilli <=