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

cff: Type large constants > 0x7FFF as long for 16-bit systems.

This commit is contained in:
suzuki toshiya 2009-07-03 18:01:41 +09:00
parent 8114d2d684
commit ac079164bd
2 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ChangeLog
View File

@ -1,3 +1,12 @@
2009-07-03 suzuki toshiya <mpsuzuki@hiroshima-u.ac.jp>
cff: Type large constants > 0x7FFF as long for 16-bit systems.
* src/cff/cffload.c (cff_charset_load): Type large
constants > 0x7FFF as long, because normal constants
are typed signed integer that is less than 0x8000 on
16-bit systems.
2009-07-03 suzuki toshiya <mpsuzuki@hiroshima-u.ac.jp>
base: Remove an unused variable.

8
src/cff/cffload.c
View File

@ -847,7 +847,7 @@
/* this constant is given in the CFF specification */
if ( sid < 65000 )
if ( sid < 65000L )
charset->sids[j] = sid;
else
{
@ -890,16 +890,16 @@
/* check whether the range contains at least one valid glyph; */
/* the constant is given in the CFF specification */
if ( glyph_sid >= 65000 ) {
if ( glyph_sid >= 65000L ) {
FT_ERROR(( "cff_charset_load: invalid SID range\n" ));
error = CFF_Err_Invalid_File_Format;
goto Exit;
}
/* try to rescue some of the SIDs if `nleft' is too large */
if ( nleft > 65000 - 1 || glyph_sid >= 65000 - nleft ) {
if ( nleft > 65000L - 1L || glyph_sid >= 65000L - nleft ) {
FT_ERROR(( "cff_charset_load: invalid SID range trimmed\n" ));
nleft = 65000 - 1 - glyph_sid;
nleft = ( FT_UInt )( 65000L - 1L - glyph_sid );
}
/* Fill in the range of sids -- `nleft + 1' glyphs. */