diff options
| author | Werner Lemberg <wl@gnu.org> | 2016-03-26 07:34:30 +0100 |
|---|---|---|
| committer | Werner Lemberg <wl@gnu.org> | 2016-03-26 22:42:13 +0100 |
| commit | 0003cb916224aa7d12b4cf4c619631ea8932b878 (patch) | |
| tree | 954b37f103553b8c9e92764700480476e8843b37 /src/pfr/pfrtypes.h | |
| parent | 2aa695656529c821168db9b97fac120b52876677 (diff) | |
| download | freetype2-0003cb916224aa7d12b4cf4c619631ea8932b878.tar.gz | |
[pfr] Fix handling of compound glyphs.
Extra items are indicated with different bit positions.
* src/pfr/pfrtypes.h (PFR_GlyphFlags): Replace
`PFR_GLYPH_EXTRA_ITEMS' with `PFR_GLYPH_SIMPLE_EXTRA_ITEMS' and
`PFR_GLYPH_COMPOUND_EXTRA_ITEMS'.
* src/pfr/pfrgload.c (pfr_glyph_load_simple,
pfr_glyph_load_compound): Use them.
Diffstat (limited to 'src/pfr/pfrtypes.h')
| -rw-r--r-- | src/pfr/pfrtypes.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/pfr/pfrtypes.h b/src/pfr/pfrtypes.h index 592acbd7d..09649b9d8 100644 --- a/src/pfr/pfrtypes.h +++ b/src/pfr/pfrtypes.h @@ -291,8 +291,11 @@ FT_BEGIN_HEADER typedef enum PFR_GlyphFlags_ { - PFR_GLYPH_IS_COMPOUND = 0x80, - PFR_GLYPH_EXTRA_ITEMS = 0x08, + PFR_GLYPH_IS_COMPOUND = 0x80, + + PFR_GLYPH_SINGLE_EXTRA_ITEMS = 0x08, + PFR_GLYPH_COMPOUND_EXTRA_ITEMS = 0x40, + PFR_GLYPH_1BYTE_XYCOUNT = 0x04, PFR_GLYPH_XCOUNT = 0x02, PFR_GLYPH_YCOUNT = 0x01 |