From 263bbef7670b59aa88ef9ba910579dfa51226524 Mon Sep 17 00:00:00 2001 From: Behdad Esfahbod Date: Wed, 20 May 2009 00:00:09 -0400 Subject: [PATCH] [GDEF] Simplify Device access --- src/hb-ot-layout-gdef-private.h | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/src/hb-ot-layout-gdef-private.h b/src/hb-ot-layout-gdef-private.h index ba0eb4c..90993f8 100644 --- a/src/hb-ot-layout-gdef-private.h +++ b/src/hb-ot-layout-gdef-private.h @@ -112,22 +112,16 @@ struct CaretValueFormat3 { friend struct CaretValue; - private: - inline const Device& get_device (void) const - { - if (HB_UNLIKELY (!deviceTable)) return Null(Device); - return (const Device&)*((const char*)this + deviceTable); - } - inline int get_caret_value (int ppem) const { - return /* TODO garbage */ (coordinate + get_device().get_delta (ppem)) / ppem; + return /* TODO garbage */ (coordinate + (this+deviceTable).get_delta (ppem)) / ppem; } private: USHORT caretValueFormat; /* Format identifier--format = 3 */ SHORT coordinate; /* X or Y value, in design units */ - Offset deviceTable; /* Offset to Device table for X or Y + OffsetTo + deviceTable; /* Offset to Device table for X or Y * value--from beginning of CaretValue * table */ }; -- 2.7.4