diff options
author | Behdad Esfahbod <behdad@behdad.org> | 2007-12-17 01:19:53 -0500 |
---|---|---|
committer | Carl Worth <cworth@cworth.org> | 2008-01-09 11:22:38 -0800 |
commit | 8776061068fba967dbafb43fac3af7df90464cb8 (patch) | |
tree | 7203ff1abf2cddb3155af56e41e05bc144a5ad8d | |
parent | ca1cd4c28e4082e42b843a805e27d7d2b3dfeb04 (diff) |
[cairo-ft] Revert "Force non-AA text when using a bitmap strike with only scaling transform." (#13479)
The reasoning for that commit was that fonts with bitmap strikes should be
rendered with antialiasing off for those (hopefully) few glyphs that don't
have a bitmap.
However, it turns out, there are fonts that have some, but very few, bitmaps,
and this changed forces non-AA rendering on them. We now support multiple
glyph formats per font in the Xlib backend, so backing this out to let every
glyph render as is. Fontconfig rules can be used to force AA off on a per-font
basis.
This reverts commit 06af5c2891b89da28581c30afcde06c5442884db.
(cherry picked from commit 83963d2a9ec445e23cfbe692b877177a9d9d135e)
-rw-r--r-- | src/cairo-ft-font.c | 24 |
1 files changed, 0 insertions, 24 deletions
diff --git a/src/cairo-ft-font.c b/src/cairo-ft-font.c index 804ecc2e..914dc0b6 100644 --- a/src/cairo-ft-font.c +++ b/src/cairo-ft-font.c @@ -1512,30 +1512,6 @@ _cairo_ft_scaled_font_create (cairo_ft_unscaled_font_t *unscaled, return NULL; } - /* - * Force non-AA drawing when using a bitmap strike that - * won't be resampled due to non-scaling transform - */ - if (!unscaled->have_shape && - (scaled_font->ft_options.load_flags & FT_LOAD_NO_BITMAP) == 0 && - scaled_font->ft_options.base.antialias != CAIRO_ANTIALIAS_NONE && - (face->face_flags & FT_FACE_FLAG_FIXED_SIZES)) - { - int i; - FT_Size_Metrics *size_metrics = &face->size->metrics; - - for (i = 0; i < face->num_fixed_sizes; i++) - { - FT_Bitmap_Size *bitmap_size = &face->available_sizes[i]; - - if (bitmap_size->x_ppem == size_metrics->x_ppem * 64 && - bitmap_size->y_ppem == size_metrics->y_ppem * 64) - { - scaled_font->ft_options.base.antialias = CAIRO_ANTIALIAS_NONE; - break; - } - } - } metrics = &face->size->metrics; |