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/truetype/ttsubpix.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/truetype/ttsubpix.h')
| -rw-r--r-- | freetype/src/truetype/ttsubpix.h | 52 |
1 files changed, 26 insertions, 26 deletions
diff --git a/freetype/src/truetype/ttsubpix.h b/freetype/src/truetype/ttsubpix.h index 1070bb016..4966800c2 100644 --- a/freetype/src/truetype/ttsubpix.h +++ b/freetype/src/truetype/ttsubpix.h @@ -1,19 +1,19 @@ -/***************************************************************************/ -/* */ -/* ttsubpix.h */ -/* */ -/* TrueType Subpixel Hinting. */ -/* */ -/* Copyright 2010-2018 by */ -/* David Turner, Robert Wilhelm, and Werner Lemberg. */ -/* */ -/* 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. */ -/* */ -/***************************************************************************/ +/**************************************************************************** + * + * ttsubpix.h + * + * TrueType Subpixel Hinting. + * + * Copyright (C) 2010-2019 by + * David Turner, Robert Wilhelm, and Werner Lemberg. + * + * 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 TTSUBPIX_H_ @@ -29,11 +29,11 @@ FT_BEGIN_HEADER #ifdef TT_SUPPORT_SUBPIXEL_HINTING_INFINALITY - /*************************************************************************/ - /* */ - /* ID flags to identify special functions at FDEF and runtime. */ - /* */ - /* */ + /************************************************************************** + * + * ID flags to identify special functions at FDEF and runtime. + * + */ #define SPH_FDEF_INLINE_DELTA_1 0x0000001 #define SPH_FDEF_INLINE_DELTA_2 0x0000002 #define SPH_FDEF_DIAGONAL_STROKE 0x0000004 @@ -45,11 +45,11 @@ FT_BEGIN_HEADER #define SPH_FDEF_TYPEMAN_DIAGENDCTRL 0x0000100 - /*************************************************************************/ - /* */ - /* Tweak flags that are set for each glyph by the below rules. */ - /* */ - /* */ + /************************************************************************** + * + * Tweak flags that are set for each glyph by the below rules. + * + */ #define SPH_TWEAK_ALLOW_X_DMOVE 0x0000001UL #define SPH_TWEAK_ALWAYS_DO_DELTAP 0x0000002UL #define SPH_TWEAK_ALWAYS_SKIP_DELTAP 0x0000004UL |