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

added vsindex test & fixed process_vsindex

This commit is contained in:
Michiharu Ariza 2018-10-10 18:35:12 -07:00
parent c06a5dff0b
commit af61c3b10f
3 changed files with 40 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/hb-cff2-interp-cs.hh
View File

@ -140,11 +140,14 @@ struct CFF2CSInterpEnv : CSInterpEnv<BlendArg, CFF2Subrs>
inline void process_vsindex (void) inline void process_vsindex (void)
{ {
if (do_blend) unsigned int index;
if (likely (argStack.check_pop_uint (index)))
{ {
unsigned int index; if (do_blend)
if (likely (!seen_vsindex && !seen_blend && argStack.check_pop_uint (index))) {
set_ivs (argStack.check_pop_uint (index)); if (likely (!seen_vsindex && !seen_blend))
set_ivs (index);
}
} }
seen_vsindex = true; seen_vsindex = true;
} }
@ -236,7 +239,6 @@ struct CFF2CSOpSet : CSOpSet<BlendArg, OPSET, CFF2CSInterpEnv, PARAM, PATH>
static inline void process_vsindex (CFF2CSInterpEnv &env, PARAM& param) static inline void process_vsindex (CFF2CSInterpEnv &env, PARAM& param)
{ {
env.process_vsindex (); env.process_vsindex ();
OPSET::flush_args_and_op (OpCode_vsindexcs, env, param, env.argStack.get_count ()-1);
} }
private: private:

BIN
test/api/fonts/AdobeVFPrototype_vsindex.otf Normal file
View File

Binary file not shown.

33
test/api/test-ot-extents-cff.c
View File

@ -106,6 +106,38 @@ test_extents_cff2 (void)
hb_font_destroy (font); hb_font_destroy (font);
} }
static void
test_extents_cff2_vsindex (void)
{
hb_face_t *face = hb_subset_test_open_font ("fonts/AdobeVFPrototype_vsindex.otf");
g_assert (face);
hb_font_t *font = hb_font_create (face);
hb_face_destroy (face);
g_assert (font);
hb_ot_font_set_funcs (font);
hb_glyph_extents_t extents;
float coords[2] = { 800.0f, 50.0f };
hb_font_set_var_coords_design (font, coords, 2);
bool result = hb_font_get_glyph_extents (font, 1, &extents);
g_assert (result);
g_assert_cmpint (extents.x_bearing, ==, 11);
g_assert_cmpint (extents.y_bearing, ==, 656);
g_assert_cmpint (extents.width, ==, 653);
g_assert_cmpint (extents.height, ==, -656);
result = hb_font_get_glyph_extents (font, 2, &extents);
g_assert (result);
g_assert_cmpint (extents.x_bearing, ==, 7);
g_assert_cmpint (extents.y_bearing, ==, 669);
g_assert_cmpint (extents.width, ==, 650);
g_assert_cmpint (extents.height, ==, -669);
hb_font_destroy (font);
}
int int
main (int argc, char **argv) main (int argc, char **argv)
{ {
@ -114,6 +146,7 @@ main (int argc, char **argv)
hb_test_add (test_extents_cff1); hb_test_add (test_extents_cff1);
hb_test_add (test_extents_cff1_legacyops); hb_test_add (test_extents_cff1_legacyops);
hb_test_add (test_extents_cff2); hb_test_add (test_extents_cff2);
hb_test_add (test_extents_cff2_vsindex);
return hb_test_run (); return hb_test_run ();
} }