Nikolay Sivov : dwrite: Use user transform when rendering individual glyphs.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 1809ff900486016fb6f99a4e12b8846a1024fc2c
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=1809ff900486016fb6f99a4e12...

Author: Nikolay Sivov <nsivov(a)codeweavers.com>
Date:   Tue Apr  4 13:13:19 2017 +0300

dwrite: Use user transform when rendering individual glyphs.

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>

---

 dlls/dwrite/freetype.c | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/dlls/dwrite/freetype.c b/dlls/dwrite/freetype.c
index 2c34851..2a926d7 100644
--- a/dlls/dwrite/freetype.c
+++ b/dlls/dwrite/freetype.c
@@ -691,9 +691,8 @@ void freetype_get_glyph_bbox(struct dwrite_glyphbitmap *bitmap)
                 if (simulations & DWRITE_FONT_SIMULATIONS_BOLD)
                     embolden_glyph(glyph_copy, bitmap->emsize);
 
-                if (simulations & DWRITE_FONT_SIMULATIONS_OBLIQUE)
-                    pFT_Glyph_Transform(glyph_copy, &m, NULL);
-
+                /* Includes oblique and user transform. */
+                pFT_Glyph_Transform(glyph_copy, &m, NULL);
                 pFT_Glyph_Get_CBox(glyph_copy, FT_GLYPH_BBOX_PIXELS, &bbox);
                 pFT_Done_Glyph(glyph_copy);
             }
@@ -851,8 +850,8 @@ BOOL freetype_get_glyph_bitmap(struct dwrite_glyphbitmap *bitmap)
                 if (simulations & DWRITE_FONT_SIMULATIONS_BOLD)
                     embolden_glyph(glyph_copy, bitmap->emsize);
 
-                if (simulations & DWRITE_FONT_SIMULATIONS_OBLIQUE)
-                    pFT_Glyph_Transform(glyph_copy, &m, NULL);
+                /* Includes oblique and user transform. */
+                pFT_Glyph_Transform(glyph_copy, &m, NULL);
                 glyph = glyph_copy;
             }
         }