shithub: freetype+ttf2subf

Download patch

ref: bffb7fe90b1a3403ee253c30974beaa8ee436567
parent: fdbef538f41198a59af8bebfc2841e3ce25b10d1
author: Werner Lemberg <[email protected]>
date: Fri Mar 17 03:52:30 EDT 2017 

`make multi' fixes; compiler warnings.

* src/base/ftsnames.c: Include FT_INTERNAL_DEBUG_H.

* src/cff/cffobjs.c [TT_CONFIG_OPTION_GX_VAR_SUPPORT]: Include
FT_MULTIPLE_MASTERS_H and FT_SERVICE_MULTIPLE_MASTERS_H.

* src/sfnt/sfdriver.c [TT_CONFIG_OPTION_GX_VAR_SUPPORT]: Include
FT_MULTIPLE_MASTERS_H and FT_SERVICE_MULTIPLE_MASTERS_H.
(get_win_string, get_apple_string): Initialize `result'.

git/fs: mount .git/fs: mount/attach disallowed 
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2017-03-17  Werner Lemberg  <[email protected]>
+
+	`make multi' fixes; compiler warnings.
+
+	* src/base/ftsnames.c: Include FT_INTERNAL_DEBUG_H.
+
+	* src/cff/cffobjs.c [TT_CONFIG_OPTION_GX_VAR_SUPPORT]: Include
+	FT_MULTIPLE_MASTERS_H and FT_SERVICE_MULTIPLE_MASTERS_H.
+
+	* src/sfnt/sfdriver.c [TT_CONFIG_OPTION_GX_VAR_SUPPORT]: Include
+	FT_MULTIPLE_MASTERS_H and FT_SERVICE_MULTIPLE_MASTERS_H.
+	(get_win_string, get_apple_string): Initialize `result'.
+
 2017-03-17  Dave Arnold <[email protected]>
 
 	[cff] Fix potential bugs in default NDV for CFF2.
--- a/src/base/ftsnames.c
+++ b/src/base/ftsnames.c
@@ -20,6 +20,8 @@
 
 
 #include <ft2build.h>
+#include FT_INTERNAL_DEBUG_H
+
 #include FT_SFNT_NAMES_H
 #include FT_INTERNAL_TRUETYPE_TYPES_H
 #include FT_INTERNAL_STREAM_H
--- a/src/cff/cffobjs.c
+++ b/src/cff/cffobjs.c
@@ -27,6 +27,11 @@
 #include FT_INTERNAL_SFNT_H
 #include FT_CFF_DRIVER_H
 
+#ifdef TT_CONFIG_OPTION_GX_VAR_SUPPORT
+#include FT_MULTIPLE_MASTERS_H
+#include FT_SERVICE_MULTIPLE_MASTERS_H
+#endif
+
 #include "cffobjs.h"
 #include "cffload.h"
 #include "cffcmap.h"
--- a/src/sfnt/sfdriver.c
+++ b/src/sfnt/sfdriver.c
@@ -51,7 +51,12 @@
 #include FT_SERVICE_SFNT_H
 #include FT_SERVICE_TT_CMAP_H
 
+#ifdef TT_CONFIG_OPTION_GX_VAR_SUPPORT
+#include FT_MULTIPLE_MASTERS_H
+#include FT_SERVICE_MULTIPLE_MASTERS_H
+#endif
 
+
   /*************************************************************************/
   /*                                                                       */
   /* The macro FT_COMPONENT is used in trace mode.  It is an implicit      */
@@ -473,7 +478,7 @@
   {
     FT_Error  error = FT_Err_Ok;
 
-    char*       result;
+    char*       result = NULL;
     FT_String*  r;
     FT_Char*    p;
     FT_UInt     len;
@@ -534,7 +539,7 @@
   {
     FT_Error  error = FT_Err_Ok;
 
-    char*       result;
+    char*       result = NULL;
     FT_String*  r;
     FT_Char*    p;
     FT_UInt     len;