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

[ot-layout] Remove ensures

This commit is contained in:
Behdad Esfahbod 2018-11-05 23:11:46 -05:00
parent 9198de7b9b
commit db35409f0d
1 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/hb-ot-layout.cc
View File

@ -55,17 +55,14 @@
const OT::GDEF& _get_gdef (hb_face_t *face) const OT::GDEF& _get_gdef (hb_face_t *face)
{ {
if (unlikely (!hb_ot_shaper_face_data_ensure (face))) return Null(OT::GDEF);
return *face->table.GDEF->table; return *face->table.GDEF->table;
} }
static hb_blob_t * _get_gsub_blob (hb_face_t *face) static hb_blob_t * _get_gsub_blob (hb_face_t *face)
{ {
if (unlikely (!hb_ot_shaper_face_data_ensure (face))) return hb_blob_get_empty ();
return face->table.GSUB->blob; return face->table.GSUB->blob;
} }
static inline const OT::GSUB& _get_gsub (hb_face_t *face) static inline const OT::GSUB& _get_gsub (hb_face_t *face)
{ {
if (unlikely (!hb_ot_shaper_face_data_ensure (face))) return Null(OT::GSUB);
return *face->table.GSUB->table; return *face->table.GSUB->table;
} }
const OT::GSUB& _get_gsub_relaxed (hb_face_t *face) const OT::GSUB& _get_gsub_relaxed (hb_face_t *face)
@ -74,12 +71,10 @@ const OT::GSUB& _get_gsub_relaxed (hb_face_t *face)
} }
static hb_blob_t * _get_gpos_blob (hb_face_t *face) static hb_blob_t * _get_gpos_blob (hb_face_t *face)
{ {
if (unlikely (!hb_ot_shaper_face_data_ensure (face))) return hb_blob_get_empty ();
return face->table.GPOS->blob; return face->table.GPOS->blob;
} }
static inline const OT::GPOS& _get_gpos (hb_face_t *face) static inline const OT::GPOS& _get_gpos (hb_face_t *face)
{ {
if (unlikely (!hb_ot_shaper_face_data_ensure (face))) return Null(OT::GPOS);
return *face->table.GPOS->table; return *face->table.GPOS->table;
} }
const OT::GPOS& _get_gpos_relaxed (hb_face_t *face) const OT::GPOS& _get_gpos_relaxed (hb_face_t *face)
@ -865,8 +860,6 @@ hb_ot_layout_lookup_collect_glyphs (hb_face_t *face,
hb_set_t *glyphs_after, /* OUT. May be NULL */ hb_set_t *glyphs_after, /* OUT. May be NULL */
hb_set_t *glyphs_output /* OUT. May be NULL */) hb_set_t *glyphs_output /* OUT. May be NULL */)
{ {
if (unlikely (!hb_ot_shaper_face_data_ensure (face))) return;
OT::hb_collect_glyphs_context_t c (face, OT::hb_collect_glyphs_context_t c (face,
glyphs_before, glyphs_before,
glyphs_input, glyphs_input,
@ -945,8 +938,10 @@ hb_ot_layout_lookup_would_substitute (hb_face_t *face,
unsigned int glyphs_length, unsigned int glyphs_length,
hb_bool_t zero_context) hb_bool_t zero_context)
{ {
if (unlikely (!hb_ot_shaper_face_data_ensure (face))) return false; return hb_ot_layout_lookup_would_substitute_fast (face,
return hb_ot_layout_lookup_would_substitute_fast (face, lookup_index, glyphs, glyphs_length, zero_context); lookup_index,
glyphs, glyphs_length,
zero_context);
} }
hb_bool_t hb_bool_t
@ -1413,7 +1408,6 @@ hb_ot_layout_substitute_lookup (OT::hb_ot_apply_context_t *c,
#if 0 #if 0
static const OT::BASE& _get_base (hb_face_t *face) static const OT::BASE& _get_base (hb_face_t *face)
{ {
if (unlikely (!hb_ot_shaper_face_data_ensure (face))) return Null(OT::BASE);
return *face->table.BASE; return *face->table.BASE;
} }