Alexandre Julliard : gdi32: Don' t load bitmap glyphs when using subpixel rendering in GetGlyphOutline.

[Alexandre Julliard]

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

Author: Alexandre Julliard <julliard(a)winehq.org>
Date:   Thu Nov 15 13:29:21 2012 +0100

gdi32: Don't load bitmap glyphs when using subpixel rendering in GetGlyphOutline.

---

 dlls/gdi32/freetype.c |    7 +------
 1 files changed, 1 insertions(+), 6 deletions(-)

diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c
index 79a0975..98c66a0 100644
--- a/dlls/gdi32/freetype.c
+++ b/dlls/gdi32/freetype.c
@@ -5997,12 +5997,7 @@ static DWORD get_glyph_outline(GdiFont *incoming_font, UINT glyph, UINT format,
         needsTransform = TRUE;
     }
 
-    if (needsTransform || (format == GGO_NATIVE || format == GGO_BEZIER ||
-                           format == GGO_GRAY2_BITMAP || format == GGO_GRAY4_BITMAP ||
-                           format == GGO_GRAY8_BITMAP))
-    {
-        load_flags |= FT_LOAD_NO_BITMAP;
-    }
+    if (needsTransform || format != GGO_BITMAP) load_flags |= FT_LOAD_NO_BITMAP;
 
     err = pFT_Load_Glyph(ft_face, glyph_index, load_flags);