dwrite: Use user transform when rendering individual glyphs.

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

dwrite: Use user transform when rendering individual glyphs.
1809ff90 · Nikolay Sivov · Alexandre Julliard · b66f187e · 1809ff90
Commit 1809ff90 authored Apr 04, 2017 by Nikolay Sivov Committed by Alexandre Julliard Apr 04, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 5 deletions

freetype.c dlls/dwrite/freetype.c +4 -5

No files found.
--- 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;
            }
        }