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

[shape-plan] Minor

This commit is contained in:
Behdad Esfahbod 2018-11-12 16:15:26 -05:00
parent 1db672a5e9
commit 65456bff37
2 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -161,7 +161,6 @@ hb_shape_plan_create2 (hb_face_t *face,
face = hb_face_get_empty (); face = hb_face_get_empty ();
hb_face_make_immutable (face); hb_face_make_immutable (face);
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;
@ -172,7 +171,7 @@ hb_shape_plan_create2 (hb_face_t *face,
shape_plan->coords = coords; shape_plan->coords = coords;
if (num_coords) if (num_coords)
memcpy (coords, orig_coords, num_coords * sizeof (int)); memcpy (coords, orig_coords, num_coords * sizeof (int));
shape_plan->custom_shaper_list = shaper_list;
hb_shape_plan_choose_shaper (shape_plan, hb_shape_plan_choose_shaper (shape_plan,
user_features, num_user_features, user_features, num_user_features,
coords, num_coords, coords, num_coords,
@ -369,11 +368,11 @@ hb_shape_plan_hash (const hb_shape_plan_t *shape_plan)
struct hb_shape_plan_proposal_t struct hb_shape_plan_proposal_t
{ {
const hb_segment_properties_t props; const hb_segment_properties_t props;
const char * const *shaper_list;
const hb_feature_t *user_features; const hb_feature_t *user_features;
unsigned int num_user_features; unsigned int num_user_features;
const int *coords; const int *coords;
unsigned int num_coords; unsigned int num_coords;
bool custom_shaper_list;
hb_shape_func_t *shaper_func; hb_shape_func_t *shaper_func;
}; };
@ -411,7 +410,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->custom_shaper_list && !proposal->shaper_list) || ((!shape_plan->custom_shaper_list && !proposal->custom_shaper_list) ||
(shape_plan->shaper_func == proposal->shaper_func)); (shape_plan->shaper_func == proposal->shaper_func));
} }
@ -477,17 +476,19 @@ hb_shape_plan_create_cached2 (hb_face_t *face,
num_user_features, num_user_features,
shaper_list); shaper_list);
hb_shape_plan_proposal_t proposal = { hb_shape_plan_proposal_t proposal =
{
*props, *props,
shaper_list,
user_features, user_features,
num_user_features, num_user_features,
coords, coords,
num_coords, num_coords,
shaper_list,
nullptr nullptr
}; };
if (shaper_list) { if (shaper_list)
{
/* Choose shaper. Adapted from hb_shape_plan_choose_shaper(). /* Choose shaper. Adapted from hb_shape_plan_choose_shaper().
* Must choose shaper exactly the same way as that function. */ * Must choose shaper exactly the same way as that function. */
for (const char * const *shaper_item = shaper_list; *shaper_item; shaper_item++) for (const char * const *shaper_item = shaper_list; *shaper_item; shaper_item++)

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

@ -37,11 +37,8 @@ struct hb_shape_plan_t
hb_object_header_t header; hb_object_header_t header;
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_shape_func_t *shaper_func; hb_segment_properties_t props;
const char *shaper_name;
hb_feature_t *user_features; hb_feature_t *user_features;
unsigned int num_user_features; unsigned int num_user_features;
@ -49,6 +46,10 @@ struct hb_shape_plan_t
int *coords; int *coords;
unsigned int num_coords; unsigned int num_coords;
bool custom_shaper_list;
hb_shape_func_t *shaper_func;
const char *shaper_name;
hb_ot_shape_plan_t ot; hb_ot_shape_plan_t ot;
}; };