From 8259e8735babe30eaf3c017e022368bf796b411e Mon Sep 17 00:00:00 2001 From: Behdad Esfahbod Date: Sun, 24 May 2009 00:53:28 -0400 Subject: [PATCH] [HB] Simplify version check in GSUB/GPOS --- pango/opentype/hb-ot-layout-gpos-private.h | 5 ++++- pango/opentype/hb-ot-layout-gsub-private.h | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/pango/opentype/hb-ot-layout-gpos-private.h b/pango/opentype/hb-ot-layout-gpos-private.h index 275a5e8..3854aeb 100644 --- a/pango/opentype/hb-ot-layout-gpos-private.h +++ b/pango/opentype/hb-ot-layout-gpos-private.h @@ -1313,7 +1313,10 @@ struct GPOS : GSUBGPOS { static const hb_tag_t Tag = HB_TAG ('G','P','O','S'); - STATIC_DEFINE_GET_FOR_DATA_CHECK_MAJOR_VERSION (GPOS, 1); + static inline const GPOS& get_for_data (const char *data) + { + return (const GPOS&) GSUBGPOS::get_for_data (data); + } inline const PosLookup& get_lookup (unsigned int i) const { diff --git a/pango/opentype/hb-ot-layout-gsub-private.h b/pango/opentype/hb-ot-layout-gsub-private.h index 757947c..c025ac5 100644 --- a/pango/opentype/hb-ot-layout-gsub-private.h +++ b/pango/opentype/hb-ot-layout-gsub-private.h @@ -730,7 +730,10 @@ struct GSUB : GSUBGPOS { static const hb_tag_t Tag = HB_TAG ('G','S','U','B'); - STATIC_DEFINE_GET_FOR_DATA_CHECK_MAJOR_VERSION (GSUB, 1); + static inline const GSUB& get_for_data (const char *data) + { + return (const GSUB&) GSUBGPOS::get_for_data (data); + } inline const SubstLookup& get_lookup (unsigned int i) const { -- 2.7.4