From 836c1d6fa8bc1430f4f677a636f74e586f1a85e2 Mon Sep 17 00:00:00 2001
From: mathog <>
Date: Thu, 24 Jul 2014 14:31:00 -0700
Subject: Fix for bug 1336753

(bzr r13467)
---
 src/extension/internal/text_reassemble.c | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

(limited to 'src')

diff --git a/src/extension/internal/text_reassemble.c b/src/extension/internal/text_reassemble.c
index b0447442c..9b1cff46e 100644
--- a/src/extension/internal/text_reassemble.c
+++ b/src/extension/internal/text_reassemble.c
@@ -1820,6 +1820,8 @@ printf("Face idx:%d bbox: xMax/Min:%ld,%ld yMax/Min:%ld,%ld UpEM:%d asc/des:%d,%
    fasc = ((double) (fsp->face->ascender) )/64.0;
    fdsc = ((double) (fsp->face->descender))/64.0;
       
+   /* originally the denominator was just 32.0, but it broke when units_per_EM wasn't 2048 */
+   double fixscale = tsp->fs/(((double) fsp->face->units_per_EM)/64.0);
    if(tri->load_flags & FT_LOAD_NO_SCALE) xe *= tsp->fs/32.0;
 
    /* now place the rectangle using ALN information */
@@ -1837,11 +1839,11 @@ printf("Face idx:%d bbox: xMax/Min:%ld,%ld yMax/Min:%ld,%ld UpEM:%d asc/des:%d,%
    }
    tpi->chunks[current].ldir = tsp->ldir;
 
-   if(tri->load_flags & FT_LOAD_NO_SCALE){ 
-      asc  *= tsp->fs/32.0;
-      dsc  *= tsp->fs/32.0;
-      fasc *= tsp->fs/32.0;
-      fdsc *= tsp->fs/32.0;
+   if(tri->load_flags & FT_LOAD_NO_SCALE){
+      asc  *= fixscale;
+      dsc  *= fixscale;
+      fasc *= fixscale;
+      fdsc *= fixscale;
    }
    
 
-- 
cgit v1.2.3