[PATCH v2 1/3] gdi32: Support other settings for obtaining the default_aa_flags value.
Byeongsik Jeon
bsjeon at hanmail.net
Tue Oct 23 11:07:11 CDT 2018
Signed-off-by: Byeongsik Jeon <bsjeon at hanmail.net>
---
v2: nothing changed. [2/3] patch changed.
v1:
The global subpixel alignment setting are:
1. fontconfig builtin 10-sub-pixel-rgb.conf.
<match target="pattern">
<edit name="rgba" mode="assign"><const>rgb</const></edit>
</match>
2. Current Wine, or the recommendation of some web pages.
<match target="font">
<edit name="rgba" mode="assign"><const>rgb</const></edit>
</match>
This patch allows both situations to return the correct value.
dlls/gdi32/freetype.c | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c
index 5b1a23bf32..7cc42b2a47 100644
--- a/dlls/gdi32/freetype.c
+++ b/dlls/gdi32/freetype.c
@@ -2812,6 +2812,15 @@ static void init_fontconfig(void)
pFcConfigSubstitute( NULL, pattern, FcMatchFont );
default_aa_flags = parse_aa_pattern( pattern );
pFcPatternDestroy( pattern );
+
+ if (!default_aa_flags)
+ {
+ FcPattern *pattern = pFcPatternCreate();
+ pFcConfigSubstitute( NULL, pattern, FcMatchPattern );
+ default_aa_flags = parse_aa_pattern( pattern );
+ pFcPatternDestroy( pattern );
+ }
+
TRACE( "enabled, default flags = %x\n", default_aa_flags );
fontconfig_enabled = TRUE;
}
--
2.19.1
More information about the wine-devel
mailing list