diff options
| author | marha <marha@users.sourceforge.net> | 2011-01-16 19:26:40 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-01-16 19:26:40 +0000 |
| commit | 4e370208d0f941a4cceb6f9fefa78444c2bf3498 (patch) | |
| tree | 543c693b5dee03c965b0c9ef79869a8536024432 /freetype/src/cache/ftccmap.c | |
| parent | 1eaf4b3f1d746b054298358d81233364bb1b7ba2 (diff) | |
| parent | 2177eb8fad173f2b0fe04f188c4d6dadaa8f4441 (diff) | |
| download | vcxsrv-4e370208d0f941a4cceb6f9fefa78444c2bf3498.tar.gz vcxsrv-4e370208d0f941a4cceb6f9fefa78444c2bf3498.tar.bz2 vcxsrv-4e370208d0f941a4cceb6f9fefa78444c2bf3498.zip | |
svn merge ^/branches/released .
Diffstat (limited to 'freetype/src/cache/ftccmap.c')
| -rw-r--r-- | freetype/src/cache/ftccmap.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/freetype/src/cache/ftccmap.c b/freetype/src/cache/ftccmap.c index bc0e66075..6a3962f08 100644 --- a/freetype/src/cache/ftccmap.c +++ b/freetype/src/cache/ftccmap.c @@ -87,7 +87,7 @@ /* compute a query/node hash */ #define FTC_CMAP_HASH( faceid, index, charcode ) \ - ( FTC_FACE_ID_HASH( faceid ) + 211 * (index) + \ + ( _FTC_FACE_ID_HASH( faceid ) + 211 * (index) + \ ( (charcode) / FTC_CMAP_INDICES_MAX ) ) /* the charmap query */ @@ -287,7 +287,7 @@ FTC_Node node; FT_Error error; FT_UInt gindex = 0; - FT_UInt32 hash; + FT_PtrDist hash; FT_Int no_cmap_change = 0; |