Various fixups to the freetype2 import.

6 files changed, 29 insertions, 4 deletions

diff --git a/cut-n-paste-code/freetype/Makefile.am b/cut-n-paste-code/freetype/Makefile.am
index eec797df6..8e0dc1629 100644
--- a/cut-n-paste-code/freetype/Makefile.am
+++ b/cut-n-paste-code/freetype/Makefile.am
@@ -4,7 +4,7 @@ noinst_LTLIBRARIES = libfreetype2.la
 
 libfreetype2_la_LDFLAGS = -static
 
-CFLAGS=-DFT_FLAT_COMPILE
+INCLUDES=-DFT_FLAT_COMPILE
 
 libfreetype2_la_SOURCES = \
 	cff.c \
diff --git a/cut-n-paste-code/freetype/ftextend.c b/cut-n-paste-code/freetype/ftextend.c
index f3120c76a..6f2a2ec13 100644
--- a/cut-n-paste-code/freetype/ftextend.c
+++ b/cut-n-paste-code/freetype/ftextend.c
@@ -47,6 +47,7 @@
 #undef  FT_COMPONENT
 #define FT_COMPONENT  trace_extend
 
+#ifdef FT_CONFIG_OPTION_EXTEND_ENGINE
 
   typedef struct  FT_Extension_Registry_
   {
@@ -337,5 +338,7 @@
     return error;
   }
 
+#endif
+
 
 /* END */
diff --git a/cut-n-paste-code/freetype/ftgrays.c b/cut-n-paste-code/freetype/ftgrays.c
index 686fd2ff1..7f03630c2 100644
--- a/cut-n-paste-code/freetype/ftgrays.c
+++ b/cut-n-paste-code/freetype/ftgrays.c
@@ -1841,7 +1841,7 @@
   }
 
 
-  extern
+  static
   int  grays_raster_render( PRaster            raster,
                             FT_Raster_Params*  params )
   {
diff --git a/cut-n-paste-code/freetype/ftinit.c b/cut-n-paste-code/freetype/ftinit.c
index 5f7650061..17ad48963 100644
--- a/cut-n-paste-code/freetype/ftinit.c
+++ b/cut-n-paste-code/freetype/ftinit.c
@@ -26,6 +26,9 @@
   /*     `freetype/config/ftmodule.h'.  See the document `FreeType 2.0     */
   /*     Build System' for more information.                               */
   /*                                                                       */
+  /*  Note added by raph: I've renamed freetype/config/ftmodule.h to       */
+  /*  ftmodule-list.h so as to avoid collision with freetype/ftmodule.h    */
+  /*                                                                       */
   /*  FT_Init_FreeType():                                                  */
   /*     This function creates a system object for the current platform,   */
   /*     builds a library out of it, then calls FT_Default_Drivers().      */
@@ -67,7 +70,7 @@
 
 #ifdef FT_FLAT_COMPILE
 
-#include "ftmodule.h"
+#include "ftmodule-list.h"
 
 #else
 
@@ -83,7 +86,7 @@ const FT_Module_Class*  ft_default_modules[] =
   {
 #ifdef FT_FLAT_COMPILE
 
-#include "ftmodule.h"
+#include "ftmodule-list.h"
 
 #else
 
diff --git a/cut-n-paste-code/freetype/ftmodule-list.h b/cut-n-paste-code/freetype/ftmodule-list.h
new file mode 100644
index 000000000..57164c8ac
--- /dev/null
+++ b/cut-n-paste-code/freetype/ftmodule-list.h
@@ -0,0 +1,10 @@
+FT_USE_MODULE(cff_driver_class)
+FT_USE_MODULE(t1cid_driver_class)
+FT_USE_MODULE(psnames_module_class)
+FT_USE_MODULE(ft_raster1_renderer_class)
+FT_USE_MODULE(sfnt_module_class)
+FT_USE_MODULE(ft_smooth_renderer_class)
+FT_USE_MODULE(tt_driver_class)
+FT_USE_MODULE(t1_driver_class)
+FT_USE_MODULE(t1z_driver_class)
+FT_USE_MODULE(winfnt_driver_class)
diff --git a/cut-n-paste-code/freetype/ftsystem.c b/cut-n-paste-code/freetype/ftsystem.c
index 14feb03c8..28e2eba78 100644
--- a/cut-n-paste-code/freetype/ftsystem.c
+++ b/cut-n-paste-code/freetype/ftsystem.c
@@ -47,6 +47,13 @@
 #include <string.h>
 
 
+/* It seems to me these should be in the .h file instead. Why they're
+   not in the original codebase is beyond me. */
+  FT_EXPORT_FUNC( FT_Error )  FT_New_Stream( const char*  filepathname,
+                                             FT_Stream    stream );
+
+  FT_EXPORT_FUNC( FT_Memory )  FT_New_Memory( void );
+
   /*************************************************************************/
   /*                                                                       */
   /*                       MEMORY MANAGEMENT INTERFACE                     */
@@ -62,6 +69,7 @@
   /*************************************************************************/
 
 
+
   /*************************************************************************/
   /*                                                                       */
   /* <Function>                                                            */
@@ -223,6 +231,7 @@
   }
 
 
+
   /*************************************************************************/
   /*                                                                       */
   /* <Function>                                                            */