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

[var] Fix hb_ot_var_get_axis_infos's offset semantic 

The API was adding offset to input's infos buffer index also which is
unusual between our APIs and wrong.
This commit is contained in:
Ebrahim Byagowi 2020-03-03 13:11:11 +03:30
parent b7617f6b3c
commit 6924e29f62
2 changed files with 29 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/hb-ot-var-fvar-table.hh
View File

@ -150,17 +150,8 @@ struct fvar
{ {
if (axes_count) if (axes_count)
{ {
/* TODO Rewrite as hb_array_t<>::sub-array() */ hb_array_t<const AxisRecord> arr = hb_array (&(this+firstAxis), axisCount).sub_array (start_offset, axes_count);
unsigned int count = axisCount; for (unsigned i = 0; i < arr.length; ++i)
start_offset = hb_min (start_offset, count);
count -= start_offset;
axes_array += start_offset;
count = hb_min (count, *axes_count);
*axes_count = count;
for (unsigned int i = 0; i < count; i++)
get_axis_deprecated (start_offset + i, axes_array + i); get_axis_deprecated (start_offset + i, axes_array + i);
} }
return axisCount; return axisCount;
@ -173,17 +164,8 @@ struct fvar
{ {
if (axes_count) if (axes_count)
{ {
/* TODO Rewrite as hb_array_t<>::sub-array() */ hb_array_t<const AxisRecord> arr = hb_array (&(this+firstAxis), axisCount).sub_array (start_offset, axes_count);
unsigned int count = axisCount; for (unsigned i = 0; i < arr.length; ++i)
start_offset = hb_min (start_offset, count);
count -= start_offset;
axes_array += start_offset;
count = hb_min (count, *axes_count);
*axes_count = count;
for (unsigned int i = 0; i < count; i++)
get_axis_info (start_offset + i, axes_array + i); get_axis_info (start_offset + i, axes_array + i);
} }
return axisCount; return axisCount;

25
test/api/test-var-coords.c
View File

@ -67,10 +67,35 @@ test_get_var_coords (void)
hb_face_destroy (face); hb_face_destroy (face);
} }
static void
test_get_var_get_axis_infos (void)
{
hb_face_t *face = hb_test_open_font_file ("fonts/Estedad-VF.ttf");
g_assert_cmpint (hb_ot_var_get_axis_count (face), ==, 2);
hb_ot_var_axis_info_t info;
unsigned c = 1;
g_assert_cmpint (hb_ot_var_get_axis_infos (face, 0, &c, &info), ==, 2);
g_assert (info.tag == HB_TAG ('w','g','h','t'));
g_assert_cmpint (c, ==, 1);
hb_ot_var_get_axis_infos (face, 1, &c, &info);
g_assert (info.tag == HB_TAG ('w','d','t','h'));
g_assert_cmpint (c, ==, 1);
hb_ot_var_get_axis_infos (face, 2, &c, &info);
g_assert_cmpint (c, ==, 0);
hb_face_destroy (face);
}
int int
main (int argc, char **argv) main (int argc, char **argv)
{ {
hb_test_init (&argc, &argv); hb_test_init (&argc, &argv);
hb_test_add (test_get_var_coords); hb_test_add (test_get_var_coords);
hb_test_add (test_get_var_get_axis_infos);
return hb_test_run (); return hb_test_run ();
} }