Remove all lcd_filter code.

We reverted the public API for setting lcd_filter font options
back in 1b42bc8033bc , but we had left the implementation which
would examine fontconfig and Xft properties for the option, and
which would call into freetype for subpixel glyph rasterization.

However, I recently realized, (and the test suite had been trying
to tell me for a while), that this approach would cause a
regression for users who were previously using sub-pixel text,
but without sub-pixel rendering built directly into freetype.
That's not acceptable, so all the code is coming out for now.

1 files changed, 0 insertions, 28 deletions

diff --git a/src/cairo-xlib-screen.c b/src/cairo-xlib-screen.c
index 37e341889..f670b8ae7 100644
--- a/src/cairo-xlib-screen.c
+++ b/src/cairo-xlib-screen.c
@@ -150,22 +150,13 @@ _cairo_xlib_init_screen_font_options (Display *dpy, cairo_xlib_screen_info_t *in
     cairo_bool_t xft_antialias;
     int xft_hintstyle;
     int xft_rgba;
-    int xft_lcdfilter;
     cairo_antialias_t antialias;
     cairo_subpixel_order_t subpixel_order;
-    cairo_lcd_filter_t lcd_filter;
     cairo_hint_style_t hint_style;
 
     if (!get_boolean_default (dpy, "antialias", &xft_antialias))
 	xft_antialias = TRUE;
 
-    if (!get_integer_default (dpy, "lcdfilter", &xft_lcdfilter)) {
-	/* -1 is an non-existant Fontconfig constant used to differentiate
-	 * the case when no lcdfilter property is available.
-	 */
-	xft_lcdfilter = -1;
-    }
-
     if (!get_boolean_default (dpy, "hinting", &xft_hinting))
 	xft_hinting = TRUE;
 
@@ -248,24 +239,6 @@ _cairo_xlib_init_screen_font_options (Display *dpy, cairo_xlib_screen_info_t *in
 	subpixel_order = CAIRO_SUBPIXEL_ORDER_DEFAULT;
     }
 
-    switch (xft_lcdfilter) {
-    case FC_LCD_NONE:
-	lcd_filter = CAIRO_LCD_FILTER_NONE;
-	break;
-    case FC_LCD_DEFAULT:
-	lcd_filter = CAIRO_LCD_FILTER_FIR5;
-	break;
-    case FC_LCD_LIGHT:
-	lcd_filter = CAIRO_LCD_FILTER_FIR3;
-	break;
-    case FC_LCD_LEGACY:
-	lcd_filter = CAIRO_LCD_FILTER_INTRA_PIXEL;
-	break;
-    default:
-	lcd_filter = CAIRO_LCD_FILTER_DEFAULT;
-	break;
-    }
-
     if (xft_antialias) {
 	if (subpixel_order == CAIRO_SUBPIXEL_ORDER_DEFAULT)
 	    antialias = CAIRO_ANTIALIAS_GRAY;
@@ -278,7 +251,6 @@ _cairo_xlib_init_screen_font_options (Display *dpy, cairo_xlib_screen_info_t *in
     cairo_font_options_set_hint_style (&info->font_options, hint_style);
     cairo_font_options_set_antialias (&info->font_options, antialias);
     cairo_font_options_set_subpixel_order (&info->font_options, subpixel_order);
-    _cairo_font_options_set_lcd_filter (&info->font_options, lcd_filter);
     cairo_font_options_set_hint_metrics (&info->font_options, CAIRO_HINT_METRICS_ON);
 }