diff options
| author | Chris Liddell <chris.liddell@artifex.com> | 2019-11-26 14:39:02 +0000 |
|---|---|---|
| committer | Chris Liddell <chris.liddell@artifex.com> | 2019-11-26 17:51:31 +0000 |
| commit | 79ac3f84060fbd5447219264ab0bcf89c7caa2cf (patch) | |
| tree | eb80c656c8302f91fc140e4a23db608ef207ba0d /freetype/src/winfonts/winfnt.h | |
| parent | 36cbd382b160ee4951d1911f85a4fa0723dd8db3 (diff) | |
| download | ghostpdl-79ac3f84060fbd5447219264ab0bcf89c7caa2cf.tar.gz | |
Update Freetype to 2.4.10
Plus makefile updates to support it
Bug 701288: Handle SEAC ligature glyph metrics correctly.
As originally intended, a Type 1 SEAC charstring would be used for an accented
glyph (like an a-caron, or u-umlaut) where the advance with of the SEAC glyph
is the same as that of the 'base' glyph ('a' or 'u').
It this case, it is not uncommon for the SEAC to skip using an (H)SBW op code
and rely on the one from the base glyph.
But out of spec fonts also use SEAC glyphs ligature glyphs (like 'oe' or 'fi'),
and in those cases the overall advance width is greater than that of the 'base'
glyph.
In this case, we have to allow for the SEAC glyph having included an (H)SBW and
if it has, retain those values, rather than those from the base glyph.
Rename file and make file change to match
Avoids file name clash with freetype 2.4.10
Work around a change in the zlib API for 1.2.11
where it's used in the Freetype/zlib interface debugging code.
Diffstat (limited to 'freetype/src/winfonts/winfnt.h')
| -rw-r--r-- | freetype/src/winfonts/winfnt.h | 40 |
1 files changed, 17 insertions, 23 deletions
diff --git a/freetype/src/winfonts/winfnt.h b/freetype/src/winfonts/winfnt.h index 4885c9d74..b628ad4c4 100644 --- a/freetype/src/winfonts/winfnt.h +++ b/freetype/src/winfonts/winfnt.h @@ -1,20 +1,20 @@ -/***************************************************************************/ -/* */ -/* winfnt.h */ -/* */ -/* FreeType font driver for Windows FNT/FON files */ -/* */ -/* Copyright 1996-2018 by */ -/* David Turner, Robert Wilhelm, and Werner Lemberg. */ -/* Copyright 2007 Dmitry Timoshkov for Codeweavers */ -/* */ -/* This file is part of the FreeType project, and may only be used, */ -/* modified, and distributed under the terms of the FreeType project */ -/* license, LICENSE.TXT. By continuing to use, modify, or distribute */ -/* this file you indicate that you have read the license and */ -/* understand and accept it fully. */ -/* */ -/***************************************************************************/ +/**************************************************************************** + * + * winfnt.h + * + * FreeType font driver for Windows FNT/FON files + * + * Copyright (C) 1996-2019 by + * David Turner, Robert Wilhelm, and Werner Lemberg. + * Copyright 2007 Dmitry Timoshkov for Codeweavers + * + * This file is part of the FreeType project, and may only be used, + * modified, and distributed under the terms of the FreeType project + * license, LICENSE.TXT. By continuing to use, modify, or distribute + * this file you indicate that you have read the license and + * understand and accept it fully. + * + */ #ifndef WINFNT_H_ @@ -28,9 +28,6 @@ FT_BEGIN_HEADER -#ifdef FT_CONFIG_OPTION_PIC -#error "this module does not support PIC yet" -#endif typedef struct WinMZ_HeaderRec_ { @@ -153,9 +150,6 @@ FT_BEGIN_HEADER FT_FaceRec root; FNT_Font font; - FT_CharMap charmap_handle; - FT_CharMapRec charmap; /* a single charmap per face */ - } FNT_FaceRec, *FNT_Face; |