From: Behdad Esfahbod <behdad@behdad.org>
Date: Wed, 20 May 2009 04:00:09 +0000 (-0400)
Subject: [GDEF] Simplify Device access
X-Git-Tag: submit/master/20120920.151126~7^2~1191
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=263bbef7670b59aa88ef9ba910579dfa51226524;p=framework%2Fuifw%2Fharfbuzz.git

[GDEF] Simplify Device access
---

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<Device>
+		deviceTable;		/* Offset to Device table for X or Y
 					 * value--from beginning of CaretValue
 					 * table */
 };