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

[util] Don't use hb_vector_t

This commit is contained in:
Behdad Esfahbod 2023-01-15 11:30:24 -07:00
parent d769e8ae7c
commit 40a8145acc
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
util/font-options.hh
View File

@ -175,19 +175,20 @@ font_options_t::post_parse (GError **error)
static G_GNUC_NORETURN void static G_GNUC_NORETURN void
_list_variations (hb_face_t *face) _list_variations (hb_face_t *face)
{ {
hb_vector_t<hb_ot_var_axis_info_t> axes; hb_ot_var_axis_info_t *axes;
unsigned count = hb_ot_var_get_axis_infos (face, 0, nullptr, nullptr); unsigned count = hb_ot_var_get_axis_infos (face, 0, nullptr, nullptr);
axes.resize (count); axes = (hb_ot_var_axis_info_t *) calloc (count, sizeof (hb_ot_var_axis_info_t));
hb_ot_var_get_axis_infos (face, 0, &count, axes.arrayZ); hb_ot_var_get_axis_infos (face, 0, &count, axes);
auto language = hb_language_get_default (); auto language = hb_language_get_default ();
bool has_hidden = false; bool has_hidden = false;
printf ("Varitation axes:\n"); printf ("Varitation axes:\n");
printf ("Tag: Minimum Default Maximum Name\n\n"); printf ("Tag: Minimum Default Maximum Name\n\n");
for (const auto &axis : axes) for (unsigned i = 0; i < count; i++)
{ {
const auto &axis = axes[i];
if (axis.flags & HB_OT_VAR_AXIS_FLAG_HIDDEN) if (axis.flags & HB_OT_VAR_AXIS_FLAG_HIDDEN)
has_hidden = true; has_hidden = true;
@ -209,6 +210,9 @@ _list_variations (hb_face_t *face)
if (has_hidden) if (has_hidden)
printf ("\n[*] Hidden axis\n"); printf ("\n[*] Hidden axis\n");
free (axes);
axes = nullptr;
count = hb_ot_var_get_named_instance_count (face); count = hb_ot_var_get_named_instance_count (face);
if (count) if (count)
{ {