Fix C++ compilation.

* src/psaux/psauxmod.h: Use FT_CALLBACK_TABLE macro where necessary. * src/smooth/ftsmooth.c (ft_smooth_render_generic): Fix warning.
7 years ago · d21f995aea
parent 63b91548e0
commit d21f995aea
3 changed files with 12 additions and 1 deletions
--- a/8
+++ b/8
@ -1,3 +1,11 @@
+2017-12-07  Werner Lemberg  <wl@gnu.org>
+
+	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  <wl@gnu.org>

 	Fix `make multi'.
--- 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;


--- 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;