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/src/truetype/ttpload.c | |
| 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/src/truetype/ttpload.c')
| -rw-r--r-- | src/3rdparty/freetype/src/truetype/ttpload.c | 6 |
1 files changed, 3 insertions, 3 deletions
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 ); } |