Commit d496b926590c9d7532a1344dcd28a5019fa8c74e
2007-12-04T21:49:59
* src/truetype/ttobjs.c (tt_face_init): Don't use logical OR to concatenate error codes.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47
diff --git a/ChangeLog b/ChangeLog
index de64bc7..925f13f 100644
--- 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
diff --git a/src/truetype/ttobjs.c b/src/truetype/ttobjs.c
index 0294a1b..7e4c6d4 100644
--- 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