diff options
author | Konstantin Ritt <ritt.ks@gmail.com> | 2013-04-01 18:33:17 +0300 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-04-02 22:28:58 +0200 |
commit | ef05a7d64f6d0414da9ea02c5d2430fe7c4aac16 (patch) | |
tree | 5b6904e330376df7b5d88aa8051187293db04880 /src/3rdparty/freetype | |
parent | 406c8ef6e67da5505c7404a2517a8b4204d7c38a (diff) |
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>
Diffstat (limited to 'src/3rdparty/freetype')
-rw-r--r-- | src/3rdparty/freetype/builds/unix/ftconfig.h | 7 | ||||
-rw-r--r-- | src/3rdparty/freetype/include/freetype/config/ftoption.h | 4 | ||||
-rw-r--r-- | src/3rdparty/freetype/src/base/ftobjs.c | 2 | ||||
-rw-r--r-- | src/3rdparty/freetype/src/gzip/zconf.h | 7 | ||||
-rw-r--r-- | src/3rdparty/freetype/src/gzip/zlib.h | 7 | ||||
-rw-r--r-- | src/3rdparty/freetype/src/gzip/zutil.h | 2 | ||||
-rw-r--r-- | src/3rdparty/freetype/src/truetype/ttinterp.c | 1 | ||||
-rw-r--r-- | src/3rdparty/freetype/src/truetype/ttpload.c | 6 |
8 files changed, 29 insertions, 7 deletions
diff --git a/src/3rdparty/freetype/builds/unix/ftconfig.h b/src/3rdparty/freetype/builds/unix/ftconfig.h index 2fca16c79c..8bd62f94d5 100644 --- a/src/3rdparty/freetype/builds/unix/ftconfig.h +++ b/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 diff --git a/src/3rdparty/freetype/include/freetype/config/ftoption.h b/src/3rdparty/freetype/include/freetype/config/ftoption.h index 2047436002..811dd3e38d 100644 --- a/src/3rdparty/freetype/include/freetype/config/ftoption.h +++ b/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 */ /* diff --git a/src/3rdparty/freetype/src/base/ftobjs.c b/src/3rdparty/freetype/src/base/ftobjs.c index 46bcd3bb8b..3403188594 100644 --- a/src/3rdparty/freetype/src/base/ftobjs.c +++ b/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 ); diff --git a/src/3rdparty/freetype/src/gzip/zconf.h b/src/3rdparty/freetype/src/gzip/zconf.h index 3abf0ba03b..bdaf57e300 100644 --- a/src/3rdparty/freetype/src/gzip/zconf.h +++ b/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) */ diff --git a/src/3rdparty/freetype/src/gzip/zlib.h b/src/3rdparty/freetype/src/gzip/zlib.h index 50d0d3f146..0f98fdcbd3 100644 --- a/src/3rdparty/freetype/src/gzip/zlib.h +++ b/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) */ diff --git a/src/3rdparty/freetype/src/gzip/zutil.h b/src/3rdparty/freetype/src/gzip/zutil.h index c9688cd9c0..1949270998 100644 --- a/src/3rdparty/freetype/src/gzip/zutil.h +++ b/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)); diff --git a/src/3rdparty/freetype/src/truetype/ttinterp.c b/src/3rdparty/freetype/src/truetype/ttinterp.c index 13aa9a27c4..d1769b8d2a 100644 --- a/src/3rdparty/freetype/src/truetype/ttinterp.c +++ b/src/3rdparty/freetype/src/truetype/ttinterp.c @@ -805,6 +805,7 @@ return driver->context; Fail: + FT_FREE( exec ); return NULL; } diff --git a/src/3rdparty/freetype/src/truetype/ttpload.c b/src/3rdparty/freetype/src/truetype/ttpload.c index a311b03c00..ecdd7376e1 100644 --- a/src/3rdparty/freetype/src/truetype/ttpload.c +++ b/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 ); } |