Fix C++ compilation.

* src/psaux/psauxmod.h: Use FT_CALLBACK_TABLE macro where necessary.

* src/smooth/ftsmooth.c (ft_smooth_render_generic): Fix warning.
This commit is contained in:
Werner Lemberg 2017-12-07 14:49:03 +01:00
parent 63b91548e0
commit d21f995aea
3 changed files with 12 additions and 1 deletions

View File

@ -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'.

View File

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

View File

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