[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[freetype2] master e09fe4c 06/27: * src/sfnt/sfwoff2.c: #undef macros.
From: |
Werner LEMBERG |
Subject: |
[freetype2] master e09fe4c 06/27: * src/sfnt/sfwoff2.c: #undef macros. |
Date: |
Tue, 27 Aug 2019 04:45:46 -0400 (EDT) |
branch: master
commit e09fe4cc790086c2282313aa968dfef4a4196f91
Author: Nikhil Ramakrishnan <address@hidden>
Commit: Werner Lemberg <address@hidden>
* src/sfnt/sfwoff2.c: #undef macros.
---
ChangeLog | 4 ++++
src/sfnt/sfwoff2.c | 7 ++++++-
2 files changed, 10 insertions(+), 1 deletion(-)
diff --git a/ChangeLog b/ChangeLog
index 19cd9f4..33ec66a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
2019-08-27 Nikhil Ramakrishnan <address@hidden>
+ * src/sfnt/sfwoff2.c: #undef macros.
+
+2019-08-27 Nikhil Ramakrishnan <address@hidden>
+
[woff2] Read table and collection directory.
* include/freetype/internal/wofftypes.h (WOFF2_TtcFontRec): New
diff --git a/src/sfnt/sfwoff2.c b/src/sfnt/sfwoff2.c
index 17933c3..6f955a2 100644
--- a/src/sfnt/sfwoff2.c
+++ b/src/sfnt/sfwoff2.c
@@ -242,7 +242,7 @@
( woff2.privOffset >= woff2.length ) ||
( woff2.length - woff2.privOffset < woff2.privLength ) )
{
- FT_ERROR(( "woff_font_open: invalid WOFF2 header\n" ));
+ FT_ERROR(( "woff2_font_open: invalid WOFF2 header\n" ));
return FT_THROW( Invalid_Table );
}
/* DEBUG - Remove later. */
@@ -453,4 +453,9 @@
}
+#undef READ_255USHORT
+#undef READ_BASE128
+#undef ROUND4
+
+
/* END */
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [freetype2] master e09fe4c 06/27: * src/sfnt/sfwoff2.c: #undef macros.,
Werner LEMBERG <=