minhngoc25a
/
freetype2
mirror of git://git.savannah.gnu.org/freetype/freetype2.git
2
1
Fork 2
Code Issues 4 Releases Wiki Activity

psnames: Handle Unicode codepoints by FT_UInt32 variables.

This commit is contained in:
suzuki toshiya 2009-08-01 00:30:17 +09:00
parent d200982d8b
commit 82ebaa7b05
2 changed files with 17 additions and 7 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-31 suzuki toshiya <mpsuzuki@hiroshima-u.ac.jp>
psnames: Handle Unicode codepoints by FT_UInt32 variables.
* src/psnames/psmodule.c (BASE_GLYPH): Cast the result
to unsigned 32-bit integer for LP64 platform.
(ps_unicode_value): Return the value by unsigned 32-bit
integer instead of unsigned long.
2009-07-31 suzuki toshiya <mpsuzuki@hiroshima-u.ac.jp>
psaux: Use size_t variable to pass the buffer size.

15
src/psnames/psmodule.c
View File

@ -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 );
}
}