walkero
/
fontconfig
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Share name-mapping across instances 

Continuation of previous commit.

Makes scanning Voto Serif GX fast again.
This commit is contained in:
Behdad Esfahbod 2018-03-31 19:19:36 +02:00
parent fa13f8835c
commit a8a6efa805
1 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/fcfreetype.c
View File

@ -1202,7 +1202,8 @@ FcFreeTypeQueryFaceInternal (const FT_Face face,
const FcChar8 *file, const FcChar8 *file,
unsigned int id, unsigned int id,
FcCharSet **cs_share, FcCharSet **cs_share,
FcLangSet **ls_share) FcLangSet **ls_share,
FcNameMapping **nm_share)
{ {
FcPattern *pat; FcPattern *pat;
int slant = -1; int slant = -1;
@ -1215,7 +1216,7 @@ FcFreeTypeQueryFaceInternal (const FT_Face face,
FcBool variable_size = FcFalse; FcBool variable_size = FcFalse;
FcCharSet *cs; FcCharSet *cs;
FcLangSet *ls; FcLangSet *ls;
FcNameMapping *name_mapping = 0; FcNameMapping *name_mapping = NULL;
#if 0 #if 0
FcChar8 *family = 0; FcChar8 *family = 0;
#endif #endif
@ -1407,6 +1408,8 @@ FcFreeTypeQueryFaceInternal (const FT_Face face,
* of them * of them
*/ */
name_count = FT_Get_Sfnt_Name_Count (face); name_count = FT_Get_Sfnt_Name_Count (face);
if (nm_share)
name_mapping = *nm_share;
if (!name_mapping) if (!name_mapping)
{ {
int i = 0; int i = 0;
@ -1435,6 +1438,9 @@ FcFreeTypeQueryFaceInternal (const FT_Face face,
} }
} }
qsort (name_mapping, name_count, sizeof(FcNameMapping), name_mapping_cmp); qsort (name_mapping, name_count, sizeof(FcNameMapping), name_mapping_cmp);
if (nm_share)
*nm_share = name_mapping;
} }
for (p = 0; p < NUM_PLATFORM_ORDER; p++) for (p = 0; p < NUM_PLATFORM_ORDER; p++)
{ {
@ -1590,7 +1596,8 @@ FcFreeTypeQueryFaceInternal (const FT_Face face,
platform == sname.platform_id && lookupid == sname.name_id); platform == sname.platform_id && lookupid == sname.name_id);
} }
} }
free (name_mapping); if (!nm_share)
free (name_mapping);
if (!nfamily && face->family_name && if (!nfamily && face->family_name &&
FcStrCmpIgnoreBlanksAndCase ((FcChar8 *) face->family_name, (FcChar8 *) "") != 0) FcStrCmpIgnoreBlanksAndCase ((FcChar8 *) face->family_name, (FcChar8 *) "") != 0)
@ -2112,7 +2119,7 @@ FcFreeTypeQueryFace (const FT_Face face,
unsigned int id, unsigned int id,
FcBlanks *blanks FC_UNUSED) FcBlanks *blanks FC_UNUSED)
{ {
return FcFreeTypeQueryFaceInternal (face, file, id, NULL, NULL); return FcFreeTypeQueryFaceInternal (face, file, id, NULL, NULL, NULL);
} }
FcPattern * FcPattern *
@ -2134,7 +2141,7 @@ FcFreeTypeQuery(const FcChar8 *file,
if (count) if (count)
*count = face->num_faces; *count = face->num_faces;
pat = FcFreeTypeQueryFaceInternal (face, file, id, NULL, NULL); pat = FcFreeTypeQueryFaceInternal (face, file, id, NULL, NULL, NULL);
FT_Done_Face (face); FT_Done_Face (face);
bail: bail:
@ -2153,6 +2160,7 @@ FcFreeTypeQueryAll(const FcChar8 *file,
FT_Library ftLibrary = NULL; FT_Library ftLibrary = NULL;
FcCharSet *cs = NULL; FcCharSet *cs = NULL;
FcLangSet *ls = NULL; FcLangSet *ls = NULL;
FcNameMapping *nm = NULL;
FT_MM_Var *mm_var = NULL; FT_MM_Var *mm_var = NULL;
FcBool index_set = id != (unsigned int) -1; FcBool index_set = id != (unsigned int) -1;
unsigned int set_face_num = index_set ? id & 0xFFFF : 0; unsigned int set_face_num = index_set ? id & 0xFFFF : 0;
@ -2212,7 +2220,7 @@ FcFreeTypeQueryAll(const FcChar8 *file,
} }
id = ((instance_num << 16) + face_num); id = ((instance_num << 16) + face_num);
pat = FcFreeTypeQueryFaceInternal (face, (const FcChar8 *) file, id, &cs, &ls); pat = FcFreeTypeQueryFaceInternal (face, (const FcChar8 *) file, id, &cs, &ls, &nm);
if (pat) if (pat)
{ {
@ -2231,6 +2239,8 @@ skip:
instance_num = 0x8000; /* variable font */ instance_num = 0x8000; /* variable font */
else else
{ {
free (nm);
nm = NULL;
FcLangSetDestroy (ls); FcLangSetDestroy (ls);
ls = NULL; ls = NULL;
FcCharSetDestroy (cs); FcCharSetDestroy (cs);