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

[fvar] Move shared axis filling values into a new method

This commit is contained in:
Ebrahim Byagowi 2020-06-30 10:53:12 +04:30
parent 98c42b3bc7
commit 0f8dda2cf2
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -82,10 +82,7 @@ struct AxisRecord
{ {
info->tag = axisTag; info->tag = axisTag;
info->name_id = axisNameID; info->name_id = axisNameID;
info->default_value = defaultValue / 65536.f; fill_values (info->default_value, info->min_value, info->max_value);
/* Ensure order, to simplify client math. */
info->min_value = hb_min (info->default_value, minValue / 65536.f);
info->max_value = hb_max (info->default_value, maxValue / 65536.f);
} }
#endif #endif
@ -95,10 +92,7 @@ struct AxisRecord
info->tag = axisTag; info->tag = axisTag;
info->name_id = axisNameID; info->name_id = axisNameID;
info->flags = (hb_ot_var_axis_flags_t) (unsigned int) flags; info->flags = (hb_ot_var_axis_flags_t) (unsigned int) flags;
info->default_value = defaultValue / 65536.f; fill_values (info->default_value, info->min_value, info->max_value);
/* Ensure order, to simplify client math. */
info->min_value = hb_min (info->default_value, minValue / 65536.f);
info->max_value = hb_max (info->default_value, maxValue / 65536.f);
info->reserved = 0; info->reserved = 0;
} }
@ -110,6 +104,15 @@ struct AxisRecord
return_trace (c->check_struct (this)); return_trace (c->check_struct (this));
} }
private:
void fill_values (float &default_value, float &min_value, float &max_value) const
{
default_value = defaultValue / 65536.f;
/* Ensure order, to simplify client math. */
min_value = hb_min (default_value, minValue / 65536.f);
max_value = hb_max (default_value, maxValue / 65536.f);
}
protected: protected:
Tag axisTag; /* Tag identifying the design variation for the axis. */ Tag axisTag; /* Tag identifying the design variation for the axis. */
HBFixed minValue; /* The minimum coordinate value for the axis. */ HBFixed minValue; /* The minimum coordinate value for the axis. */