Use constructor/destructor for hb_ot_shape_plan_t

This commit is contained in:
Behdad Esfahbod 2011-05-11 22:18:31 -04:00
parent a5e4e10946
commit e06d4eda7b
2 changed files with 6 additions and 4 deletions

View File

@ -52,7 +52,11 @@ struct hb_ot_shape_plan_t
hb_ot_map_t map;
hb_ot_complex_shaper_t shaper;
inline void finish (void) { map.finish (); }
hb_ot_shape_plan_t (void) : map () {}
~hb_ot_shape_plan_t (void) { map.finish (); }
private:
NO_COPY (hb_ot_shape_plan_t);
};

View File

@ -377,12 +377,10 @@ hb_ot_shape (hb_font_t *font,
const hb_feature_t *features,
unsigned int num_features)
{
hb_ot_shape_plan_t plan = hb_ot_shape_plan_t ();
hb_ot_shape_plan_t plan;
hb_ot_shape_plan_internal (&plan, font->face, &buffer->props, features, num_features);
hb_ot_shape_execute (&plan, font, buffer, features, num_features);
plan.finish ();
}