Dmitry Timoshkov : gdi32: Revert an unrelated part of 028617b90ba586bdb30723c700eea888c159ada7.

Alexandre Julliard julliard at winehq.org
Fri Feb 27 10:02:43 CST 2009


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

Author: Dmitry Timoshkov <dmitry at codeweavers.com>
Date:   Fri Feb 27 17:57:39 2009 +0800

gdi32: Revert an unrelated part of 028617b90ba586bdb30723c700eea888c159ada7.

It was not a very nice idea to break bitmap fonts which request a custom
width (therefore a transformation) in a patch that pretended to do something
unrelated.

---

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

diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c
index 6ca35c3..54bb999 100644
--- a/dlls/gdi32/freetype.c
+++ b/dlls/gdi32/freetype.c
@@ -4606,9 +4606,9 @@ DWORD WineEngGetGlyphOutline(GdiFont *incoming_font, UINT glyph, UINT format,
     }
 
     if(ft_face->glyph->format != ft_glyph_format_outline &&
-       (needsTransform || format == GGO_NATIVE || format == GGO_BEZIER ||
-                          format == GGO_GRAY2_BITMAP || format == GGO_GRAY4_BITMAP ||
-                          format == GGO_GRAY8_BITMAP))
+       (format == GGO_NATIVE || format == GGO_BEZIER ||
+        format == GGO_GRAY2_BITMAP || format == GGO_GRAY4_BITMAP ||
+        format == GGO_GRAY8_BITMAP))
     {
         TRACE("loaded a bitmap\n");
         LeaveCriticalSection( &freetype_cs );




More information about the wine-cvs mailing list