diff options
| author | Youngbok Shin <youngb.shin@samsung.com> | 2016-08-22 11:23:44 +0900 |
|---|---|---|
| committer | Youngbok Shin <youngb.shin@samsung.com> | 2016-08-22 11:23:44 +0900 |
| commit | e684182ac634596bace621b0e84dfc98d2bc82c5 (patch) | |
| tree | e6ce432188d6fe2b0b4bee6ddad34e7977c26a44 /src/hb-ot-layout-gdef-table.hh | |
| parent | 087e8c5d58be057cb77192932cd7fa8f7aacf1a5 (diff) | |
| download | harfbuzz-e684182ac634596bace621b0e84dfc98d2bc82c5.tar.gz harfbuzz-e684182ac634596bace621b0e84dfc98d2bc82c5.tar.bz2 harfbuzz-e684182ac634596bace621b0e84dfc98d2bc82c5.zip | |
Revert "Imported Upstream version 1.2.7"
This reverts commit 087e8c5d58be057cb77192932cd7fa8f7aacf1a5.
Diffstat (limited to 'src/hb-ot-layout-gdef-table.hh')
| -rw-r--r-- | src/hb-ot-layout-gdef-table.hh | 46 |
1 files changed, 23 insertions, 23 deletions
diff --git a/src/hb-ot-layout-gdef-table.hh b/src/hb-ot-layout-gdef-table.hh index 2b4bc5a..7a6c04d 100644 --- a/src/hb-ot-layout-gdef-table.hh +++ b/src/hb-ot-layout-gdef-table.hh @@ -74,7 +74,7 @@ struct AttachList inline bool sanitize (hb_sanitize_context_t *c) const { TRACE_SANITIZE (this); - return_trace (coverage.sanitize (c, this) && attachPoint.sanitize (c, this)); + return TRACE_RETURN (coverage.sanitize (c, this) && attachPoint.sanitize (c, this)); } protected: @@ -105,7 +105,7 @@ struct CaretValueFormat1 inline bool sanitize (hb_sanitize_context_t *c) const { TRACE_SANITIZE (this); - return_trace (c->check_struct (this)); + return TRACE_RETURN (c->check_struct (this)); } protected: @@ -132,7 +132,7 @@ struct CaretValueFormat2 inline bool sanitize (hb_sanitize_context_t *c) const { TRACE_SANITIZE (this); - return_trace (c->check_struct (this)); + return TRACE_RETURN (c->check_struct (this)); } protected: @@ -156,7 +156,7 @@ struct CaretValueFormat3 inline bool sanitize (hb_sanitize_context_t *c) const { TRACE_SANITIZE (this); - return_trace (c->check_struct (this) && deviceTable.sanitize (c, this)); + return TRACE_RETURN (c->check_struct (this) && deviceTable.sanitize (c, this)); } protected: @@ -185,12 +185,12 @@ struct CaretValue inline bool sanitize (hb_sanitize_context_t *c) const { TRACE_SANITIZE (this); - if (!u.format.sanitize (c)) return_trace (false); + if (!u.format.sanitize (c)) return TRACE_RETURN (false); switch (u.format) { - case 1: return_trace (u.format1.sanitize (c)); - case 2: return_trace (u.format2.sanitize (c)); - case 3: return_trace (u.format3.sanitize (c)); - default:return_trace (true); + case 1: return TRACE_RETURN (u.format1.sanitize (c)); + case 2: return TRACE_RETURN (u.format2.sanitize (c)); + case 3: return TRACE_RETURN (u.format3.sanitize (c)); + default:return TRACE_RETURN (true); } } @@ -227,7 +227,7 @@ struct LigGlyph inline bool sanitize (hb_sanitize_context_t *c) const { TRACE_SANITIZE (this); - return_trace (carets.sanitize (c, this)); + return TRACE_RETURN (carets.sanitize (c, this)); } protected: @@ -262,7 +262,7 @@ struct LigCaretList inline bool sanitize (hb_sanitize_context_t *c) const { TRACE_SANITIZE (this); - return_trace (coverage.sanitize (c, this) && ligGlyph.sanitize (c, this)); + return TRACE_RETURN (coverage.sanitize (c, this) && ligGlyph.sanitize (c, this)); } protected: @@ -285,7 +285,7 @@ struct MarkGlyphSetsFormat1 inline bool sanitize (hb_sanitize_context_t *c) const { TRACE_SANITIZE (this); - return_trace (coverage.sanitize (c, this)); + return TRACE_RETURN (coverage.sanitize (c, this)); } protected: @@ -310,10 +310,10 @@ struct MarkGlyphSets inline bool sanitize (hb_sanitize_context_t *c) const { TRACE_SANITIZE (this); - if (!u.format.sanitize (c)) return_trace (false); + if (!u.format.sanitize (c)) return TRACE_RETURN (false); switch (u.format) { - case 1: return_trace (u.format1.sanitize (c)); - default:return_trace (true); + case 1: return TRACE_RETURN (u.format1.sanitize (c)); + default:return TRACE_RETURN (true); } } @@ -376,13 +376,13 @@ struct GDEF inline bool sanitize (hb_sanitize_context_t *c) const { TRACE_SANITIZE (this); - return_trace (version.sanitize (c) && - likely (version.major == 1) && - glyphClassDef.sanitize (c, this) && - attachList.sanitize (c, this) && - ligCaretList.sanitize (c, this) && - markAttachClassDef.sanitize (c, this) && - (version.to_int () < 0x00010002u || markGlyphSetsDef[0].sanitize (c, this))); + return TRACE_RETURN (version.sanitize (c) && + likely (version.major == 1) && + glyphClassDef.sanitize (c, this) && + attachList.sanitize (c, this) && + ligCaretList.sanitize (c, this) && + markAttachClassDef.sanitize (c, this) && + (version.to_int () < 0x00010002u || markGlyphSetsDef[0].sanitize (c, this))); } @@ -409,7 +409,7 @@ struct GDEF protected: - FixedVersion<>version; /* Version of the GDEF table--currently + FixedVersion version; /* Version of the GDEF table--currently * 0x00010002u */ OffsetTo<ClassDef> glyphClassDef; /* Offset to class definition table |