diff options
| author | Ewald Hew <ewaldhew@gmail.com> | 2017-09-25 06:22:52 +0200 |
|---|---|---|
| committer | Werner Lemberg <wl@gnu.org> | 2017-09-25 09:26:59 +0200 |
| commit | d23affe1ef8646ce51aa8d94fddccb7c89ba9a13 (patch) | |
| tree | eccade5fe2e01cdf8227fdb9b4cd1ac5a494deae /src/type1 | |
| parent | 9428ee42c0100381a60c57544773ae58c4d1028c (diff) | |
| download | freetype2-d23affe1ef8646ce51aa8d94fddccb7c89ba9a13.tar.gz | |
Reorganize object fields.
Make some fields more generic, so that we can access them the same
way regardless of Type 1 or CFF.
* include/freetype/internal/psaux.h (PS_Builder): Change `TT_Face'
to `FT_Face'.
Remove unused fields.
* src/psaux/psft.c: Update all accesses of `PS_Builder.face'.
Add some asserts to guard against casting `T1_Face' as `TT_Face'.
* src/type1/t1objs.h (T1_GlyphSlot): Reorder fields to follow
`CFF_GlyphSlot', so that we can pretend they are the same in the
interpreter.
* src/psaux/psobjs.c (ps_builder_init, ps_builder_add_point):
Updated with above changes.
Diffstat (limited to 'src/type1')
| -rw-r--r-- | src/type1/t1objs.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/type1/t1objs.h b/src/type1/t1objs.h index 39d26bf8b..d009b394b 100644 --- a/src/type1/t1objs.h +++ b/src/type1/t1objs.h @@ -120,12 +120,12 @@ FT_BEGIN_HEADER FT_Bool hint; FT_Bool scaled; - FT_Int max_points; - FT_Int max_contours; - FT_Fixed x_scale; FT_Fixed y_scale; + FT_Int max_points; + FT_Int max_contours; + } T1_GlyphSlotRec; |