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

* src/truetype/ttobjs.c (tt_face_init): Don't use logical OR to 

concatenate error codes.
This commit is contained in:
Werner Lemberg 2007-12-04 21:49:59 +00:00
parent c0da523270
commit d496b92659
2 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
2007-12-04 Graham Asher <graham.asher@btinternet.com>
* src/truetype/ttobjs.c (tt_face_init): Don't use logical OR to
concatenate error codes.
2007-12-04 Sean McBride <sean@rogue-research.com>
* src/pfr/pfrgload.c (pfr_glyph_load_compound): Remove compiler

19
src/truetype/ttobjs.c
View File

@ -230,17 +230,22 @@
if ( !face->root.internal->incremental_interface )
error = tt_face_load_loca( face, stream );
if ( !error )
error = tt_face_load_cvt( face, stream ) ||
tt_face_load_fpgm( face, stream ) ||
tt_face_load_prep( face, stream );
error = tt_face_load_cvt( face, stream );
if ( !error )
error = tt_face_load_fpgm( face, stream );
if ( !error )
error = tt_face_load_prep( face, stream );
#else
if ( !error )
error = tt_face_load_loca( face, stream ) ||
tt_face_load_cvt( face, stream ) ||
tt_face_load_fpgm( face, stream ) ||
tt_face_load_prep( face, stream );
error = tt_face_load_loca( face, stream );
if ( !error )
error = tt_face_load_cvt( face, stream );
if ( !error )
error = tt_face_load_fpgm( face, stream );
if ( !error )
error = tt_face_load_prep( face, stream );
#endif