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

fix build

This commit is contained in:
Michiharu Ariza 2019-06-05 12:59:09 -07:00
parent 4ddab6facc
commit 8f8e8a8479
5 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/hb-ot-font.cc
View File

@ -186,7 +186,7 @@ hb_ot_get_glyph_extents (hb_font_t *font,
#if !defined(HB_NO_OT_FONT_BITMAP) && !defined(HB_NO_COLOR) #if !defined(HB_NO_OT_FONT_BITMAP) && !defined(HB_NO_COLOR)
if (!ret) ret = ot_face->sbix->get_extents (font, glyph, extents); if (!ret) ret = ot_face->sbix->get_extents (font, glyph, extents);
#endif #endif
if (!ret) ret = ot_face->glyf->get_extents (glyph, extents); if (!ret) ret = ot_face->glyf->get_extents (font, glyph, extents);
#ifndef HB_NO_OT_FONT_CFF #ifndef HB_NO_OT_FONT_CFF
if (!ret) ret = ot_face->cff1->get_extents (glyph, extents); if (!ret) ret = ot_face->cff1->get_extents (glyph, extents);
if (!ret) ret = ot_face->cff2->get_extents (font, glyph, extents); if (!ret) ret = ot_face->cff2->get_extents (font, glyph, extents);

8
src/hb-ot-glyf-table.hh
View File

@ -691,10 +691,10 @@ struct glyf
void add (const contour_point_t &p) void add (const contour_point_t &p)
{ {
min.x = MIN (min.x, p.x); min.x = hb_min (min.x, p.x);
min.y = MIN (min.y, p.y); min.y = hb_min (min.y, p.y);
max.x = MAX (max.x, p.x); max.x = hb_max (max.x, p.x);
max.y = MAX (max.y, p.y); max.y = hb_max (max.y, p.y);
} }
bool empty () const { return (min.x >= max.x) || (min.y >= max.y); } bool empty () const { return (min.x >= max.x) || (min.y >= max.y); }

2
src/hb-ot-hmtx-table.hh
View File

@ -139,7 +139,7 @@ struct hmtxvmtx
if (c->plan->old_gid_for_new_gid (_, &old_gid)) if (c->plan->old_gid_for_new_gid (_, &old_gid))
return hb_pair (_mtx.get_advance (old_gid), _mtx.get_side_bearing (old_gid)); return hb_pair (_mtx.get_advance (old_gid), _mtx.get_side_bearing (old_gid));
else else
return hb_pair (0u, 0u); return hb_pair (0u, 0);
}) })
; ;

6
src/hb-ot-var-gvar-table.hh
View File

@ -164,7 +164,7 @@ struct TupleVarHeader
else else
{ if (peak != end) scalar *= (float)(end - v) / (end - peak); } { if (peak != end) scalar *= (float)(end - v) / (end - peak); }
} }
else if (!v || v < MIN (0, peak) || v > MAX (0, peak)) return 0.f; else if (!v || v < hb_min (0, peak) || v > hb_max (0, peak)) return 0.f;
else else
scalar *= (float)v / peak; scalar *= (float)v / peak;
} }
@ -567,9 +567,9 @@ struct gvar
if (prev_val == next_val) if (prev_val == next_val)
return (prev_delta == next_delta)? prev_delta: 0.f; return (prev_delta == next_delta)? prev_delta: 0.f;
else if (target_val <= MIN (prev_val, next_val)) else if (target_val <= hb_min (prev_val, next_val))
return (prev_val < next_val) ? prev_delta: next_delta; return (prev_val < next_val) ? prev_delta: next_delta;
else if (target_val >= MAX (prev_val, next_val)) else if (target_val >= hb_max (prev_val, next_val))
return (prev_val > next_val)? prev_delta: next_delta; return (prev_val > next_val)? prev_delta: next_delta;
/* linear interpolation */ /* linear interpolation */

2
src/hb-ot-var-hvar-table.hh
View File

@ -159,7 +159,7 @@ struct index_map_subset_plan_t
unsigned int last_val = (unsigned int)-1; unsigned int last_val = (unsigned int)-1;
hb_codepoint_t last_gid = (hb_codepoint_t)-1; hb_codepoint_t last_gid = (hb_codepoint_t)-1;
hb_codepoint_t gid = (hb_codepoint_t)MIN(index_map.get_map_count (), plan->num_output_glyphs ()); hb_codepoint_t gid = (hb_codepoint_t) hb_min (index_map.get_map_count (), plan->num_output_glyphs ());
outer_bit_count = (index_map.get_width () * 8) - index_map.get_inner_bit_count (); outer_bit_count = (index_map.get_width () * 8) - index_map.get_inner_bit_count ();
max_inners.resize (inner_maps.length); max_inners.resize (inner_maps.length);