[pango/harfbuzz-ng] [HB] Simplify more
- From: Behdad Esfahbod <behdad src gnome org>
- To: svn-commits-list gnome org
- Subject: [pango/harfbuzz-ng] [HB] Simplify more
- Date: Mon, 25 May 2009 04:28:06 -0400 (EDT)
commit c53ed30cddcf3ed56ffb2756f2d8650ad012ff44
Author: Behdad Esfahbod <behdad behdad org>
Date: Mon May 25 02:34:25 2009 -0400
[HB] Simplify more
---
pango/opentype/hb-ot-layout-open-private.h | 31 +++++++++-------------------
1 files changed, 10 insertions(+), 21 deletions(-)
diff --git a/pango/opentype/hb-ot-layout-open-private.h b/pango/opentype/hb-ot-layout-open-private.h
index 65113bb..3f84580 100644
--- a/pango/opentype/hb-ot-layout-open-private.h
+++ b/pango/opentype/hb-ot-layout-open-private.h
@@ -475,24 +475,7 @@ struct OpenTypeFontFile
STATIC_DEFINE_GET_FOR_DATA (OpenTypeFontFile);
- DEFINE_ARRAY_INTERFACE (OpenTypeFontFace, face); /* get_face_count(), get_face(i) */
-
- /* This is how you get a table */
- inline const char* get_table_data (const OpenTypeTable& table) const { return (*this)[table]; }
-
- private:
- inline const char* operator[] (const OpenTypeTable& table) const
- {
- if (HB_UNLIKELY (table.offset == 0)) return NULL;
- return ((const char*)this) + table.offset;
- }
- inline char* operator[] (const OpenTypeTable& table)
- {
- if (HB_UNLIKELY (table.offset == 0)) return NULL;
- return ((char*)this) + table.offset;
- }
-
- unsigned int get_len (void) const
+ unsigned int get_face_count (void) const
{
switch (tag) {
default: return 0;
@@ -500,9 +483,9 @@ struct OpenTypeFontFile
case TTCTag: return TTCHeader::get_for_data ((const char *) this).table.len;
}
}
- const OpenTypeFontFace& operator[] (unsigned int i) const
+ const OpenTypeFontFace& get_face (unsigned int i) const
{
- if (HB_UNLIKELY (i >= get_len ())) return Null(OpenTypeFontFace);
+ if (HB_UNLIKELY (i >= get_face_count ())) return Null(OpenTypeFontFace);
switch (tag) {
default: /* Never happens because of the if above */
case TrueTypeTag: case CFFTag: return (const OffsetTable&)*this;
@@ -510,7 +493,13 @@ struct OpenTypeFontFile
}
}
- public:
+ /* This is how you get a table */
+ inline const char* get_table_data (const OpenTypeTable& table) const
+ {
+ if (HB_UNLIKELY (table.offset == 0)) return NULL;
+ return ((const char*) this) + table.offset;
+ }
+
Tag tag; /* 4-byte identifier. */
};
ASSERT_SIZE (OpenTypeFontFile, 4);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]