From 634867898b7f741f1f6f5610310f831e0996d084 Mon Sep 17 00:00:00 2001 From: Werner Lemberg Date: Fri, 17 Feb 2012 14:55:27 +0100 Subject: [PATCH] [autofit] Fix outline flags. * src/autofit/afloader.c (af_loader_load_g): Don't reassign `outline.flags' so that this information is preserved. See discussion starting at http://lists.gnu.org/archive/html/freetype-devel/2012-02/msg00046.html --- ChangeLog | 10 ++++++++++ src/autofit/afloader.c | 8 +++++++- 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 34515fada..91a975aa8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +2012-02-17 Alexei Podtelezhnikov + + [autofit] Fix outline flags. + + * src/autofit/afloader.c (af_loader_load_g): Don't reassign + `outline.flags' so that this information is preserved. See + discussion starting at + + http://lists.gnu.org/archive/html/freetype-devel/2012-02/msg00046.html + 2012-02-11 Werner Lemberg [truetype] Fix Savannah bug #35466. diff --git a/src/autofit/afloader.c b/src/autofit/afloader.c index e73109f41..84a7fa840 100644 --- a/src/autofit/afloader.c +++ b/src/autofit/afloader.c @@ -465,7 +465,13 @@ if ( error ) goto Exit; - slot->outline = internal->loader->base.outline; + /* reassign all outline fields except flags to protect them */ + slot->outline.n_contours = internal->loader->base.outline.n_contours; + slot->outline.n_points = internal->loader->base.outline.n_points; + slot->outline.points = internal->loader->base.outline.points; + slot->outline.tags = internal->loader->base.outline.tags; + slot->outline.contours = internal->loader->base.outline.contours; + slot->format = FT_GLYPH_FORMAT_OUTLINE; }