[pango/harfbuzz-ng] [HB] Remove more macros
- From: Behdad Esfahbod <behdad src gnome org>
- To: svn-commits-list gnome org
- Subject: [pango/harfbuzz-ng] [HB] Remove more macros
- Date: Tue, 26 May 2009 22:21:58 -0400 (EDT)
commit 298dadbd395a594176ed4cda4b9cf7004b724b66
Author: Behdad Esfahbod <behdad behdad org>
Date: Tue May 26 12:00:28 2009 -0400
[HB] Remove more macros
---
pango/opentype/hb-ot-layout-gdef-private.h | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/pango/opentype/hb-ot-layout-gdef-private.h b/pango/opentype/hb-ot-layout-gdef-private.h
index ec62d04..d57fb47 100644
--- a/pango/opentype/hb-ot-layout-gdef-private.h
+++ b/pango/opentype/hb-ot-layout-gdef-private.h
@@ -30,10 +30,6 @@
#include "hb-ot-layout-common-private.h"
-#define DEFINE_INDIRECT_GLYPH_ARRAY_LOOKUP(Type, array, name) \
- inline const Type& name (hb_codepoint_t glyph) { return this+array[(this+coverage)(glyph)]; }
-
-
struct GlyphClassDef : ClassDef
{
enum {
@@ -55,10 +51,12 @@ ASSERT_SIZE (AttachPoint, 2);
struct AttachList
{
/* XXX We need enumeration API here */
- /* const AttachPoint& get_attach_points (hb_codepoint_t glyph); */
- DEFINE_INDIRECT_GLYPH_ARRAY_LOOKUP (AttachPoint, attachPoint, get_attach_points);
+ inline const AttachPoint& get_attach_points (hb_codepoint_t glyph)
+ {
+ return this+attachPoint[(this+coverage) (glyph)];
+ }
- private:
+ private:
OffsetTo<Coverage>
coverage; /* Offset to Coverage table -- from
* beginning of AttachList table */
@@ -166,8 +164,10 @@ struct LigCaretList
friend struct GDEF;
private:
- /* const LigGlyph& get_lig_glyph (hb_codepoint_t glyph); */
- DEFINE_INDIRECT_GLYPH_ARRAY_LOOKUP (LigGlyph, ligGlyph, get_lig_glyph);
+ inline const LigGlyph& get_lig_glyph (hb_codepoint_t glyph)
+ {
+ return this+ligGlyph[(this+coverage) (glyph)];
+ }
private:
OffsetTo<Coverage>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]