Apply Qt-specific changes to the bundled FreeType

Change-Id: Ia2e737b513f542c702f24986ec9fcb24b5631e36
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
Reviewed-by: Lars Knoll <lars.knoll@digia.com>

src/3rdparty/freetype/builds/unix/ftconfig.h

@@ -140,6 +140,13 @@ FT_BEGIN_HEADER
 #endif /* FT_SIZEOF_LONG == 8 */
 
 
+#ifdef FT_CONFIG_OPTION_INLINE_MULFIX
+#ifdef FT_MULFIX_ASSEMBLER
+#define FT_MULFIX_INLINED  FT_MULFIX_ASSEMBLER
+#endif
+#endif
+
+
 #ifdef FT_MAKE_OPTION_SINGLE_OBJECT
 
 #define FT_LOCAL( x )      static  x

src/3rdparty/freetype/include/freetype/config/ftoption.h

@@ -317,7 +317,7 @@ FT_BEGIN_HEADER
   /* supply font data incrementally as the document is parsed, such        */
   /* as the Ghostscript interpreter for the PostScript language.           */
   /*                                                                       */
-#define FT_CONFIG_OPTION_INCREMENTAL
+/* #define FT_CONFIG_OPTION_INCREMENTAL */
 
 
   /*************************************************************************/
@@ -687,7 +687,7 @@ FT_BEGIN_HEADER
    * is recommended to disable the macro since it reduces the library's code
    * size and activates a few memory-saving optimizations as well.
    */
-#define FT_CONFIG_OPTION_OLD_INTERNALS
+/* #define FT_CONFIG_OPTION_OLD_INTERNALS */
 
 
   /*

src/3rdparty/freetype/src/base/ftobjs.c

@@ -1135,7 +1135,7 @@
     if ( error )
     {
       destroy_charmaps( face, memory );
-      if ( clazz->done_face )
+      if ( clazz->done_face && face )
         clazz->done_face( face );
       FT_FREE( internal );
       FT_FREE( face );

src/3rdparty/freetype/src/gzip/zconf.h

@@ -5,6 +5,11 @@
 
 /* @(#) $Id$ */
 
+#if defined(__ARMCC__) || defined(__CC_ARM)
+/* Ultra ugly hack that convinces RVCT to use the systems zlib */
+#include <stdapis/zconf.h>
+#else /* defined(__ARMCC__) || defined(__CC_ARM) */
+
 #ifndef _ZCONF_H
 #define _ZCONF_H
 
@@ -282,3 +287,5 @@ typedef uLong FAR uLongf;
 #endif
 
 #endif /* _ZCONF_H */
+
+#endif /* defined(__ARMCC__) || defined(__CC_ARM) */

src/3rdparty/freetype/src/gzip/zlib.h

@@ -28,6 +28,11 @@
   (zlib format), rfc1951.txt (deflate format) and rfc1952.txt (gzip format).
 */
 
+#if defined(__ARMCC__) || defined(__CC_ARM)
+/* Ultra ugly hack that convinces RVCT to use the systems zlib */
+#include <stdapis/zlib.h>
+#else /* defined(__ARMCC__) || defined(__CC_ARM) */
+
 #ifndef _ZLIB_H
 #define _ZLIB_H
 
@@ -828,3 +833,5 @@ ZEXTERN(int)  inflateInit2_ OF((z_streamp strm, int  windowBits,
 #endif
 
 #endif /* _ZLIB_H */
+
+#endif /* defined(__ARMCC__) || defined(__CC_ARM) */

src/3rdparty/freetype/src/gzip/zutil.h

@@ -182,7 +182,7 @@ typedef unsigned long  ulg;
 #endif
 
 /* Diagnostic functions */
-#ifdef DEBUG
+#if defined(DEBUG) && !defined(_WIN32_WCE)
 #  include <stdio.h>
    extern int z_verbose;
    extern void z_error    OF((char *m));

src/3rdparty/freetype/src/truetype/ttinterp.c

@@ -805,6 +805,7 @@
     return driver->context;
 
   Fail:
+    FT_FREE( exec );
     return NULL;
   }
 

src/3rdparty/freetype/src/truetype/ttpload.c

@@ -532,10 +532,10 @@
   tt_face_free_hdmx( TT_Face  face )
   {
     FT_Stream  stream = face->root.stream;
-    FT_Memory  memory = stream->memory;
+    FT_Memory  memory = stream ? stream->memory : NULL;
 
-
-    FT_FREE( face->hdmx_record_sizes );
+    if ( face->hdmx_record_sizes )
+        FT_FREE( face->hdmx_record_sizes );
     FT_FRAME_RELEASE( face->hdmx_table );
   }