Package: wine-development
Followup-For: Bug #788809

Hello,

Attaching patch.

After some fiddling with debug options the warning is produced:

warn:font:freetype_SelectFont font face L"Misaki Mincho" file
L"/home/hramrach/.wine/dosdevices/c:/windows/Fonts/misakimn.ttf" has
zero face height!

Thanks

Michal

-- System Information:
Debian Release: 8.1
  APT prefers stable
  APT policy: (900, 'stable'), (610, 'oldstable'), (500, 'testing'), (410, 
'unstable'), (400, 'experimental')
Architecture: amd64 (x86_64)
Foreign Architectures: i386, armhf

Kernel: Linux 4.1.0-rc7+ (SMP w/4 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8) (ignored: LC_ALL 
set to en_US.UTF-8)
Shell: /bin/sh linked to /bin/bash
Init: systemd (via /run/systemd/system)

Versions of packages wine-development depends on:
ii  wine32-development  1.7.44-2fpe1
ii  wine64-development  1.7.44-2fpe1

wine-development recommends no packages.

wine-development suggests no packages.

-- no debconf information
Index: wine-development-1.7.44/dlls/gdi32/freetype.c
===================================================================
--- wine-development-1.7.44.orig/dlls/gdi32/freetype.c	2015-05-29 13:56:03.000000000 +0200
+++ wine-development-1.7.44/dlls/gdi32/freetype.c	2015-06-15 12:39:27.299285988 +0200
@@ -5398,7 +5398,13 @@
         if (height != 0) height = diff;
         height += face->size.height;
 
-        scale = (height + face->size.height - 1) / face->size.height;
+        scale = 1;
+        if (face->size.height)
+            scale = (height + face->size.height - 1) / face->size.height;
+        else
+            WARN("font face %s file %s has zero face height!\n",
+                    debugstr_w(face->FullName),
+                    debugstr_w(face->file));
         scaled_height = scale * face->size.height;
         /* Only jump to the next height if the difference <= 25% original height */
         if (scale > 2 && scaled_height - height > face->size.height / 4) scale--;

Reply via email to