Remove F_COMBINE

Now I wonder if any bots will be unhappy we calling | in static const initializations...
Or would that cost runtime init?  Our tests don't detect any..
pull/1197/head
Behdad Esfahbod 7 years ago
parent f048ead84a
commit 70136a78cb
  1. 2
      src/hb-ot-map.hh
  2. 2
      src/hb-ot-shape-complex-arabic.cc

@ -177,8 +177,6 @@ enum hb_ot_map_feature_flags_t
F_RANDOM = 0x0020u /* Randomly select a glyph from an AlternateSubstFormat1 subtable. */
};
HB_MARK_AS_FLAG_T (hb_ot_map_feature_flags_t);
/* Macro version for where const is desired. */
#define F_COMBINE(l,r) (hb_ot_map_feature_flags_t ((unsigned int) (l) | (unsigned int) (r)))
struct hb_ot_map_feature_t
{

@ -217,7 +217,7 @@ collect_features_arabic (hb_ot_shape_planner_t *plan)
map->add_gsub_pause (nullptr);
}
map->add_feature (HB_TAG('r','l','i','g'), F_GLOBAL|F_HAS_FALLBACK);
map->add_feature (HB_TAG('r','l','i','g'), F_GLOBAL | F_HAS_FALLBACK);
if (plan->props.script == HB_SCRIPT_ARABIC)
map->add_gsub_pause (arabic_fallback_shape);

Loading…
Cancel
Save