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


			
			
				david-pic-changes
			
			
		
Werner Lemberg 17 years ago
parent c0da523270
commit d496b92659
  1. 5
      ChangeLog
  2. 19
      src/truetype/ttobjs.c

@ -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

@ -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

Loading…
Cancel
Save