[pango/harfbuzz-ng] [HB] Minor
- From: Behdad Esfahbod <behdad src gnome org>
- To: svn-commits-list gnome org
- Subject: [pango/harfbuzz-ng] [HB] Minor
- Date: Sun, 24 May 2009 01:21:02 -0400 (EDT)
commit 5c8fd8cb98e4f20ce02dd10f5b3edbbb15b1d91d
Author: Behdad Esfahbod <behdad behdad org>
Date: Sat May 23 22:39:42 2009 -0400
[HB] Minor
---
pango/opentype/hb-ot-layout-gdef-private.h | 6 +++---
pango/opentype/hb-ot-layout-open-private.h | 4 ++--
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/pango/opentype/hb-ot-layout-gdef-private.h b/pango/opentype/hb-ot-layout-gdef-private.h
index d68d9ef..b41c327 100644
--- a/pango/opentype/hb-ot-layout-gdef-private.h
+++ b/pango/opentype/hb-ot-layout-gdef-private.h
@@ -199,17 +199,17 @@ struct GDEF
/* XXX check version here? */
inline bool has_glyph_classes () const { return glyphClassDef != 0; }
- inline hb_ot_layout_class_t get_glyph_class (hb_codepoint_t glyph) const { return glyphClassDef(this).get_class (glyph); }
+ inline hb_ot_layout_class_t get_glyph_class (hb_codepoint_t glyph) const { return (this+glyphClassDef).get_class (glyph); }
inline bool has_mark_attachment_types () const { return markAttachClassDef != 0; }
- inline hb_ot_layout_class_t get_mark_attachment_type (hb_codepoint_t glyph) const { return markAttachClassDef(this).get_class (glyph); }
+ inline hb_ot_layout_class_t get_mark_attachment_type (hb_codepoint_t glyph) const { return (this+markAttachClassDef).get_class (glyph); }
/* TODO get_attach and get_lig_caret */
inline bool has_attach_list () const { return attachList != 0; }
inline bool has_lig_caret_list () const { return ligCaretList != 0; }
private:
- Fixed version; /* Version of the GDEF table--initially
+ Fixed_Version version; /* Version of the GDEF table--initially
* 0x00010000 */
OffsetTo<ClassDef>
glyphClassDef; /* Offset to class definition table
diff --git a/pango/opentype/hb-ot-layout-open-private.h b/pango/opentype/hb-ot-layout-open-private.h
index e5f697c..08ff152 100644
--- a/pango/opentype/hb-ot-layout-open-private.h
+++ b/pango/opentype/hb-ot-layout-open-private.h
@@ -173,7 +173,6 @@ struct Null <Type> \
if (HB_UNLIKELY (data == NULL)) return Null(Type); \
return (const Type&)*data; \
} \
- static inline Type& get_for_data (char *data) { return (Type&)*data; }
@@ -511,7 +510,8 @@ struct OpenTypeFontFile
{
if (HB_UNLIKELY (i >= get_len ())) return Null(OpenTypeFontFace);
switch (tag) {
- default: case TrueTypeTag: case CFFTag: return (const OffsetTable&)*this;
+ default: /* Never happens because of the if above */
+ case TrueTypeTag: case CFFTag: return (const OffsetTable&)*this;
case TTCTag: return ((const TTCHeader&)*this)[i];
}
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]