Byeongsik Jeon : gdi32: Improves the subpixel rendering availability for FreeType 2.8.1+.
Alexandre Julliard
julliard at winehq.org
Tue Oct 9 16:22:47 CDT 2018
Module: wine
Branch: master
Commit: 66e446c5ec5c7f4f072358712151d75305dfbd49
URL: https://source.winehq.org/git/wine.git/?a=commit;h=66e446c5ec5c7f4f072358712151d75305dfbd49
Author: Byeongsik Jeon <bsjeon at hanmail.net>
Date: Tue Oct 9 14:11:07 2018 +0900
gdi32: Improves the subpixel rendering availability for FreeType 2.8.1+.
FreeType 2.8.1+ implemented its own subpixel rendering.
So FT_Err_Uniplemented_Feature check is not the reliable way.
Signed-off-by: Byeongsik Jeon <bsjeon at hanmail.net>
Signed-off-by: Huw Davies <huw at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/gdi32/freetype.c | 22 ++++++++++++----------
1 file changed, 12 insertions(+), 10 deletions(-)
diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c
index 36a3431..2dd2dcd 100644
--- a/dlls/gdi32/freetype.c
+++ b/dlls/gdi32/freetype.c
@@ -993,18 +993,22 @@ static BOOL is_hinting_enabled(void)
static BOOL is_subpixel_rendering_enabled( void )
{
-#ifdef FT_LCD_FILTER_H
static int enabled = -1;
if (enabled == -1)
{
- enabled = (pFT_Library_SetLcdFilter &&
- pFT_Library_SetLcdFilter( NULL, 0 ) != FT_Err_Unimplemented_Feature);
+ /* FreeType >= 2.8.1 offers LCD-optimezed rendering without lcd filters. */
+ if (FT_SimpleVersion >= ((2 << 16) | (8 << 8) | (1 << 0)))
+ enabled = TRUE;
+#ifdef FT_LCD_FILTER_H
+ else if (pFT_Library_SetLcdFilter &&
+ pFT_Library_SetLcdFilter( NULL, 0 ) != FT_Err_Unimplemented_Feature)
+ enabled = TRUE;
+#endif
+ else enabled = FALSE;
+
TRACE("subpixel rendering is %senabled\n", enabled ? "" : "NOT ");
}
return enabled;
-#else
- return FALSE;
-#endif
}
@@ -7274,7 +7278,6 @@ static DWORD get_glyph_outline(GdiFont *incoming_font, UINT glyph, UINT format,
case WINE_GGO_HBGR_BITMAP:
case WINE_GGO_VRGB_BITMAP:
case WINE_GGO_VBGR_BITMAP:
-#ifdef FT_LCD_FILTER_H
{
switch (ft_face->glyph->format)
{
@@ -7360,8 +7363,10 @@ static DWORD get_glyph_outline(GdiFont *incoming_font, UINT glyph, UINT format,
if ( needsTransform )
pFT_Outline_Transform (&ft_face->glyph->outline, &transMatTategaki);
+#ifdef FT_LCD_FILTER_H
if ( pFT_Library_SetLcdFilter )
pFT_Library_SetLcdFilter( library, FT_LCD_FILTER_DEFAULT );
+#endif
pFT_Render_Glyph (ft_face->glyph, render_mode);
src = ft_face->glyph->bitmap.buffer;
@@ -7442,9 +7447,6 @@ static DWORD get_glyph_outline(GdiFont *incoming_font, UINT glyph, UINT format,
break;
}
-#else
- return GDI_ERROR;
-#endif
case GGO_NATIVE:
{
More information about the wine-cvs
mailing list