src/hb-open-type-private.hh | 11 ++++-------
1 file changed, 4 insertions(+), 7 deletions(-)
New commits:
commit c48475f33ab88be6664d41b039f7be7c3e56a5a7
Author: Behdad Esfahbod <beh...@behdad.org>
Date: Mon Nov 13 20:26:29 2017 -0800
Whitespace
diff --git a/src/hb-open-type-private.hh b/src/hb-open-type-private.hh
index de5e9917..a12c4d23 100644
--- a/src/hb-open-type-private.hh
+++ b/src/hb-open-type-private.hh
@@ -635,9 +635,9 @@ struct IntType
DEFINE_SIZE_STATIC (Size);
};
-typedef IntType<int8_t , 1> CHAR; /* 8-bit signed integer. */
-typedef IntType<uint8_t , 1> BYTE; /* 8-bit unsigned integer. */
-typedef IntType<int8_t , 1> INT8; /* 8-bit signed integer. */
+typedef IntType<int8_t, 1> CHAR; /* 8-bit signed integer. */
+typedef IntType<uint8_t, 1> BYTE; /* 8-bit unsigned integer. */
+typedef IntType<int8_t, 1> INT8; /* 8-bit signed integer. */
typedef IntType<uint16_t, 2> USHORT; /* 16-bit unsigned integer. */
typedef IntType<int16_t, 2> SHORT; /* 16-bit signed integer. */
typedef IntType<uint32_t, 4> ULONG; /* 32-bit unsigned integer. */
commit 83d68027360ff655d3b59371fb606fc9e40df4ac
Author: Behdad Esfahbod <beh...@behdad.org>
Date: Mon Nov 13 20:25:02 2017 -0800
Clean up GlyphID
After 4a27c17ea0234dfe33e62f5830d9f92c26d48d30 we do not need
the special GlyphID.cmp(hb_codepoint_t), so just make GlyphID
a typedef.
Fixes https://github.com/behdad/harfbuzz/issues/612
diff --git a/src/hb-open-type-private.hh b/src/hb-open-type-private.hh
index 2687ba66..de5e9917 100644
--- a/src/hb-open-type-private.hh
+++ b/src/hb-open-type-private.hh
@@ -697,10 +697,7 @@ struct Tag : ULONG
DEFINE_NULL_DATA (Tag, " ");
/* Glyph index number, same as uint16 (length = 16 bits) */
-struct GlyphID : USHORT {
- static inline int cmp (const GlyphID *a, const GlyphID *b) { return
b->USHORT::cmp (*a); }
- inline int cmp (hb_codepoint_t a) const { return (int) a - (int) *this; }
-};
+typedef USHORT GlyphID;
/* Script/language-system/feature index */
struct Index : USHORT {
_______________________________________________
HarfBuzz mailing list
HarfBuzz@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/harfbuzz
