diff options
| author | Chris Liddell <chris.liddell@artifex.com> | 2018-04-03 15:49:48 +0100 |
|---|---|---|
| committer | Chris Liddell <chris.liddell@artifex.com> | 2018-05-18 13:17:15 +0100 |
| commit | 9cb169b6b260f650aac2c3c7ed7af0f345ee0707 (patch) | |
| tree | 9b4d2ee77a0dbe43cb0364da2444686ed7302646 /freetype/src/sfnt/sfnt.c | |
| parent | ddace435eb99ea1c8a517f4ec94307cfe0743bce (diff) | |
| download | ghostpdl-9cb169b6b260f650aac2c3c7ed7af0f345ee0707.tar.gz | |
Work around a behaviour change in freetype > 2.8
Freetype will throw an error when we try to retrieve the glyph if the x/y
advance values are too big to fit in a 16.16 fixed point value.
Since we have no need of those values, set them to zero, and avoid the error.
Bring freetype up to 2.9.1
Plus the gs makefile changes to support the new version.
Reapply "Work around a change in the zlib API for 1.2.11"
for Freetype
commit: 08482c582115a1396d0fd9186011008f889a61c5
Diffstat (limited to 'freetype/src/sfnt/sfnt.c')
| -rw-r--r-- | freetype/src/sfnt/sfnt.c | 26 |
1 files changed, 9 insertions, 17 deletions
diff --git a/freetype/src/sfnt/sfnt.c b/freetype/src/sfnt/sfnt.c index 952d6d425..8b9a6b345 100644 --- a/freetype/src/sfnt/sfnt.c +++ b/freetype/src/sfnt/sfnt.c @@ -4,7 +4,7 @@ /* */ /* Single object library component. */ /* */ -/* Copyright 1996-2016 by */ +/* Copyright 1996-2018 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -17,27 +17,19 @@ #define FT_MAKE_OPTION_SINGLE_OBJECT - #include <ft2build.h> + +#include "pngshim.c" +#include "sfdriver.c" #include "sfntpic.c" -#include "ttload.c" -#include "ttmtx.c" +#include "sfobjs.c" +#include "ttbdf.c" #include "ttcmap.c" #include "ttkern.c" -#include "sfobjs.c" -#include "sfdriver.c" - -#ifdef TT_CONFIG_OPTION_EMBEDDED_BITMAPS -#include "pngshim.c" -#include "ttsbit.c" -#endif - -#ifdef TT_CONFIG_OPTION_POSTSCRIPT_NAMES +#include "ttload.c" +#include "ttmtx.c" #include "ttpost.c" -#endif +#include "ttsbit.c" -#ifdef TT_CONFIG_OPTION_BDF -#include "ttbdf.c" -#endif /* END */ |