ref: d21f995aea766ad1b414575558082f408b939e2f
parent: 63b91548e03dee826065c0077de6457b3b7d91c5
author: Werner Lemberg <[email protected]>
date: Thu Dec 7 09:49:03 EST 2017
Fix C++ compilation. * src/psaux/psauxmod.h: Use FT_CALLBACK_TABLE macro where necessary. * src/smooth/ftsmooth.c (ft_smooth_render_generic): Fix warning.
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
2017-12-07 Werner Lemberg <[email protected]>
+ 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 <[email protected]>
+
Fix `make multi'.
* include/freetype/internal/fttrace.h: Remove unused tracing macros.
--- a/src/psaux/psauxmod.h
+++ b/src/psaux/psauxmod.h
@@ -33,7 +33,10 @@
#endif
+ FT_CALLBACK_TABLE
const CFF_Builder_FuncsRec cff_builder_funcs;
+
+ FT_CALLBACK_TABLE
const PS_Builder_FuncsRec ps_builder_funcs;
--- 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;