Akihiro Sagawa : gdi32: Fix sub-pixel shift calculations for vertical writing.

[Alexandre Julliard]

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

Author: Akihiro Sagawa <sagawa.aki(a)gmail.com>
Date:   Fri Jan 10 20:29:54 2014 +0900

gdi32: Fix sub-pixel shift calculations for vertical writing.

---

 dlls/gdi32/freetype.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c
index 1c3e6fc..f8b365b 100644
--- a/dlls/gdi32/freetype.c
+++ b/dlls/gdi32/freetype.c
@@ -6790,7 +6790,7 @@ static DWORD get_glyph_outline(GdiFont *incoming_font, UINT glyph, UINT format,
                 vmul = 3;
             }
 
-            x_shift = ft_face->glyph->bitmap_left - gm.gmptGlyphOrigin.x;
+            x_shift = ft_face->glyph->bitmap_left - (left >> 6);
             if ( x_shift < 0 )
             {
                 src += hmul * -x_shift;
@@ -6802,7 +6802,7 @@ static DWORD get_glyph_outline(GdiFont *incoming_font, UINT glyph, UINT format,
                 width -= x_shift;
             }
 
-            y_shift = gm.gmptGlyphOrigin.y - ft_face->glyph->bitmap_top;
+            y_shift = (top >> 6) - ft_face->glyph->bitmap_top;
             if ( y_shift < 0 )
             {
                 src += src_pitch * vmul * -y_shift;