shithub: freetype+ttf2subf

Info  •  Files  •  Log  •  Branches

Fix Savannah bug #40090.

* src/autofit/afcjk.c (af_cjk_metrics_scale): Revert commit
306f8c5d (from 2013-08-25) affecting this function.

git/fs: mount .git/fs: mount/attach disallowed

--- a/ChangeLog

+++ b/ChangeLog

@@ -1,3 +1,10 @@

+2013-09-23  Werner Lemberg  <[email protected]>

+

+	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  <[email protected]>

 	[autofit] Disunify Cyrillic and Greek handling from Latin.

--- 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 );