[HarfBuzz] harfbuzz: Branch 'master'

[Behdad Esfahbod]

 src/hb-icu-le.cc |   10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

New commits:
commit a447c528e68cabc9ca6e24e2c436f3d605ef9aaa
Author: Behdad Esfahbod <behdad at behdad.org>
Date:   Thu May 23 17:05:39 2013 -0400

    [icu_le] A bit better scaling

diff --git a/src/hb-icu-le.cc b/src/hb-icu-le.cc
index 350f5c6..7efee7b 100644
--- a/src/hb-icu-le.cc
+++ b/src/hb-icu-le.cc
@@ -62,11 +62,13 @@ hb_icu_le_shaper_font_data_t *
 _hb_icu_le_shaper_font_data_create (hb_font_t *font)
 {
   LEErrorCode status = LE_NO_ERROR;
+  unsigned int x_ppem = font->x_ppem ? font->x_ppem : 72;
+  unsigned int y_ppem = font->y_ppem ? font->y_ppem : 72;
   hb_icu_le_shaper_font_data_t *data = new PortableFontInstance (font->face,
-								 1,
-								 1,
-								 font->x_scale,
-								 font->y_scale,
+								 font->x_scale / x_ppem,
+								 font->y_scale / y_ppem,
+								 x_ppem,
+								 y_ppem,
 								 status);
   if (status != LE_NO_ERROR) {
     delete (data);