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

* src/cff/cffload.c (cff_subfont_load): Don't use logical OR to 

concatenate error codes.
* src/sfnt/ttsbit.c (Load_SBit_Range): Ditto.
This commit is contained in:
Werner Lemberg 2007-12-04 22:05:54 +00:00
parent d496b92659
commit a10d2b7cf5
3 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
2007-12-04 Werner Lemberg <wl@gnu.org>
* src/cff/cffload.c (cff_subfont_load): Don't use logical OR to
concatenate error codes.
* src/sfnt/ttsbit.c (Load_SBit_Range): Ditto.
2007-12-04 Graham Asher <graham.asher@btinternet.com>
* src/truetype/ttobjs.c (tt_face_init): Don't use logical OR to

5
src/cff/cffload.c
View File

@ -1272,8 +1272,9 @@
top->cid_ordering = 0xFFFFU;
top->cid_font_name = 0xFFFFU;
error = cff_index_access_element( idx, font_index, &dict, &dict_len ) ||
cff_parser_run( &parser, dict, dict + dict_len );
error = cff_index_access_element( idx, font_index, &dict, &dict_len );
if ( !error )
error = cff_parser_run( &parser, dict, dict + dict_len );
cff_index_forget_element( idx, &dict );

5
src/sfnt/ttsbit.c
View File

@ -382,8 +382,9 @@
break;
case 5:
error = Load_SBit_Const_Metrics( range, stream ) ||
Load_SBit_Range_Codes( range, stream, 0 );
error = Load_SBit_Const_Metrics( range, stream );
if ( !error )
error = Load_SBit_Range_Codes( range, stream, 0 );
break;
default: