| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright © 2009,2010 Red Hat, Inc. | 2 * Copyright © 2009,2010 Red Hat, Inc. |
| 3 * Copyright © 2010,2011,2012,2013 Google, Inc. | 3 * Copyright © 2010,2011,2012,2013 Google, Inc. |
| 4 * | 4 * |
| 5 * This is part of HarfBuzz, a text shaping library. | 5 * This is part of HarfBuzz, a text shaping library. |
| 6 * | 6 * |
| 7 * Permission is hereby granted, without written agreement and without | 7 * Permission is hereby granted, without written agreement and without |
| 8 * license or royalty fees, to use, copy, modify, and distribute this | 8 * license or royalty fees, to use, copy, modify, and distribute this |
| 9 * software and its documentation for any purpose, provided that the | 9 * software and its documentation for any purpose, provided that the |
| 10 * above copyright notice and the following two paragraphs appear in | 10 * above copyright notice and the following two paragraphs appear in |
| (...skipping 135 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 146 bool auto_zwj); | 146 bool auto_zwj); |
| 147 | 147 |
| 148 hb_mask_t global_mask; | 148 hb_mask_t global_mask; |
| 149 | 149 |
| 150 hb_prealloced_array_t<feature_map_t, 8> features; | 150 hb_prealloced_array_t<feature_map_t, 8> features; |
| 151 hb_prealloced_array_t<lookup_map_t, 32> lookups[2]; /* GSUB/GPOS */ | 151 hb_prealloced_array_t<lookup_map_t, 32> lookups[2]; /* GSUB/GPOS */ |
| 152 hb_prealloced_array_t<stage_map_t, 4> stages[2]; /* GSUB/GPOS */ | 152 hb_prealloced_array_t<stage_map_t, 4> stages[2]; /* GSUB/GPOS */ |
| 153 }; | 153 }; |
| 154 | 154 |
| 155 enum hb_ot_map_feature_flags_t { | 155 enum hb_ot_map_feature_flags_t { |
| 156 F_NONE» » = 0x0000, | 156 F_NONE» » = 0x0000u, |
| 157 F_GLOBAL» » = 0x0001, | 157 F_GLOBAL» » = 0x0001u, |
| 158 F_HAS_FALLBACK» = 0x0002, | 158 F_HAS_FALLBACK» = 0x0002u, |
| 159 F_MANUAL_ZWJ» » = 0x0004 | 159 F_MANUAL_ZWJ» » = 0x0004u |
| 160 }; | 160 }; |
| 161 /* Macro version for where const is desired. */ | 161 /* Macro version for where const is desired. */ |
| 162 #define F_COMBINE(l,r) (hb_ot_map_feature_flags_t ((unsigned int) (l) | (unsigne
d int) (r))) | 162 #define F_COMBINE(l,r) (hb_ot_map_feature_flags_t ((unsigned int) (l) | (unsigne
d int) (r))) |
| 163 inline hb_ot_map_feature_flags_t | 163 static inline hb_ot_map_feature_flags_t |
| 164 operator | (hb_ot_map_feature_flags_t l, hb_ot_map_feature_flags_t r) | 164 operator | (hb_ot_map_feature_flags_t l, hb_ot_map_feature_flags_t r) |
| 165 { return hb_ot_map_feature_flags_t ((unsigned int) l | (unsigned int) r); } | 165 { return hb_ot_map_feature_flags_t ((unsigned int) l | (unsigned int) r); } |
| 166 inline hb_ot_map_feature_flags_t | 166 static inline hb_ot_map_feature_flags_t |
| 167 operator & (hb_ot_map_feature_flags_t l, hb_ot_map_feature_flags_t r) | 167 operator & (hb_ot_map_feature_flags_t l, hb_ot_map_feature_flags_t r) |
| 168 { return hb_ot_map_feature_flags_t ((unsigned int) l & (unsigned int) r); } | 168 { return hb_ot_map_feature_flags_t ((unsigned int) l & (unsigned int) r); } |
| 169 inline hb_ot_map_feature_flags_t | 169 static inline hb_ot_map_feature_flags_t |
| 170 operator ~ (hb_ot_map_feature_flags_t r) | 170 operator ~ (hb_ot_map_feature_flags_t r) |
| 171 { return hb_ot_map_feature_flags_t (~(unsigned int) r); } | 171 { return hb_ot_map_feature_flags_t (~(unsigned int) r); } |
| 172 inline hb_ot_map_feature_flags_t& | 172 static inline hb_ot_map_feature_flags_t& |
| 173 operator |= (hb_ot_map_feature_flags_t &l, hb_ot_map_feature_flags_t r) | 173 operator |= (hb_ot_map_feature_flags_t &l, hb_ot_map_feature_flags_t r) |
| 174 { l = l | r; return l; } | 174 { l = l | r; return l; } |
| 175 inline hb_ot_map_feature_flags_t& | 175 static inline hb_ot_map_feature_flags_t& |
| 176 operator &= (hb_ot_map_feature_flags_t& l, hb_ot_map_feature_flags_t r) | 176 operator &= (hb_ot_map_feature_flags_t& l, hb_ot_map_feature_flags_t r) |
| 177 { l = l & r; return l; } | 177 { l = l & r; return l; } |
| 178 | 178 |
| 179 | 179 |
| 180 struct hb_ot_map_builder_t | 180 struct hb_ot_map_builder_t |
| 181 { | 181 { |
| 182 public: | 182 public: |
| 183 | 183 |
| 184 HB_INTERNAL hb_ot_map_builder_t (hb_face_t *face_, | 184 HB_INTERNAL hb_ot_map_builder_t (hb_face_t *face_, |
| 185 const hb_segment_properties_t *props_); | 185 const hb_segment_properties_t *props_); |
| (...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 238 private: | 238 private: |
| 239 | 239 |
| 240 unsigned int current_stage[2]; /* GSUB/GPOS */ | 240 unsigned int current_stage[2]; /* GSUB/GPOS */ |
| 241 hb_prealloced_array_t<feature_info_t, 32> feature_infos; | 241 hb_prealloced_array_t<feature_info_t, 32> feature_infos; |
| 242 hb_prealloced_array_t<stage_info_t, 8> stages[2]; /* GSUB/GPOS */ | 242 hb_prealloced_array_t<stage_info_t, 8> stages[2]; /* GSUB/GPOS */ |
| 243 }; | 243 }; |
| 244 | 244 |
| 245 | 245 |
| 246 | 246 |
| 247 #endif /* HB_OT_MAP_PRIVATE_HH */ | 247 #endif /* HB_OT_MAP_PRIVATE_HH */ |
| OLD | NEW |