ref: d2c55ab0e4ce435d3c6a2a99ab203a6802cdfd27
parent: aa722df478384b054313700bb0fdf0c3c4ad8875
author: Suzuki, Toshiya (鈴木俊哉) <[email protected]>
date: Fri Feb 15 04:12:59 EST 2008
fix for inexistent sfnt ID in broken FOND
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2008-02-15 suzuki toshiya <[email protected]>
+
+ * src/base/ftmac.c (FT_New_Face_From_SFNT): Check the sfnt resource
+ handle by its value instead of ResError(), fix provided by Deron
+ Kazmaier. According to Resource Manager Reference, GetResource(),
+ Get1Resource(), GetNamedResource(), Get1NamedResource()
+ and RGetResource() set noErr but returns NULL handle when they can
+ not find requested resource. These functions never return undefined
+ values, so it is sufficient to check if the handle is not NULL.
+
+ * builds/mac/ftmac.c (FT_New_Face_From_SFNT): Ditto.
+
2008-02-14 suzuki toshiya <[email protected]>
* src/base/ftbase.c: <ftmac.c> is replaced by "ftmac.c" as other
--- a/builds/mac/ftmac.c
+++ b/builds/mac/ftmac.c
@@ -1207,7 +1207,7 @@
sfnt = GetResource( FT_MAKE_TAG( 's', 'f', 'n', 't' ), sfnt_id );
- if ( ResError() )
+ if ( sfnt == NULL )
return FT_Err_Invalid_Handle;
sfnt_size = (FT_ULong)GetHandleSize( sfnt );
--- a/src/base/ftmac.c
+++ b/src/base/ftmac.c
@@ -828,7 +828,7 @@
sfnt = GetResource( FT_MAKE_TAG( 's', 'f', 'n', 't' ), sfnt_id );
- if ( ResError() )
+ if ( sfnt == NULL )
return FT_Err_Invalid_Handle;
sfnt_size = (FT_ULong)GetHandleSize( sfnt );