src/hb-aat-layout-ankr-table.hh | 16 +++++++++++++++-
src/hb-ot-layout-gdef-table.hh | 4 ++--
src/hb-ot-layout-gpos-table.hh | 12 ++++++------
3 files changed, 23 insertions(+), 9 deletions(-)
New commits:
commit 28c4245e9f76c6c53a4589e7745a60ed0e97414a
Author: Behdad Esfahbod <beh...@behdad.org>
Date: Mon Feb 26 01:10:42 2018 -0800
[aat/ankr] Define Anchor struct
diff --git a/src/hb-aat-layout-ankr-table.hh b/src/hb-aat-layout-ankr-table.hh
index f9d5cd3b..d0453bd8 100644
--- a/src/hb-aat-layout-ankr-table.hh
+++ b/src/hb-aat-layout-ankr-table.hh
@@ -37,6 +37,20 @@ namespace AAT {
* ankr -- Anchor point
*/
+struct Anchor
+{
+ inline bool sanitize (hb_sanitize_context_t *c) const
+ {
+ TRACE_SANITIZE (this);
+ return_trace (c->check_struct (this));
+ }
+
+ FWORD xCoordinate;
+ FWORD yCoordinate;
+ public:
+ DEFINE_SIZE_STATIC (4);
+};
+
struct ankr
{
static const hb_tag_t tableTag = HB_AAT_TAG_ankr;
@@ -53,7 +67,7 @@ struct ankr
HBUINT16 version; /* Version number (set to zero)
*/
HBUINT16 flags; /* Flags (currently unused; set
to zero) */
LOffsetTo<Lookup<HBUINT16> > lookupTable; /* Offset to the table's lookup
table */
- LOffsetTo<ArrayOf<HBUINT32, HBUINT32> >
+ LOffsetTo<ArrayOf<Anchor, HBUINT32> >
anchors; /* Offset to the glyph data
table */
public:
commit e347fb908b188f71df13215c8939b0f3a12c716f
Author: Behdad Esfahbod <beh...@behdad.org>
Date: Mon Feb 26 01:08:00 2018 -0800
Minor
diff --git a/src/hb-ot-layout-gdef-table.hh b/src/hb-ot-layout-gdef-table.hh
index aad7d602..2d6c66e6 100644
--- a/src/hb-ot-layout-gdef-table.hh
+++ b/src/hb-ot-layout-gdef-table.hh
@@ -110,7 +110,7 @@ struct CaretValueFormat1
protected:
HBUINT16 caretValueFormat; /* Format identifier--format = 1 */
- HBINT16 coordinate; /* X or Y value, in design
units */
+ FWORD coordinate; /* X or Y value, in design
units */
public:
DEFINE_SIZE_STATIC (4);
};
@@ -161,7 +161,7 @@ struct CaretValueFormat3
protected:
HBUINT16 caretValueFormat; /* Format identifier--format = 3 */
- HBINT16 coordinate; /* X or Y value, in design
units */
+ FWORD coordinate; /* X or Y value, in design
units */
OffsetTo<Device>
deviceTable; /* Offset to Device table for X or Y
* value--from beginning of CaretValue
diff --git a/src/hb-ot-layout-gpos-table.hh b/src/hb-ot-layout-gpos-table.hh
index 4e1a10d7..46ffcc66 100644
--- a/src/hb-ot-layout-gpos-table.hh
+++ b/src/hb-ot-layout-gpos-table.hh
@@ -248,8 +248,8 @@ struct AnchorFormat1
protected:
HBUINT16 format; /* Format identifier--format = 1 */
- HBINT16 xCoordinate; /* Horizontal value--in design
units */
- HBINT16 yCoordinate; /* Vertical value--in design
units */
+ FWORD xCoordinate; /* Horizontal value--in design
units */
+ FWORD yCoordinate; /* Vertical value--in design
units */
public:
DEFINE_SIZE_STATIC (6);
};
@@ -279,8 +279,8 @@ struct AnchorFormat2
protected:
HBUINT16 format; /* Format identifier--format = 2 */
- HBINT16 xCoordinate; /* Horizontal value--in design
units */
- HBINT16 yCoordinate; /* Vertical value--in design
units */
+ FWORD xCoordinate; /* Horizontal value--in design
units */
+ FWORD yCoordinate; /* Vertical value--in design
units */
HBUINT16 anchorPoint; /* Index to glyph contour point */
public:
DEFINE_SIZE_STATIC (8);
@@ -309,8 +309,8 @@ struct AnchorFormat3
protected:
HBUINT16 format; /* Format identifier--format = 3 */
- HBINT16 xCoordinate; /* Horizontal value--in design
units */
- HBINT16 yCoordinate; /* Vertical value--in design
units */
+ FWORD xCoordinate; /* Horizontal value--in design
units */
+ FWORD yCoordinate; /* Vertical value--in design
units */
OffsetTo<Device>
xDeviceTable; /* Offset to Device table for X
* coordinate-- from beginning of
_______________________________________________
HarfBuzz mailing list
HarfBuzz@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/harfbuzz
