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

[shape-plan] Make null object all zeros 

To remove custom null object next..
This commit is contained in:
Behdad Esfahbod 2018-11-11 00:15:08 -05:00
parent 34185ff3bc
commit 109891d498
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -107,8 +107,8 @@ DEFINE_NULL_INSTANCE (hb_shape_plan_t) =
{ {
HB_OBJECT_HEADER_STATIC, HB_OBJECT_HEADER_STATIC,
true, /* default_shaper_list */
nullptr, /* face */ nullptr, /* face */
false, /* custom_shaper_list */
HB_SEGMENT_PROPERTIES_DEFAULT, /* props */ HB_SEGMENT_PROPERTIES_DEFAULT, /* props */
nullptr, /* shaper_func */ nullptr, /* shaper_func */
@ -196,7 +196,7 @@ hb_shape_plan_create2 (hb_face_t *face,
assert (props->direction != HB_DIRECTION_INVALID); assert (props->direction != HB_DIRECTION_INVALID);
hb_face_make_immutable (face); hb_face_make_immutable (face);
shape_plan->default_shaper_list = !shaper_list; shape_plan->custom_shaper_list = shaper_list;
shape_plan->face_unsafe = face; shape_plan->face_unsafe = face;
shape_plan->props = *props; shape_plan->props = *props;
shape_plan->num_user_features = num_user_features; shape_plan->num_user_features = num_user_features;
@ -382,7 +382,7 @@ static unsigned int
hb_shape_plan_hash (const hb_shape_plan_t *shape_plan) hb_shape_plan_hash (const hb_shape_plan_t *shape_plan)
{ {
return hb_segment_properties_hash (&shape_plan->props) + return hb_segment_properties_hash (&shape_plan->props) +
shape_plan->default_shaper_list ? 0 : (intptr_t) shape_plan->shaper_func; shape_plan->custom_shaper_list ? (intptr_t) shape_plan->shaper_func : 0;
} }
#endif #endif
@ -436,7 +436,7 @@ hb_shape_plan_matches (const hb_shape_plan_t *shape_plan,
return hb_segment_properties_equal (&shape_plan->props, &proposal->props) && return hb_segment_properties_equal (&shape_plan->props, &proposal->props) &&
hb_shape_plan_user_features_match (shape_plan, proposal) && hb_shape_plan_user_features_match (shape_plan, proposal) &&
hb_shape_plan_coords_match (shape_plan, proposal) && hb_shape_plan_coords_match (shape_plan, proposal) &&
((shape_plan->default_shaper_list && !proposal->shaper_list) || ((!shape_plan->custom_shaper_list && !proposal->shaper_list) ||
(shape_plan->shaper_func == proposal->shaper_func)); (shape_plan->shaper_func == proposal->shaper_func));
} }

2
src/hb-shape-plan.hh
View File

@ -35,8 +35,8 @@ struct hb_shape_plan_t
{ {
hb_object_header_t header; hb_object_header_t header;
hb_bool_t default_shaper_list;
hb_face_t *face_unsafe; /* We don't carry a reference to face. */ hb_face_t *face_unsafe; /* We don't carry a reference to face. */
bool custom_shaper_list;
hb_segment_properties_t props; hb_segment_properties_t props;
hb_shape_func_t *shaper_func; hb_shape_func_t *shaper_func;