Commit 4679bf83a61f7508c2a4043a6d296c9552d3de8d
2015-11-28T19:05:36
Fix C++ compilation. * src/autofit/afloader.c: Include FT_INTERNAL_CALC_H. * src/truetype/ttgload.c (load_truetype_glyph): Pacify compiler.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42
diff --git a/ChangeLog b/ChangeLog
index ee204c2..60f52e2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2015-11-28 Werner Lemberg <wl@gnu.org>
+
+ Fix C++ compilation.
+
+ * src/autofit/afloader.c: Include FT_INTERNAL_CALC_H.
+
+ * src/truetype/ttgload.c (load_truetype_glyph): Pacify compiler.
+
2015-11-28 Nikolaus Waxweiler <madigens@gmail.com>
Change default LCD filter to be normalized and color-balanced.
diff --git a/src/autofit/afloader.c b/src/autofit/afloader.c
index f37530d..aa5b8fd 100644
--- a/src/autofit/afloader.c
+++ b/src/autofit/afloader.c
@@ -23,6 +23,8 @@
#include "afmodule.h"
#include "afpic.h"
+#include FT_INTERNAL_CALC_H
+
/* Initialize glyph loader. */
diff --git a/src/truetype/ttgload.c b/src/truetype/ttgload.c
index c9d5716..d94fc92 100644
--- a/src/truetype/ttgload.c
+++ b/src/truetype/ttgload.c
@@ -1659,7 +1659,7 @@
}
else
{
- FT_ListNode node;
+ FT_ListNode node = NULL;
if ( FT_NEW( node ) )