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

Add assertions for a couple programmer errors

This commit is contained in:
Behdad Esfahbod 2013-02-15 07:46:57 -05:00
parent 038c98f686
commit 7abddbb47a
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/hb-shape-plan.cc
View File

@ -27,6 +27,7 @@
#include "hb-shape-plan-private.hh" #include "hb-shape-plan-private.hh"
#include "hb-shaper-private.hh" #include "hb-shaper-private.hh"
#include "hb-font-private.hh" #include "hb-font-private.hh"
#include "hb-buffer-private.hh"
#define HB_SHAPER_IMPLEMENT(shaper) \ #define HB_SHAPER_IMPLEMENT(shaper) \
HB_SHAPER_DATA_ENSURE_DECLARE(shaper, face) \ HB_SHAPER_DATA_ENSURE_DECLARE(shaper, face) \
@ -178,9 +179,14 @@ hb_shape_plan_execute (hb_shape_plan_t *shape_plan,
const hb_feature_t *features, const hb_feature_t *features,
unsigned int num_features) unsigned int num_features)
{ {
if (unlikely (shape_plan->face != font->face)) if (unlikely (hb_object_is_inert (shape_plan) ||
hb_object_is_inert (font) ||
hb_object_is_inert (buffer)))
return false; return false;
assert (shape_plan->face == font->face);
assert (hb_segment_properties_equal (&shape_plan->props, &buffer->props));
#define HB_SHAPER_EXECUTE(shaper) \ #define HB_SHAPER_EXECUTE(shaper) \
HB_STMT_START { \ HB_STMT_START { \
return HB_SHAPER_DATA (shaper, shape_plan) && \ return HB_SHAPER_DATA (shaper, shape_plan) && \