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

[fvar] Move normalize logic where it is actually filled

This commit is contained in:
Ebrahim Byagowi 2020-06-30 11:08:42 +04:30
parent 0f8dda2cf2
commit 5de07b8acd
1 changed files with 33 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -96,6 +96,35 @@ struct AxisRecord
info->reserved = 0; info->reserved = 0;
} }
int normalize_axis_value (float v) const
{
float default_value, min_value, max_value;
fill_values (default_value, min_value, max_value);
v = hb_clamp (v, min_value, max_value);
if (v == default_value)
return 0;
else if (v < default_value)
v = (v - default_value) / (default_value - min_value);
else
v = (v - default_value) / (max_value - default_value);
return roundf (v * 16384.f);
}
float unnormalize_axis_value (int v) const
{
float default_value, min_value, max_value;
fill_values (default_value, min_value, max_value);
if (v == 0)
return default_value;
else if (v < 0)
return v * (default_value - min_value) / 16384.f + default_value;
else
return v * (max_value - default_value) / 16384.f + default_value;
}
hb_ot_name_id_t get_name_id () const { return axisNameID; } hb_ot_name_id_t get_name_id () const { return axisNameID; }
bool sanitize (hb_sanitize_context_t *c) const bool sanitize (hb_sanitize_context_t *c) const
@ -104,7 +133,7 @@ struct AxisRecord
return_trace (c->check_struct (this)); return_trace (c->check_struct (this));
} }
private: protected:
void fill_values (float &default_value, float &min_value, float &max_value) const void fill_values (float &default_value, float &min_value, float &max_value) const
{ {
default_value = defaultValue / 65536.f; default_value = defaultValue / 65536.f;
@ -195,34 +224,10 @@ struct fvar
} }
int normalize_axis_value (unsigned int axis_index, float v) const int normalize_axis_value (unsigned int axis_index, float v) const
{ { return get_axes ()[axis_index].normalize_axis_value (v); }
hb_ot_var_axis_info_t axis;
get_axes ()[axis_index].get_axis_info (axis_index, &axis);
v = hb_clamp (v, axis.min_value, axis.max_value); float unnormalize_axis_value (unsigned int axis_index, int v) const
{ return get_axes ()[axis_index].unnormalize_axis_value (v); }
if (v == axis.default_value)
return 0;
else if (v < axis.default_value)
v = (v - axis.default_value) / (axis.default_value - axis.min_value);
else
v = (v - axis.default_value) / (axis.max_value - axis.default_value);
return roundf (v * 16384.f);
}
float unnormalize_axis_value (unsigned int axis_index, float v) const
{
hb_ot_var_axis_info_t axis;
get_axes ()[axis_index].get_axis_info (axis_index, &axis);
if (v == 0)
return axis.default_value;
else if (v < 0)
v = v * (axis.default_value - axis.min_value) / 16384.f + axis.default_value;
else
v = v * (axis.max_value - axis.default_value) / 16384.f + axis.default_value;
return v;
}
unsigned int get_instance_count () const { return instanceCount; } unsigned int get_instance_count () const { return instanceCount; }
@ -284,7 +289,6 @@ struct fvar
; ;
} }
protected: protected:
hb_array_t<const AxisRecord> get_axes () const hb_array_t<const AxisRecord> get_axes () const
{ return hb_array (&(this+firstAxis), axisCount); } { return hb_array (&(this+firstAxis), axisCount); }