ref: b16a942671c80f0cbb2cdca96a4a583dabcdaf73
parent: 5133c56f2f6613d07913ac85f8e14acb3e0d2f42
author: suzuki toshiya <[email protected]>
date: Fri Jul 31 20:32:25 EDT 2009
cff: Type large constants > 0x7FFF as long for 16-bit systems.
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,14 @@
2009-07-31 suzuki toshiya <[email protected]>
+ 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 <[email protected]>
+
base: Remove an unused variable.
* src/base/ftglyph.c (FT_Glyph_To_Bitmap): Remove an
--- a/src/cff/cffload.c
+++ b/src/cff/cffload.c
@@ -851,7 +851,7 @@
/* this constant is given in the CFF specification */
- if ( sid < 65000 )
+ if ( sid < 65000L )
charset->sids[j] = sid;
else
{@@ -894,7 +894,7 @@
/* 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;
@@ -901,9 +901,9 @@
}
/* 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. */