From 4679bf83a61f7508c2a4043a6d296c9552d3de8d Mon Sep 17 00:00:00 2001 From: Werner Lemberg Date: Sat, 28 Nov 2015 19:05:36 +0100 Subject: [PATCH] Fix C++ compilation. * src/autofit/afloader.c: Include FT_INTERNAL_CALC_H. * src/truetype/ttgload.c (load_truetype_glyph): Pacify compiler. --- ChangeLog | 8 ++++++++ src/autofit/afloader.c | 2 ++ src/truetype/ttgload.c | 2 +- 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index ee204c25e..60f52e222 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2015-11-28 Werner Lemberg + + 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 Change default LCD filter to be normalized and color-balanced. diff --git a/src/autofit/afloader.c b/src/autofit/afloader.c index f37530df6..aa5b8fdcb 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 c9d5716cb..d94fc92a5 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 ) )