[cairo-commit] 2 commits - src/cairo-ft-font.c

[GitLab Mirror]

 src/cairo-ft-font.c |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 6e3cacc90f623d8b4900f05df961f85eb67dc5df
Merge: a0e7e472c b50b168a2
Author: Emmanuele Bassi <ebassi at gmail.com>
Date:   Mon May 9 21:18:04 2022 +0000

    Merge branch 'ft-default-lcd-filter' into 'master'
    
    Set default LCD filter to FreeType's default
    
    See merge request cairo/cairo!1

commit b50b168a2e1ab7fa5804eb0b23795e23be93bd17
Author: Nikolaus Waxweiler <madigens at gmail.com>
Date:   Sat Nov 10 16:44:23 2018 +0000

    Set default LCD filter to FreeType's default

diff --git a/src/cairo-ft-font.c b/src/cairo-ft-font.c
index df1aa5b18..3733d8073 100644
--- a/src/cairo-ft-font.c
+++ b/src/cairo-ft-font.c
@@ -1423,7 +1423,7 @@ _render_glyph_outline (FT_Face                    face,
 		       cairo_image_surface_t	**surface)
 {
     int rgba = FC_RGBA_UNKNOWN;
-    int lcd_filter = FT_LCD_FILTER_LEGACY;
+    int lcd_filter = FT_LCD_FILTER_DEFAULT;
     FT_GlyphSlot glyphslot = face->glyph;
     FT_Outline *outline = &glyphslot->outline;
     FT_Bitmap bitmap;
@@ -1458,13 +1458,13 @@ _render_glyph_outline (FT_Face                    face,
 	case CAIRO_LCD_FILTER_NONE:
 	    lcd_filter = FT_LCD_FILTER_NONE;
 	    break;
-	case CAIRO_LCD_FILTER_DEFAULT:
 	case CAIRO_LCD_FILTER_INTRA_PIXEL:
 	    lcd_filter = FT_LCD_FILTER_LEGACY;
 	    break;
 	case CAIRO_LCD_FILTER_FIR3:
 	    lcd_filter = FT_LCD_FILTER_LIGHT;
 	    break;
+	case CAIRO_LCD_FILTER_DEFAULT:
 	case CAIRO_LCD_FILTER_FIR5:
 	    lcd_filter = FT_LCD_FILTER_DEFAULT;
 	    break;
@@ -3540,7 +3540,6 @@ _cairo_ft_font_options_substitute (const cairo_font_options_t *options,
 	    case CAIRO_LCD_FILTER_NONE:
 		lcd_filter = FT_LCD_FILTER_NONE;
 		break;
-	    case CAIRO_LCD_FILTER_DEFAULT:
 	    case CAIRO_LCD_FILTER_INTRA_PIXEL:
 		lcd_filter = FT_LCD_FILTER_LEGACY;
 		break;
@@ -3548,6 +3547,7 @@ _cairo_ft_font_options_substitute (const cairo_font_options_t *options,
 		lcd_filter = FT_LCD_FILTER_LIGHT;
 		break;
 	    default:
+	    case CAIRO_LCD_FILTER_DEFAULT:
 	    case CAIRO_LCD_FILTER_FIR5:
 		lcd_filter = FT_LCD_FILTER_DEFAULT;
 		break;