ref: d496b926590c9d7532a1344dcd28a5019fa8c74e
parent: c0da52327062468c067c646cc4b1873859015b59
author: Werner Lemberg <wl@gnu.org>
date: Tue Dec 4 16:49:59 EST 2007
* src/truetype/ttobjs.c (tt_face_init): Don't use logical OR to concatenate error codes.
--- a/ChangeLog
+++ b/ChangeLog
@@ -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
--- a/src/truetype/ttobjs.c
+++ b/src/truetype/ttobjs.c
@@ -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
--
⑨