* src/cff/cffobjs.c: small fix to select the Unicode charmap by default

when needed
23 years ago · ca6ddd42ee
parent a5b3516610
commit ca6ddd42ee
2 changed files with 9 additions and 0 deletions
--- a/3
+++ b/3
@ -1,5 +1,8 @@
 2002-07-10  David Turner  <david@freetype.org>

+    * src/cff/cffobjs.c: small fix to select the Unicode charmap by default
+    when needed
+
    * src/cff/cffobjs.c: small fix to allow OpenType fonts to support Adobe
    charmaps when needed.

--- a/src/cff/cffobjs.c
+++ b/src/cff/cffobjs.c
@ -483,8 +483,14 @@
        cmaprec.encoding_id = 1;
        cmaprec.encoding    = ft_encoding_unicode;

+        nn = (FT_UInt) root->num_charmaps;
+        
        FT_CMap_New( &cff_cmap_unicode_class_rec, NULL, &cmaprec, NULL );

+        /* if no Unicode charmap was previously selected, select this one */
+        if ( root->charmap == NULL && nn != (FT_UInt) root->num_charmaps )
+          root->charmap = root->charmaps[nn];
+
      Skip_Unicode:
        if ( encoding->count > 0 )
        {