organicmaps/harfbuzz
13
Fork 0
mirror of https://github.com/harfbuzz/harfbuzz.git synced 2025-04-05 05:25:05 +00:00
Code Issues 1 Projects Releases Wiki Activity Actions 9

[coretext] Fix loading named instances

Browse source 
Needs tests...

TTC indices > 0 can't be loaded with CoreText API it seems.

Fixes https://github.com/harfbuzz/harfbuzz/issues/5158
This commit is contained in:
Behdad Esfahbod 2025-03-18 00:54:46 -06:00
parent 472e65dd0f
commit 38889c3ad6
2 changed files with 37 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
src/hb-coretext.cc
View file

@ -158,10 +158,17 @@ release_data (void *info, const void *data, size_t size)
}
CGFontRef
create_cg_font (CFArrayRef ct_font_desc_array, unsigned int index)
create_cg_font (CFArrayRef ct_font_desc_array, unsigned int named_instance_index)
{
auto ct_font_desc = (CFArrayGetCount (ct_font_desc_array) > index) ?
(CTFontDescriptorRef) CFArrayGetValueAtIndex (ct_font_desc_array, index) : nullptr;
if (named_instance_index == 0)
{
// Default instance. We don't know which one is it. Return the first one.
// We will set the correct variations on it later.
}
else
named_instance_index--;
auto ct_font_desc = (CFArrayGetCount (ct_font_desc_array) > named_instance_index) ?
(CTFontDescriptorRef) CFArrayGetValueAtIndex (ct_font_desc_array, named_instance_index) : nullptr;
if (unlikely (!ct_font_desc))
{
CFRelease (ct_font_desc_array);
@ -187,12 +194,21 @@ create_cg_font (hb_blob_t *blob, unsigned int index)
if (unlikely (!blob_length))
DEBUG_MSG (CORETEXT, blob, "Empty blob");
if (unlikely (index != 0))
unsigned ttc_index = index & 0xFFFF;
unsigned named_instance_index = index >> 16;
if (ttc_index != 0)
{
DEBUG_MSG (CORETEXT, blob, "TTC index %d not supported", ttc_index);
return nullptr; // CoreText does not support TTCs
}
if (unlikely (named_instance_index != 0))
{
auto ct_font_desc_array = CTFontManagerCreateFontDescriptorsFromData (CFDataCreate (kCFAllocatorDefault, (const UInt8 *) blob_data, blob_length));
if (unlikely (!ct_font_desc_array))
return nullptr;
return create_cg_font (ct_font_desc_array, index);
return create_cg_font (ct_font_desc_array, named_instance_index);
}
hb_blob_reference (blob);
@ -393,7 +409,16 @@ hb_coretext_face_create_from_file_or_fail (const char *file_name,
return nullptr;
}
auto cg_font = create_cg_font (ct_font_desc_array, index);
unsigned ttc_index = index & 0xFFFF;
unsigned named_instance_index = index >> 16;
if (ttc_index != 0)
{
DEBUG_MSG (CORETEXT, nullptr, "TTC index %d not supported", ttc_index);
return nullptr; // CoreText does not support TTCs
}
auto cg_font = create_cg_font (ct_font_desc_array, named_instance_index);
CFRelease (url);
hb_face_t *face = hb_coretext_face_create (cg_font);
@ -401,6 +426,8 @@ hb_coretext_face_create_from_file_or_fail (const char *file_name,
if (unlikely (hb_face_is_immutable (face)))
return nullptr;
hb_face_set_index (face, index);
return face;
}
@ -433,6 +460,8 @@ hb_coretext_face_create_from_blob_or_fail (hb_blob_t *blob,
if (unlikely (hb_face_is_immutable (face)))
return nullptr;
hb_face_set_index (face, index);
return face;
}

3
util/font-options.hh
View file

@ -101,7 +101,8 @@ font_options_t::post_parse (GError **error)
hb_font_set_scale (font, scale_x, scale_y);
#ifndef HB_NO_VAR
hb_font_set_var_named_instance (font, named_instance);
if (named_instance != HB_FONT_NO_VAR_NAMED_INSTANCE)
hb_font_set_var_named_instance (font, named_instance);
hb_font_set_variations (font, variations, num_variations);
#endif