From fc23518fc6fb391a0e7dc872c6a2e89a09cad018 Mon Sep 17 00:00:00 2001 From: Behdad Esfahbod Date: Tue, 20 Apr 2010 15:25:27 -0400 Subject: [PATCH] [HB] Remove ASSERT_SIZE_DATA --- pango/opentype/hb-open-type-private.hh | 4 ---- pango/opentype/hb-ot-layout-common-private.hh | 9 ++++++--- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/pango/opentype/hb-open-type-private.hh b/pango/opentype/hb-open-type-private.hh index 98d46bd..e146a2d 100644 --- a/pango/opentype/hb-open-type-private.hh +++ b/pango/opentype/hb-open-type-private.hh @@ -84,10 +84,6 @@ struct Null \ #define Null(Type) (Null::get()) -#define ASSERT_SIZE_DATA(Type, size, data) \ - ASSERT_SIZE (Type, size); \ - DEFINE_NULL_DATA (Type, size, data) - /* get_for_data() is a static class method returning a reference to an * instance of Type located at the input data location. It's just a * fancy, NULL-safe, cast! */ diff --git a/pango/opentype/hb-ot-layout-common-private.hh b/pango/opentype/hb-ot-layout-common-private.hh index aff1468..0c0a768 100644 --- a/pango/opentype/hb-ot-layout-common-private.hh +++ b/pango/opentype/hb-ot-layout-common-private.hh @@ -171,7 +171,8 @@ struct LangSys * = 0xFFFF */ IndexArray featureIndex; /* Array of indices into the FeatureList */ }; -ASSERT_SIZE_DATA (LangSys, 6, "\0\0\xFF\xFF"); +ASSERT_SIZE (LangSys, 6); +DEFINE_NULL_DATA (LangSys, 6, "\0\0\xFF\xFF"); struct Script @@ -372,7 +373,8 @@ struct CoverageRangeRecord USHORT startCoverageIndex; /* Coverage Index of first GlyphID in * range */ }; -ASSERT_SIZE_DATA (CoverageRangeRecord, 6, "\000\001"); +ASSERT_SIZE (CoverageRangeRecord, 6); +DEFINE_NULL_DATA (CoverageRangeRecord, 6, "\000\001"); struct CoverageFormat2 { @@ -491,7 +493,8 @@ struct ClassRangeRecord GlyphID end; /* Last GlyphID in the range */ USHORT classValue; /* Applied to all glyphs in the range */ }; -ASSERT_SIZE_DATA (ClassRangeRecord, 6, "\000\001"); +ASSERT_SIZE (ClassRangeRecord, 6); +DEFINE_NULL_DATA (ClassRangeRecord, 6, "\000\001"); struct ClassDefFormat2 { -- 2.7.4