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, 1 insertions, 50 deletions

diff --git a/src/cairo-font-options.c b/src/cairo-font-options.c
index 64a89110..dedd3379 100644
--- a/src/cairo-font-options.c
+++ b/src/cairo-font-options.c
@@ -39,7 +39,6 @@
 static const cairo_font_options_t _cairo_font_options_nil = {
     CAIRO_ANTIALIAS_DEFAULT,
     CAIRO_SUBPIXEL_ORDER_DEFAULT,
-    CAIRO_LCD_FILTER_DEFAULT,
     CAIRO_HINT_STYLE_DEFAULT,
     CAIRO_HINT_METRICS_DEFAULT
 };
@@ -55,7 +54,6 @@ _cairo_font_options_init_default (cairo_font_options_t *options)
 {
     options->antialias = CAIRO_ANTIALIAS_DEFAULT;
     options->subpixel_order = CAIRO_SUBPIXEL_ORDER_DEFAULT;
-    options->lcd_filter = CAIRO_LCD_FILTER_DEFAULT;
     options->hint_style = CAIRO_HINT_STYLE_DEFAULT;
     options->hint_metrics = CAIRO_HINT_METRICS_DEFAULT;
 }
@@ -66,7 +64,6 @@ _cairo_font_options_init_copy (cairo_font_options_t		*options,
 {
     options->antialias = other->antialias;
     options->subpixel_order = other->subpixel_order;
-    options->lcd_filter = other->lcd_filter;
     options->hint_style = other->hint_style;
     options->hint_metrics = other->hint_metrics;
 }
@@ -192,8 +189,6 @@ cairo_font_options_merge (cairo_font_options_t       *options,
 	options->antialias = other->antialias;
     if (other->subpixel_order != CAIRO_SUBPIXEL_ORDER_DEFAULT)
 	options->subpixel_order = other->subpixel_order;
-    if (other->lcd_filter != CAIRO_LCD_FILTER_DEFAULT)
-	options->lcd_filter = other->lcd_filter;
     if (other->hint_style != CAIRO_HINT_STYLE_DEFAULT)
 	options->hint_style = other->hint_style;
     if (other->hint_metrics != CAIRO_HINT_METRICS_DEFAULT)
@@ -226,7 +221,6 @@ cairo_font_options_equal (const cairo_font_options_t *options,
 
     return (options->antialias == other->antialias &&
 	    options->subpixel_order == other->subpixel_order &&
-	    options->lcd_filter == other->lcd_filter &&
 	    options->hint_style == other->hint_style &&
 	    options->hint_metrics == other->hint_metrics);
 }
@@ -252,8 +246,7 @@ cairo_font_options_hash (const cairo_font_options_t *options)
 
     return ((options->antialias) |
 	    (options->subpixel_order << 4) |
-	    (options->lcd_filter << 8) |
-	    (options->hint_style << 12) |
+	    (options->hint_style << 8) |
 	    (options->hint_metrics << 16));
 }
 slim_hidden_def (cairo_font_options_hash);
@@ -335,48 +328,6 @@ cairo_font_options_get_subpixel_order (const cairo_font_options_t *options)
 }
 
 /**
- * _cairo_font_options_set_lcd_filter:
- * @options: a #cairo_font_options_t
- * @lcd_filter: the new LCD filter
- *
- * Sets the LCD filter for the font options object. The LCD filter
- * specifies how pixels are filtered when rendered with an antialiasing
- * mode of %CAIRO_ANTIALIAS_SUBPIXEL. See the documentation for
- * #cairo_lcd_filter_t for full details.
- *
- * Since: 1.8
- **/
-void
-_cairo_font_options_set_lcd_filter (cairo_font_options_t *options,
-				    cairo_lcd_filter_t    lcd_filter)
-{
-    if (cairo_font_options_status (options))
-	return;
-
-    options->lcd_filter = lcd_filter;
-}
-
-/**
- * _cairo_font_options_get_lcd_filter:
- * @options: a #cairo_font_options_t
- *
- * Gets the LCD filter for the font options object.
- * See the documentation for #cairo_lcd_filter_t for full details.
- *
- * Return value: the LCD filter for the font options object
- *
- * Since: 1.8
- **/
-cairo_lcd_filter_t
-_cairo_font_options_get_lcd_filter (const cairo_font_options_t *options)
-{
-    if (cairo_font_options_status ((cairo_font_options_t *) options))
-	return CAIRO_LCD_FILTER_DEFAULT;
-
-    return options->lcd_filter;
-}
-
-/**
  * cairo_font_options_set_hint_style:
  * @options: a #cairo_font_options_t
  * @hint_style: the new hint style