From 17cd687266dadb4bd371c2c74e3298a8ccf87da5 Mon Sep 17 00:00:00 2001 From: David Turner Date: Tue, 2 Sep 2008 02:34:29 +0000 Subject: * include/freetype/ftcache.h, src/cache/ftccmap.c: modify FTC_CMapCache_Lookup to accept a negative cmap index to mean "use default cached FT_Face's charmap". This fixes Savannah issue #22625 --- src/cache/ftccmap.c | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) (limited to 'src/cache/ftccmap.c') diff --git a/src/cache/ftccmap.c b/src/cache/ftccmap.c index aa59307f4..51bef1e91 100644 --- a/src/cache/ftccmap.c +++ b/src/cache/ftccmap.c @@ -288,7 +288,19 @@ FT_Error error; FT_UInt gindex = 0; FT_UInt32 hash; + FT_Int no_cmap_change = 0; + if (cmap_index < 0) + { + /* treat a negative cmap index as a special value that + * means you don't want to change the FT_Face's character + * map through this call. this can be useful when the + * face requester callback already set the face's charmap + * to the appropriate value. + */ + no_cmap_change = 1; + cmap_index = 0; + } if ( !cache ) { @@ -311,7 +323,7 @@ * Adobe Acrobat Reader Pack, named `KozMinProVI-Regular.otf', * which contains more than 5 charmaps. */ - if ( cmap_index >= 16 ) + if ( cmap_index >= 16 && !no_cmap_change ) { FTC_OldCMapDesc desc = (FTC_OldCMapDesc) face_id; @@ -393,12 +405,12 @@ old = face->charmap; cmap = face->charmaps[cmap_index]; - if ( old != cmap ) + if ( old != cmap && !no_cmap_change ) FT_Set_Charmap( face, cmap ); gindex = FT_Get_Char_Index( face, char_code ); - if ( old != cmap ) + if ( old != cmap && !no_cmap_change ) FT_Set_Charmap( face, old ); } -- cgit v1.2.1