[pango/harfbuzz-ng] [HB] Use OffsetTo<> in more places
- From: Behdad Esfahbod <behdad src gnome org>
- To: svn-commits-list gnome org
- Subject: [pango/harfbuzz-ng] [HB] Use OffsetTo<> in more places
- Date: Sun, 17 May 2009 19:49:16 -0400 (EDT)
commit fe6de1703567ddd2e3f5bf8f604d6f8961938340
Author: Behdad Esfahbod <behdad behdad org>
Date: Sun May 17 00:15:51 2009 -0400
[HB] Use OffsetTo<> in more places
---
pango/opentype/hb-ot-layout-gdef-private.h | 12 +++++-------
pango/opentype/hb-ot-layout-open-private.h | 4 ++++
2 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/pango/opentype/hb-ot-layout-gdef-private.h b/pango/opentype/hb-ot-layout-gdef-private.h
index 33cda08..fdff435 100644
--- a/pango/opentype/hb-ot-layout-gdef-private.h
+++ b/pango/opentype/hb-ot-layout-gdef-private.h
@@ -34,9 +34,7 @@
#define DEFINE_INDIRECT_GLYPH_ARRAY_LOOKUP(Type, name) \
inline const Type& name (hb_codepoint_t glyph) { \
- const Coverage &c = get_coverage (); \
- unsigned int c_index = c.get_coverage (glyph); \
- return (*this)[c_index]; \
+ return (*this)[(this+coverage)(glyph)]; \
}
@@ -78,10 +76,10 @@ struct AttachList {
private:
/* AttachPoint tables, in Coverage Index order */
DEFINE_OFFSET_ARRAY_TYPE (AttachPoint, attachPoint, glyphCount);
- DEFINE_GET_ACCESSOR (Coverage, coverage, coverage);
private:
- Offset coverage; /* Offset to Coverage table -- from
+ OffsetTo<Coverage>
+ coverage; /* Offset to Coverage table -- from
* beginning of AttachList table */
USHORT glyphCount; /* Number of glyphs with attachment
* points */
@@ -199,10 +197,10 @@ struct LigCaretList {
private:
/* LigGlyph tables, in Coverage Index order */
DEFINE_OFFSET_ARRAY_TYPE (LigGlyph, ligGlyph, ligGlyphCount);
- DEFINE_GET_ACCESSOR (Coverage, coverage, coverage);
private:
- Offset coverage; /* Offset to Coverage table--from
+ OffsetTo<Coverage>
+ coverage; /* Offset to Coverage table--from
* beginning of LigCaretList table */
USHORT ligGlyphCount; /* Number of ligature glyphs */
Offset ligGlyph[]; /* Array of offsets to LigGlyph
diff --git a/pango/opentype/hb-ot-layout-open-private.h b/pango/opentype/hb-ot-layout-open-private.h
index 0c648ef..9ef810b 100644
--- a/pango/opentype/hb-ot-layout-open-private.h
+++ b/pango/opentype/hb-ot-layout-open-private.h
@@ -800,6 +800,10 @@ struct Coverage {
}
}
+ unsigned int operator() (hb_codepoint_t glyph_id) const {
+ return get_coverage (glyph_id);
+ }
+
private:
union {
USHORT coverageFormat; /* Format identifier */
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]