Byeongsik Jeon : gdi32: Respect the FC_ANTIALIAS setting for the FC_RGBA_NONE case.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 2b52474fdd192d466f3ccf24bf6ad623eff6a659
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=2b52474fdd192d466f3ccf24b...

Author: Byeongsik Jeon <bsjeon(a)hanmail.net>
Date:   Mon Oct 29 21:50:21 2018 +0900

gdi32: Respect the FC_ANTIALIAS setting for the FC_RGBA_NONE case.

Signed-off-by: Byeongsik Jeon <bsjeon(a)hanmail.net>
Signed-off-by: Huw Davies <huw(a)codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>

---

 dlls/gdi32/freetype.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c
index e37880a..b62288c 100644
--- a/dlls/gdi32/freetype.c
+++ b/dlls/gdi32/freetype.c
@@ -2772,7 +2772,7 @@ static UINT parse_aa_pattern( FcPattern *pattern )
         case FC_RGBA_BGR:  aa_flags = WINE_GGO_HBGR_BITMAP; break;
         case FC_RGBA_VRGB: aa_flags = WINE_GGO_VRGB_BITMAP; break;
         case FC_RGBA_VBGR: aa_flags = WINE_GGO_VBGR_BITMAP; break;
-        case FC_RGBA_NONE: aa_flags = GGO_GRAY4_BITMAP; break;
+        case FC_RGBA_NONE: aa_flags = aa_flags ? aa_flags : GGO_GRAY4_BITMAP; break;
         }
     }
     return aa_flags;