Use namespace for OpenType tables Avoids USHORT, SHORT, ULONG, LONG clashes with Windows API.
diff --git a/src/hb-ot-layout.cc b/src/hb-ot-layout.cc index 44420ff..a319959 100644 --- a/src/hb-ot-layout.cc +++ b/src/hb-ot-layout.cc
@@ -35,7 +35,6 @@ #include "hb-ot-layout-gpos-table.hh" #include "hb-ot-maxp-table.hh" - #include <stdlib.h> #include <string.h> @@ -49,14 +48,14 @@ if (unlikely (!layout)) return NULL; - layout->gdef_blob = Sanitizer<GDEF>::sanitize (face->reference_table (HB_OT_TAG_GDEF)); - layout->gdef = Sanitizer<GDEF>::lock_instance (layout->gdef_blob); + layout->gdef_blob = OT::Sanitizer<OT::GDEF>::sanitize (face->reference_table (HB_OT_TAG_GDEF)); + layout->gdef = OT::Sanitizer<OT::GDEF>::lock_instance (layout->gdef_blob); - layout->gsub_blob = Sanitizer<GSUB>::sanitize (face->reference_table (HB_OT_TAG_GSUB)); - layout->gsub = Sanitizer<GSUB>::lock_instance (layout->gsub_blob); + layout->gsub_blob = OT::Sanitizer<OT::GSUB>::sanitize (face->reference_table (HB_OT_TAG_GSUB)); + layout->gsub = OT::Sanitizer<OT::GSUB>::lock_instance (layout->gsub_blob); - layout->gpos_blob = Sanitizer<GPOS>::sanitize (face->reference_table (HB_OT_TAG_GPOS)); - layout->gpos = Sanitizer<GPOS>::lock_instance (layout->gpos_blob); + layout->gpos_blob = OT::Sanitizer<OT::GPOS>::sanitize (face->reference_table (HB_OT_TAG_GPOS)); + layout->gpos = OT::Sanitizer<OT::GPOS>::lock_instance (layout->gpos_blob); layout->gsub_lookup_count = layout->gsub->get_lookup_count (); layout->gpos_lookup_count = layout->gpos->get_lookup_count (); @@ -92,22 +91,22 @@ free (layout); } -static inline const GDEF& +static inline const OT::GDEF& _get_gdef (hb_face_t *face) { - if (unlikely (!hb_ot_shaper_face_data_ensure (face))) return Null(GDEF); + if (unlikely (!hb_ot_shaper_face_data_ensure (face))) return OT::Null(OT::GDEF); return *hb_ot_layout_from_face (face)->gdef; } -static inline const GSUB& +static inline const OT::GSUB& _get_gsub (hb_face_t *face) { - if (unlikely (!hb_ot_shaper_face_data_ensure (face))) return Null(GSUB); + if (unlikely (!hb_ot_shaper_face_data_ensure (face))) return OT::Null(OT::GSUB); return *hb_ot_layout_from_face (face)->gsub; } -static inline const GPOS& +static inline const OT::GPOS& _get_gpos (hb_face_t *face) { - if (unlikely (!hb_ot_shaper_face_data_ensure (face))) return Null(GPOS); + if (unlikely (!hb_ot_shaper_face_data_ensure (face))) return OT::Null(OT::GPOS); return *hb_ot_layout_from_face (face)->gpos; } @@ -149,14 +148,14 @@ * GSUB/GPOS */ -static const GSUBGPOS& +static const OT::GSUBGPOS& get_gsubgpos_table (hb_face_t *face, hb_tag_t table_tag) { switch (table_tag) { case HB_OT_TAG_GSUB: return _get_gsub (face); case HB_OT_TAG_GPOS: return _get_gpos (face); - default: return Null(GSUBGPOS); + default: return OT::Null(OT::GSUBGPOS); } } @@ -168,7 +167,7 @@ unsigned int *script_count /* IN/OUT */, hb_tag_t *script_tags /* OUT */) { - const GSUBGPOS &g = get_gsubgpos_table (face, table_tag); + const OT::GSUBGPOS &g = get_gsubgpos_table (face, table_tag); return g.get_script_tags (start_offset, script_count, script_tags); } @@ -179,8 +178,8 @@ hb_tag_t script_tag, unsigned int *script_index) { - ASSERT_STATIC (Index::NOT_FOUND_INDEX == HB_OT_LAYOUT_NO_SCRIPT_INDEX); - const GSUBGPOS &g = get_gsubgpos_table (face, table_tag); + ASSERT_STATIC (OT::Index::NOT_FOUND_INDEX == HB_OT_LAYOUT_NO_SCRIPT_INDEX); + const OT::GSUBGPOS &g = get_gsubgpos_table (face, table_tag); if (g.find_script_index (script_tag, script_index)) return true; @@ -205,8 +204,8 @@ unsigned int *script_index, hb_tag_t *chosen_script) { - ASSERT_STATIC (Index::NOT_FOUND_INDEX == HB_OT_LAYOUT_NO_SCRIPT_INDEX); - const GSUBGPOS &g = get_gsubgpos_table (face, table_tag); + ASSERT_STATIC (OT::Index::NOT_FOUND_INDEX == HB_OT_LAYOUT_NO_SCRIPT_INDEX); + const OT::GSUBGPOS &g = get_gsubgpos_table (face, table_tag); while (*script_tags) { @@ -254,7 +253,7 @@ unsigned int *feature_count /* IN/OUT */, hb_tag_t *feature_tags /* OUT */) { - const GSUBGPOS &g = get_gsubgpos_table (face, table_tag); + const OT::GSUBGPOS &g = get_gsubgpos_table (face, table_tag); return g.get_feature_tags (start_offset, feature_count, feature_tags); } @@ -268,7 +267,7 @@ unsigned int *language_count /* IN/OUT */, hb_tag_t *language_tags /* OUT */) { - const Script &s = get_gsubgpos_table (face, table_tag).get_script (script_index); + const OT::Script &s = get_gsubgpos_table (face, table_tag).get_script (script_index); return s.get_lang_sys_tags (start_offset, language_count, language_tags); } @@ -280,8 +279,8 @@ hb_tag_t language_tag, unsigned int *language_index) { - ASSERT_STATIC (Index::NOT_FOUND_INDEX == HB_OT_LAYOUT_DEFAULT_LANGUAGE_INDEX); - const Script &s = get_gsubgpos_table (face, table_tag).get_script (script_index); + ASSERT_STATIC (OT::Index::NOT_FOUND_INDEX == HB_OT_LAYOUT_DEFAULT_LANGUAGE_INDEX); + const OT::Script &s = get_gsubgpos_table (face, table_tag).get_script (script_index); if (s.find_lang_sys_index (language_tag, language_index)) return true; @@ -301,7 +300,7 @@ unsigned int language_index, unsigned int *feature_index) { - const LangSys &l = get_gsubgpos_table (face, table_tag).get_script (script_index).get_lang_sys (language_index); + const OT::LangSys &l = get_gsubgpos_table (face, table_tag).get_script (script_index).get_lang_sys (language_index); if (feature_index) *feature_index = l.get_required_feature_index (); @@ -317,8 +316,8 @@ unsigned int *feature_count /* IN/OUT */, unsigned int *feature_indexes /* OUT */) { - const GSUBGPOS &g = get_gsubgpos_table (face, table_tag); - const LangSys &l = g.get_script (script_index).get_lang_sys (language_index); + const OT::GSUBGPOS &g = get_gsubgpos_table (face, table_tag); + const OT::LangSys &l = g.get_script (script_index).get_lang_sys (language_index); return l.get_feature_indexes (start_offset, feature_count, feature_indexes); } @@ -332,8 +331,8 @@ unsigned int *feature_count /* IN/OUT */, hb_tag_t *feature_tags /* OUT */) { - const GSUBGPOS &g = get_gsubgpos_table (face, table_tag); - const LangSys &l = g.get_script (script_index).get_lang_sys (language_index); + const OT::GSUBGPOS &g = get_gsubgpos_table (face, table_tag); + const OT::LangSys &l = g.get_script (script_index).get_lang_sys (language_index); ASSERT_STATIC (sizeof (unsigned int) == sizeof (hb_tag_t)); unsigned int ret = l.get_feature_indexes (start_offset, feature_count, (unsigned int *) feature_tags); @@ -356,9 +355,9 @@ hb_tag_t feature_tag, unsigned int *feature_index) { - ASSERT_STATIC (Index::NOT_FOUND_INDEX == HB_OT_LAYOUT_NO_FEATURE_INDEX); - const GSUBGPOS &g = get_gsubgpos_table (face, table_tag); - const LangSys &l = g.get_script (script_index).get_lang_sys (language_index); + ASSERT_STATIC (OT::Index::NOT_FOUND_INDEX == HB_OT_LAYOUT_NO_FEATURE_INDEX); + const OT::GSUBGPOS &g = get_gsubgpos_table (face, table_tag); + const OT::LangSys &l = g.get_script (script_index).get_lang_sys (language_index); unsigned int num_features = l.get_feature_count (); for (unsigned int i = 0; i < num_features; i++) { @@ -382,21 +381,21 @@ unsigned int *lookup_count /* IN/OUT */, unsigned int *lookup_indexes /* OUT */) { - const GSUBGPOS &g = get_gsubgpos_table (face, table_tag); - const Feature &f = g.get_feature (feature_index); + const OT::GSUBGPOS &g = get_gsubgpos_table (face, table_tag); + const OT::Feature &f = g.get_feature (feature_index); return f.get_lookup_indexes (start_offset, lookup_count, lookup_indexes); } /* - * GSUB + * OT::GSUB */ hb_bool_t hb_ot_layout_has_substitution (hb_face_t *face) { - return &_get_gsub (face) != &Null(GSUB); + return &_get_gsub (face) != &OT::Null(OT::GSUB); } hb_bool_t @@ -418,14 +417,14 @@ hb_bool_t zero_context) { if (unlikely (lookup_index >= hb_ot_layout_from_face (face)->gsub_lookup_count)) return false; - hb_would_apply_context_t c (face, glyphs, glyphs_length, zero_context, &hb_ot_layout_from_face (face)->gsub_digests[lookup_index]); + OT::hb_would_apply_context_t c (face, glyphs, glyphs_length, zero_context, &hb_ot_layout_from_face (face)->gsub_digests[lookup_index]); return hb_ot_layout_from_face (face)->gsub->would_substitute_lookup (&c, lookup_index); } void hb_ot_layout_substitute_start (hb_font_t *font, hb_buffer_t *buffer) { - GSUB::substitute_start (font, buffer); + OT::GSUB::substitute_start (font, buffer); } hb_bool_t @@ -435,14 +434,14 @@ hb_mask_t mask) { if (unlikely (lookup_index >= hb_ot_layout_from_face (font->face)->gsub_lookup_count)) return false; - hb_apply_context_t c (font, buffer, mask, &hb_ot_layout_from_face (font->face)->gsub_digests[lookup_index]); + OT::hb_apply_context_t c (font, buffer, mask, &hb_ot_layout_from_face (font->face)->gsub_digests[lookup_index]); return hb_ot_layout_from_face (font->face)->gsub->substitute_lookup (&c, lookup_index); } void hb_ot_layout_substitute_finish (hb_font_t *font, hb_buffer_t *buffer) { - GSUB::substitute_finish (font, buffer); + OT::GSUB::substitute_finish (font, buffer); } void @@ -450,24 +449,24 @@ unsigned int lookup_index, hb_set_t *glyphs) { - hb_closure_context_t c (face, glyphs); + OT::hb_closure_context_t c (face, glyphs); _get_gsub (face).closure_lookup (&c, lookup_index); } /* - * GPOS + * OT::GPOS */ hb_bool_t hb_ot_layout_has_positioning (hb_face_t *face) { - return &_get_gpos (face) != &Null(GPOS); + return &_get_gpos (face) != &OT::Null(OT::GPOS); } void hb_ot_layout_position_start (hb_font_t *font, hb_buffer_t *buffer) { - GPOS::position_start (font, buffer); + OT::GPOS::position_start (font, buffer); } hb_bool_t @@ -477,12 +476,12 @@ hb_mask_t mask) { if (unlikely (lookup_index >= hb_ot_layout_from_face (font->face)->gpos_lookup_count)) return false; - hb_apply_context_t c (font, buffer, mask, &hb_ot_layout_from_face (font->face)->gpos_digests[lookup_index]); + OT::hb_apply_context_t c (font, buffer, mask, &hb_ot_layout_from_face (font->face)->gpos_digests[lookup_index]); return hb_ot_layout_from_face (font->face)->gpos->position_lookup (&c, lookup_index); } void hb_ot_layout_position_finish (hb_font_t *font, hb_buffer_t *buffer, hb_bool_t zero_width_attached_marks) { - GPOS::position_finish (font, buffer, zero_width_attached_marks); + OT::GPOS::position_finish (font, buffer, zero_width_attached_marks); }