mirror of
https://github.com/storytold/harfbuzz.git
synced 2026-11-19 22:11:04 +01:00
[hmtx] Simplify get-leading code
Can't return false. The false was being used before to mean "table not present". Handle that instead.
This commit is contained in:
1 parent
b359c83cdd
commit
fdf4c759fa
3 files changed
+29
-31
No files matched your search
+13
-17
@@ -102,17 +102,15 @@ struct Glyph
|
||||
if (unlikely (!points.resize (points.length + PHANTOM_COUNT))) return false;
|
||||
hb_array_t<contour_point_t> phantoms = points.as_array ().sub_array (points.length - PHANTOM_COUNT, PHANTOM_COUNT);
|
||||
{
|
||||
// Duplicated code.
|
||||
int lsb = 0;
|
||||
int h_delta = face->table.hmtx->get_leading_bearing_without_var_unscaled (gid, &lsb) ?
|
||||
(int) header->xMin - lsb : 0;
|
||||
face->table.hmtx->get_leading_bearing_without_var_unscaled (gid, &lsb);
|
||||
int h_delta = (int) header->xMin - lsb;
|
||||
HB_UNUSED int tsb = 0;
|
||||
int v_orig = (int) header->yMax +
|
||||
#ifndef HB_NO_VERTICAL
|
||||
((void) face->table.vmtx->get_leading_bearing_without_var_unscaled (gid, &tsb), tsb)
|
||||
#else
|
||||
0
|
||||
face->table.vmtx->get_leading_bearing_without_var_unscaled (gid, &tsb);
|
||||
#endif
|
||||
;
|
||||
int v_orig = (int) header->yMax + tsb;
|
||||
unsigned h_adv = face->table.hmtx->get_advance_without_var_unscaled (gid);
|
||||
unsigned v_adv =
|
||||
#ifndef HB_NO_VERTICAL
|
||||
@@ -358,25 +356,23 @@ struct Glyph
|
||||
if (unlikely (!points.resize (points.length + PHANTOM_COUNT))) return false;
|
||||
hb_array_t<contour_point_t> phantoms = points.as_array ().sub_array (points.length - PHANTOM_COUNT, PHANTOM_COUNT);
|
||||
{
|
||||
// Duplicated code.
|
||||
int lsb = 0;
|
||||
int h_delta = glyf_accelerator.hmtx->get_leading_bearing_without_var_unscaled (gid, &lsb) ?
|
||||
(int) header->xMin - lsb : 0;
|
||||
glyf_accelerator.hmtx->get_leading_bearing_without_var_unscaled (gid, &lsb);
|
||||
int h_delta = (int) header->xMin - lsb;
|
||||
HB_UNUSED int tsb = 0;
|
||||
int v_orig = (int) header->yMax +
|
||||
#ifndef HB_NO_VERTICAL
|
||||
((void) glyf_accelerator.vmtx->get_leading_bearing_without_var_unscaled (gid, &tsb), tsb)
|
||||
#else
|
||||
0
|
||||
glyf_accelerator.vmtx->get_leading_bearing_without_var_unscaled (gid, &tsb);
|
||||
#endif
|
||||
;
|
||||
int v_orig = (int) header->yMax + tsb;
|
||||
unsigned h_adv = glyf_accelerator.hmtx->get_advance_without_var_unscaled (gid);
|
||||
unsigned v_adv =
|
||||
#ifndef HB_NO_VERTICAL
|
||||
glyf_accelerator.vmtx->get_advance_without_var_unscaled (gid)
|
||||
glyf_accelerator.vmtx->get_advance_without_var_unscaled (gid)
|
||||
#else
|
||||
- font->face->get_upem ()
|
||||
- font->face->get_upem ()
|
||||
#endif
|
||||
;
|
||||
;
|
||||
phantoms[PHANTOM_LEFT].x = h_delta;
|
||||
phantoms[PHANTOM_RIGHT].x = (int) h_adv + h_delta;
|
||||
phantoms[PHANTOM_TOP].y = v_orig;
|
||||
|
||||
+14
-10
@@ -234,7 +234,7 @@ struct hmtxvmtx
|
||||
|
||||
auto it =
|
||||
+ hb_iter (c->plan->new_to_old_gid_list)
|
||||
| hb_map ([c, &_mtx, mtx_map] (hb_codepoint_pair_t _)
|
||||
| hb_map ([&_mtx, mtx_map] (hb_codepoint_pair_t _)
|
||||
{
|
||||
hb_codepoint_t new_gid = _.first;
|
||||
hb_codepoint_t old_gid = _.second;
|
||||
@@ -243,8 +243,7 @@ struct hmtxvmtx
|
||||
if (!mtx_map->has (new_gid, &v))
|
||||
{
|
||||
int lsb = 0;
|
||||
if (!_mtx.get_leading_bearing_without_var_unscaled (old_gid, &lsb))
|
||||
(void) _glyf_get_leading_bearing_without_var_unscaled (c->plan->source, old_gid, !T::is_horizontal, &lsb);
|
||||
_mtx.get_leading_bearing_without_var_unscaled (old_gid, &lsb);
|
||||
return hb_pair (_mtx.get_advance_without_var_unscaled (old_gid), +lsb);
|
||||
}
|
||||
return *v;
|
||||
@@ -323,21 +322,23 @@ struct hmtxvmtx
|
||||
|
||||
bool has_data () const { return (bool) num_bearings; }
|
||||
|
||||
bool get_leading_bearing_without_var_unscaled (hb_codepoint_t glyph,
|
||||
void get_leading_bearing_without_var_unscaled (hb_codepoint_t glyph,
|
||||
int *lsb) const
|
||||
{
|
||||
if (glyph < num_long_metrics)
|
||||
{
|
||||
*lsb = table->longMetricZ[glyph].sb;
|
||||
return true;
|
||||
return;
|
||||
}
|
||||
|
||||
if (unlikely (glyph >= num_bearings))
|
||||
return false;
|
||||
{
|
||||
*lsb = 0;
|
||||
return;
|
||||
}
|
||||
|
||||
const FWORD *bearings = (const FWORD *) &table->longMetricZ[num_long_metrics];
|
||||
*lsb = bearings[glyph - num_long_metrics];
|
||||
return true;
|
||||
}
|
||||
|
||||
bool get_leading_bearing_with_var_unscaled (hb_font_t *font,
|
||||
@@ -345,13 +346,16 @@ struct hmtxvmtx
|
||||
int *lsb) const
|
||||
{
|
||||
if (!font->has_nonzero_coords)
|
||||
return get_leading_bearing_without_var_unscaled (glyph, lsb);
|
||||
{
|
||||
get_leading_bearing_without_var_unscaled (glyph, lsb);
|
||||
return has_data ();
|
||||
}
|
||||
|
||||
#ifndef HB_NO_VAR
|
||||
float delta;
|
||||
if (var_table->get_lsb_delta_unscaled (glyph, font->coords, font->num_coords, &delta) &&
|
||||
get_leading_bearing_without_var_unscaled (glyph, lsb))
|
||||
if (var_table->get_lsb_delta_unscaled (glyph, font->coords, font->num_coords, &delta))
|
||||
{
|
||||
get_leading_bearing_without_var_unscaled (glyph, lsb);
|
||||
*lsb += roundf (delta);
|
||||
return true;
|
||||
}
|
||||
|
||||
@@ -299,8 +299,7 @@ update_instance_metrics_map_from_cff2 (hb_subset_plan_t *plan)
|
||||
int lsb = extents.x_bearing;
|
||||
if (!has_bounds_info)
|
||||
{
|
||||
if (!_hmtx.get_leading_bearing_without_var_unscaled (old_gid, &lsb))
|
||||
continue;
|
||||
_hmtx.get_leading_bearing_without_var_unscaled (old_gid, &lsb);
|
||||
}
|
||||
plan->hmtx_map.set (new_gid, hb_pair ((unsigned) hori_aw, lsb));
|
||||
plan->bounds_width_vec[new_gid] = extents.width;
|
||||
@@ -320,8 +319,7 @@ update_instance_metrics_map_from_cff2 (hb_subset_plan_t *plan)
|
||||
{
|
||||
tsb = vorg_y - extents.y_bearing;
|
||||
} else {
|
||||
if (!_vmtx.get_leading_bearing_without_var_unscaled (old_gid, &tsb))
|
||||
continue;
|
||||
_vmtx.get_leading_bearing_without_var_unscaled (old_gid, &tsb);
|
||||
}
|
||||
|
||||
plan->vmtx_map.set (new_gid, hb_pair ((unsigned) vert_aw, tsb));
|
||||
|
||||
Reference in new issue
Block a user