diff options
author | Werner Lemberg <wl@gnu.org> | 2010-11-18 13:08:52 +0100 |
---|---|---|
committer | Werner Lemberg <wl@gnu.org> | 2010-11-18 13:08:52 +0100 |
commit | fa764cf8687eea54ce7b929eb066f117f51bd6de (patch) | |
tree | 244ec52fd001e5f2d87a2ec4c3f8728df0cccfff | |
parent | b70d8a0ef614e8aa65f973a3799887606223c991 (diff) | |
download | freetype2-fa764cf8687eea54ce7b929eb066f117f51bd6de.tar.gz |
[sfnt] Ignore all errors while loading `OS/2' table.
Suggested by Johnson Y. Yan <yinsen_yan@foxitsoftware.com>.
* src/sfnt/sfobjs.c (sfnt_load_face): Do it.
-rw-r--r-- | ChangeLog | 7 | ||||
-rw-r--r-- | src/sfnt/sfobjs.c | 4 |
2 files changed, 8 insertions, 3 deletions
@@ -1,3 +1,10 @@ +2010-11-18 Werner Lemberg <wl@gnu.org> + + [sfnt] Ignore all errors while loading `OS/2' table. + Suggested by Johnson Y. Yan <yinsen_yan@foxitsoftware.com>. + + * src/sfnt/sfobjs.c (sfnt_load_face): Do it. + 2010-11-18 Johnson Y. Yan <yinsen_yan@foxitsoftware.com> [type1] Fix matrix normalization. diff --git a/src/sfnt/sfobjs.c b/src/sfnt/sfobjs.c index 6e35e2db0..5a1d0031e 100644 --- a/src/sfnt/sfobjs.c +++ b/src/sfnt/sfobjs.c @@ -691,9 +691,7 @@ LOAD_( os2 ); if ( error ) { - if ( error != SFNT_Err_Table_Missing ) - goto Exit; - + /* we treat the table as missing if there are any errors */ face->os2.version = 0xFFFFU; } } |