diff options
author | suzuki toshiya <mpsuzuki@hiroshima-u.ac.jp> | 2009-08-01 00:30:17 +0900 |
---|---|---|
committer | suzuki toshiya <mpsuzuki@hiroshima-u.ac.jp> | 2009-08-01 00:30:17 +0900 |
commit | 82ebaa7b0512030cd3c9d80dcfac58612246be8d (patch) | |
tree | f87557c45ec868561b2f82b66d587b8e81a96307 /src/psnames | |
parent | d200982d8b35be32c75f2af9c9b175af190d5a9d (diff) | |
download | freetype2-82ebaa7b0512030cd3c9d80dcfac58612246be8d.tar.gz |
psnames: Handle Unicode codepoints by FT_UInt32 variables.
Diffstat (limited to 'src/psnames')
-rw-r--r-- | src/psnames/psmodule.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/src/psnames/psmodule.c b/src/psnames/psmodule.c index 6069ad8ee..3a7d27ee4 100644 --- a/src/psnames/psmodule.c +++ b/src/psnames/psmodule.c @@ -34,7 +34,7 @@ #define VARIANT_BIT 0x80000000UL -#define BASE_GLYPH( code ) ( (code) & ~VARIANT_BIT ) +#define BASE_GLYPH( code ) ( (FT_UInt32)( (code) & ~VARIANT_BIT ) ) /* Return the Unicode value corresponding to a given glyph. Note that */ @@ -58,7 +58,7 @@ /* `uniXXXXYYYYZZZZ'... */ FT_Int count; - FT_ULong value = 0; + FT_UInt32 value = 0; const char* p = glyph_name + 3; @@ -93,7 +93,7 @@ if ( *p == '\0' ) return value; if ( *p == '.' ) - return value | VARIANT_BIT; + return (FT_UInt32)( value | VARIANT_BIT ); } } @@ -102,7 +102,7 @@ if ( glyph_name[0] == 'u' ) { FT_Int count; - FT_ULong value = 0; + FT_UInt32 value = 0; const char* p = glyph_name + 1; @@ -133,7 +133,7 @@ if ( *p == '\0' ) return value; if ( *p == '.' ) - return value | VARIANT_BIT; + return (FT_UInt32)( value | VARIANT_BIT ); } } @@ -155,9 +155,10 @@ /* now look up the glyph in the Adobe Glyph List */ if ( !dot ) - return ft_get_adobe_glyph_index( glyph_name, p ); + return (FT_UInt32)ft_get_adobe_glyph_index( glyph_name, p ); else - return ft_get_adobe_glyph_index( glyph_name, dot ) | VARIANT_BIT; + return (FT_UInt32)( ft_get_adobe_glyph_index( glyph_name, dot ) | + VARIANT_BIT ); } } |