rgraves
/
freetype2
forked from minhngoc25a/freetype2
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

* src/base/ftobjs.c (IsMacResource): fixed a small bug that caused a 

crash with some Mac OS X .dfont files. Submitted by Masatake Yamoto.
This commit is contained in:
David Turner 2007-01-11 15:09:01 +00:00
parent 038ace28ad
commit 7a3c564e2e
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -1,5 +1,8 @@
2007-01-11 David Turner <david@freetype.org> 2007-01-11 David Turner <david@freetype.org>
* src/base/ftobjs.c (IsMacResource): fixed a small bug that caused a
crash with some Mac OS X .dfont files. Submitted by Masatake Yamoto.
* autogen.sh: small fix to get it working on Mac OS X properly, * autogen.sh: small fix to get it working on Mac OS X properly,
the issue is that GNU libtool is called "glibtool" on this platform, the issue is that GNU libtool is called "glibtool" on this platform,
and we must call "glibtoolize", since "libtoolize" doesn't exist and we must call "glibtoolize", since "libtoolize" doesn't exist

6
src/base/ftobjs.c
View File

@ -1446,7 +1446,8 @@
face_index, aface ); face_index, aface );
FT_FREE( data_offsets ); FT_FREE( data_offsets );
/* POST exists in an LWFN providing a single face */ /* POST exists in an LWFN providing a single face */
(*aface)->num_faces = 1; if (!error)
(*aface)->num_faces = 1;
return error; return error;
} }
@ -1462,7 +1463,8 @@
error = Mac_Read_sfnt_Resource( library, stream, data_offsets, count, error = Mac_Read_sfnt_Resource( library, stream, data_offsets, count,
face_index_internal, aface ); face_index_internal, aface );
FT_FREE( data_offsets ); FT_FREE( data_offsets );
(*aface)->num_faces = count; if (!error)
(*aface)->num_faces = count;
} }
return error; return error;