From 4de7787f225172c0ab20ab42530ffa9267d72ca8 Mon Sep 17 00:00:00 2001 From: Werner Lemberg Date: Mon, 23 Sep 2013 22:10:08 +0200 Subject: [PATCH] Fix Savannah bug #40090. * src/autofit/afcjk.c (af_cjk_metrics_scale): Revert commit 306f8c5d (from 2013-08-25) affecting this function. --- ChangeLog | 7 +++++++ src/autofit/afcjk.c | 6 +++--- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 4143753ba..55467c2b9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2013-09-23 Werner Lemberg + + Fix Savannah bug #40090. + + * src/autofit/afcjk.c (af_cjk_metrics_scale): Revert commit + 306f8c5d (from 2013-08-25) affecting this function. + 2013-09-22 Werner Lemberg [autofit] Disunify Cyrillic and Greek handling from Latin. diff --git a/src/autofit/afcjk.c b/src/autofit/afcjk.c index d34a7362b..7a6f83551 100644 --- a/src/autofit/afcjk.c +++ b/src/autofit/afcjk.c @@ -625,9 +625,9 @@ af_cjk_metrics_scale( AF_CJKMetrics metrics, AF_Scaler scaler ) { - metrics->root.scaler.render_mode = scaler->render_mode; - metrics->root.scaler.face = scaler->face; - metrics->root.scaler.flags = scaler->flags; + /* we copy the whole structure since the x and y scaling values */ + /* are not modified, contrary to e.g. the `latin' auto-hinter */ + metrics->root.scaler = *scaler; af_cjk_metrics_scale_dim( metrics, scaler, AF_DIMENSION_HORZ ); af_cjk_metrics_scale_dim( metrics, scaler, AF_DIMENSION_VERT );