forked from minhngoc25a/freetype2
cff: Type large constants > 0x7FFF as long for 16-bit systems.
This commit is contained in:
parent
5133c56f2f
commit
b16a942671
|
@ -1,3 +1,12 @@
|
||||||
|
2009-07-31 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-31 suzuki toshiya <mpsuzuki@hiroshima-u.ac.jp>
|
2009-07-31 suzuki toshiya <mpsuzuki@hiroshima-u.ac.jp>
|
||||||
|
|
||||||
base: Remove an unused variable.
|
base: Remove an unused variable.
|
||||||
|
|
|
@ -851,7 +851,7 @@
|
||||||
|
|
||||||
|
|
||||||
/* this constant is given in the CFF specification */
|
/* this constant is given in the CFF specification */
|
||||||
if ( sid < 65000 )
|
if ( sid < 65000L )
|
||||||
charset->sids[j] = sid;
|
charset->sids[j] = sid;
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
@ -894,16 +894,16 @@
|
||||||
|
|
||||||
/* check whether the range contains at least one valid glyph; */
|
/* check whether the range contains at least one valid glyph; */
|
||||||
/* the constant is given in the CFF specification */
|
/* 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" ));
|
FT_ERROR(( "cff_charset_load: invalid SID range\n" ));
|
||||||
error = CFF_Err_Invalid_File_Format;
|
error = CFF_Err_Invalid_File_Format;
|
||||||
goto Exit;
|
goto Exit;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* try to rescue some of the SIDs if `nleft' is too large */
|
/* 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" ));
|
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. */
|
/* Fill in the range of sids -- `nleft + 1' glyphs. */
|
||||||
|
|
Loading…
Reference in New Issue