lib/freetype
1
0
Fork 0
mirror of https://github.com/freetype/freetype.git synced 2026-10-23 11:08:54 +03:00
Code Activity

[base] Reject 'cmap' format 15 as an active charmap.

Browse Source 
Like format 14, cmap format 15 is a supplemental Unicode variation-sequence
subtable and cannot be selected as the face's ordinary character map.

Assisted-by: OpenAI Codex <noreply@openai.com>

* src/base/ftobjs.c (FT_Set_Charmap, find_unicode_charmap): Implement it.
This commit is contained in:
Behdad Esfahbod (بهداد اسفهبد)
2026-10-02 00:41:34 -06:00
committed by Werner Lemberg
parent 02881ccbfe
commit ba4ee6c6bd
1 changed files with 17 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/base/ftobjs.c
View File

@@ -1461,8 +1461,14 @@
{
if ( cur[0]->encoding == FT_ENCODING_UNICODE )
{
face->charmap = cur[0];
return FT_Err_Ok;
FT_Long format = FT_Get_CMap_Format( cur[0] );
if ( format != 14 && format != 15 )
{
face->charmap = cur[0];
return FT_Err_Ok;
}
}
}
@@ -3796,11 +3802,16 @@
for ( ; cur < limit; cur++ )
{
if ( cur[0] == charmap &&
FT_Get_CMap_Format ( charmap ) != 14 )
if ( cur[0] == charmap )
{
face->charmap = cur[0];
return FT_Err_Ok;
FT_Long format = FT_Get_CMap_Format( charmap );
if ( format != 14 && format != 15 )
{
face->charmap = cur[0];
return FT_Err_Ok;
}
}
}