From d21f995aea766ad1b414575558082f408b939e2f Mon Sep 17 00:00:00 2001 From: Werner Lemberg Date: Thu, 7 Dec 2017 14:49:03 +0100 Subject: [PATCH] Fix C++ compilation. * src/psaux/psauxmod.h: Use FT_CALLBACK_TABLE macro where necessary. * src/smooth/ftsmooth.c (ft_smooth_render_generic): Fix warning. --- ChangeLog | 8 ++++++++ src/psaux/psauxmod.h | 3 +++ src/smooth/ftsmooth.c | 2 +- 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index fd026472c..bc39aca5b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2017-12-07 Werner Lemberg + + Fix C++ compilation. + + * src/psaux/psauxmod.h: Use FT_CALLBACK_TABLE macro where necessary. + + * src/smooth/ftsmooth.c (ft_smooth_render_generic): Fix warning. + 2017-12-07 Werner Lemberg Fix `make multi'. diff --git a/src/psaux/psauxmod.h b/src/psaux/psauxmod.h index bc1551e9a..2d851c893 100644 --- a/src/psaux/psauxmod.h +++ b/src/psaux/psauxmod.h @@ -33,7 +33,10 @@ FT_BEGIN_HEADER #endif + FT_CALLBACK_TABLE const CFF_Builder_FuncsRec cff_builder_funcs; + + FT_CALLBACK_TABLE const PS_Builder_FuncsRec ps_builder_funcs; diff --git a/src/smooth/ftsmooth.c b/src/smooth/ftsmooth.c index 82627462e..bccc54bbb 100644 --- a/src/smooth/ftsmooth.c +++ b/src/smooth/ftsmooth.c @@ -228,7 +228,7 @@ if ( hmul ) /* lcd */ { FT_Byte* line; - FT_Byte* temp; + FT_Byte* temp = NULL; FT_UInt i, j; unsigned int height = bitmap->rows;