SOURCES: cairo-lcd-filter.patch (NEW), cairo-1.2.4-lcd-filter-1.patch (REMO...
qrczak
qrczak at pld-linux.org
Fri Jun 13 14:53:05 CEST 2008
Author: qrczak Date: Fri Jun 13 12:53:05 2008 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- Updated the lcd patch, taken from
http://bugs.freedesktop.org/show_bug.cgi?id=10301#c47
It needs changes in ~/.fonts.conf (described there) to take effect,
with lcddefault instead of lcdlegacy.
- Release 2.
---- Files affected:
SOURCES:
cairo-lcd-filter.patch (NONE -> 1.1) (NEW), cairo-1.2.4-lcd-filter-1.patch (1.4 -> NONE) (REMOVED)
---- Diffs:
================================================================
Index: SOURCES/cairo-lcd-filter.patch
diff -u /dev/null SOURCES/cairo-lcd-filter.patch:1.1
--- /dev/null Fri Jun 13 14:53:05 2008
+++ SOURCES/cairo-lcd-filter.patch Fri Jun 13 14:53:00 2008
@@ -0,0 +1,1050 @@
+diff --git a/doc/public/cairo-sections.txt b/doc/public/cairo-sections.txt
+index 98cc974..d40790b 100644
+--- a/doc/public/cairo-sections.txt
++++ b/doc/public/cairo-sections.txt
+@@ -304,6 +304,9 @@ cairo_font_options_get_antialias
+ cairo_subpixel_order_t
+ cairo_font_options_set_subpixel_order
+ cairo_font_options_get_subpixel_order
++cairo_lcd_filter_t
++cairo_font_options_set_lcd_filter
++cairo_font_options_get_lcd_filter
+ cairo_hint_style_t
+ cairo_font_options_set_hint_style
+ cairo_font_options_get_hint_style
+diff --git a/src/cairo-font-options.c b/src/cairo-font-options.c
+index dedd337..9e47a9c 100644
+--- a/src/cairo-font-options.c
++++ b/src/cairo-font-options.c
+@@ -39,6 +39,7 @@
+ 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
+ };
+@@ -54,6 +55,7 @@ _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;
+ }
+@@ -64,6 +66,7 @@ _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;
+ }
+@@ -189,6 +192,8 @@ 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)
+@@ -221,6 +226,7 @@ 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);
+ }
+@@ -246,7 +252,8 @@ cairo_font_options_hash (const cairo_font_options_t *options)
+
+ return ((options->antialias) |
+ (options->subpixel_order << 4) |
+- (options->hint_style << 8) |
++ (options->lcd_filter << 8) |
++ (options->hint_style << 12) |
+ (options->hint_metrics << 16));
+ }
+ slim_hidden_def (cairo_font_options_hash);
+@@ -328,6 +335,44 @@ 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.
++ **/
++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
++ **/
++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
+diff --git a/src/cairo-ft-font.c b/src/cairo-ft-font.c
+index 95da10b..eb35f67 100644
+--- a/src/cairo-ft-font.c
++++ b/src/cairo-ft-font.c
+@@ -56,6 +56,8 @@
+ #include FT_SYNTHESIS_H
+ #endif
+
++#include FT_LCD_FILTER_H
++
+ #define DOUBLE_TO_26_6(d) ((FT_F26Dot6)((d) * 64.0))
+ #define DOUBLE_FROM_26_6(t) ((double)(t) / 64.0)
+ #define DOUBLE_TO_16_16(d) ((FT_Fixed)((d) * 65536.0))
+@@ -724,23 +726,286 @@ _cairo_ft_unscaled_font_set_scale (cairo_ft_unscaled_font_t *unscaled,
+ return CAIRO_STATUS_SUCCESS;
+ }
+
+-/* Empirically-derived subpixel filtering values thanks to Keith
+- * Packard and libXft. */
+-static const int filters[3][3] = {
+- /* red */
+-#if 0
+- { 65538*4/7,65538*2/7,65538*1/7 },
+- /* green */
+- { 65536*1/4, 65536*2/4, 65537*1/4 },
+- /* blue */
+- { 65538*1/7,65538*2/7,65538*4/7 },
++/* we sometimes need to convert the glyph bitmap in a FT_GlyphSlot
++ * into a different format. For example, we want to convert a
++ * FT_PIXEL_MODE_LCD or FT_PIXEL_MODE_LCD_V bitmap into a 32-bit
++ * ARGB or ABGR bitmap.
++ *
++ * this function prepares a target descriptor for this operation.
++ *
++ * input :: target bitmap descriptor. The function will set its
++ * 'width', 'rows' and 'pitch' fields, and only these
++ *
++ * slot :: the glyph slot containing the source bitmap. this
++ * function assumes that slot->format == FT_GLYPH_FORMAT_BITMAP
++ *
++ * mode :: the requested final rendering mode. supported values are
++ * MONO, NORMAL (i.e. gray), LCD and LCD_V
++ *
++ * the function returns the size in bytes of the corresponding buffer,
++ * it's up to the caller to allocate the corresponding memory block
++ * before calling _fill_xrender_bitmap
++ *
++ * it also returns -1 in case of error (e.g. incompatible arguments,
++ * like trying to convert a gray bitmap into a monochrome one)
++ */
++static int
++_compute_xrender_bitmap_size(FT_Bitmap *target,
++ FT_GlyphSlot slot,
++ FT_Render_Mode mode)
++{
++ FT_Bitmap *ftbit;
++ int width, height, pitch;
++
++ if (slot->format != FT_GLYPH_FORMAT_BITMAP)
++ return -1;
++
++ // compute the size of the final bitmap
++ ftbit = &slot->bitmap;
++
++ width = ftbit->width;
++ height = ftbit->rows;
++ pitch = (width + 3) & ~3;
++
++ switch (ftbit->pixel_mode) {
++ case FT_PIXEL_MODE_MONO:
++ if (mode == FT_RENDER_MODE_MONO) {
++ pitch = (((width + 31) & ~31) >> 3);
++ break;
++ }
++ /* fall-through */
++
++ case FT_PIXEL_MODE_GRAY:
++ if (mode == FT_RENDER_MODE_LCD ||
++ mode == FT_RENDER_MODE_LCD_V)
++ {
++ /* each pixel is replicated into a 32-bit ARGB value */
++ pitch = width * 4;
++ }
++ break;
++
++ case FT_PIXEL_MODE_LCD:
++ if (mode != FT_RENDER_MODE_LCD)
++ return -1;
++
++ /* horz pixel triplets are packed into 32-bit ARGB values */
++ width /= 3;
++ pitch = width * 4;
++ break;
++
++ case FT_PIXEL_MODE_LCD_V:
++ if (mode != FT_RENDER_MODE_LCD_V)
++ return -1;
++
++ /* vert pixel triplets are packed into 32-bit ARGB values */
++ height /= 3;
++ pitch = width * 4;
++ break;
++
++ default: /* unsupported source format */
++ return -1;
++ }
++
++ target->width = width;
++ target->rows = height;
++ target->pitch = pitch;
++ target->buffer = NULL;
++
++ return pitch * height;
++}
++
++/* this functions converts the glyph bitmap found in a FT_GlyphSlot
++ * into a different format (see _compute_xrender_bitmap_size)
++ *
++ * you should call this function after _compute_xrender_bitmap_size
++ *
++ * target :: target bitmap descriptor. Note that its 'buffer' pointer
++ * must point to memory allocated by the caller
++ *
++ * slot :: the glyph slot containing the source bitmap
++ *
++ * mode :: the requested final rendering mode
++ *
++ * bgr :: boolean, set if BGR or VBGR pixel ordering is needed
++ */
++static void
++_fill_xrender_bitmap(FT_Bitmap *target,
++ FT_GlyphSlot slot,
++ FT_Render_Mode mode,
++ int bgr)
++{
++ FT_Bitmap *ftbit = &slot->bitmap;
++ unsigned char *srcLine = ftbit->buffer;
++ unsigned char *dstLine = target->buffer;
++ int src_pitch = ftbit->pitch;
++ int width = target->width;
++ int height = target->rows;
++ int pitch = target->pitch;
++ int subpixel;
++ int h;
++
++ subpixel = (mode == FT_RENDER_MODE_LCD ||
++ mode == FT_RENDER_MODE_LCD_V);
++
++ if (src_pitch < 0)
++ srcLine -= src_pitch * (ftbit->rows - 1);
++
++ target->pixel_mode = ftbit->pixel_mode;
++
++ switch (ftbit->pixel_mode) {
++ case FT_PIXEL_MODE_MONO:
++ if (subpixel) {
++ /* convert mono to ARGB32 values */
++
++ for (h = height; h > 0; h--, srcLine += src_pitch, dstLine += pitch) {
++ int x;
++
++ for (x = 0; x < width; x++) {
++ if (srcLine[(x >> 3)] & (0x80 >> (x & 7)))
++ ((unsigned int *) dstLine)[x] = 0xffffffffU;
++ }
++ }
++ target->pixel_mode = FT_PIXEL_MODE_LCD;
++
++ } else if (mode == FT_RENDER_MODE_NORMAL) {
++ /* convert mono to 8-bit gray */
++
++ for (h = height; h > 0; h--, srcLine += src_pitch, dstLine += pitch) {
++ int x;
++
++ for (x = 0; x < width; x++) {
++ if (srcLine[(x >> 3)] & (0x80 >> (x & 7)))
++ dstLine[x] = 0xff;
++ }
++ }
++ target->pixel_mode = FT_PIXEL_MODE_GRAY;
++
++ } else {
++ /* copy mono to mono */
++
++ int bytes = (width + 7) >> 3;
++
++ for (h = height; h > 0; h--, srcLine += src_pitch, dstLine += pitch)
++ memcpy (dstLine, srcLine, bytes);
++ }
++ break;
++
++ case FT_PIXEL_MODE_GRAY:
++ if (subpixel) {
++ /* convert gray to ARGB32 values */
++
++ for (h = height; h > 0; h--, srcLine += src_pitch, dstLine += pitch) {
++ int x;
++ unsigned int *dst = (unsigned int *) dstLine;
++
++ for (x = 0; x < width; x++) {
++ unsigned int pix = srcLine[x];
++
++ pix |= (pix << 8);
++ pix |= (pix << 16);
++
++ dst[x] = pix;
++ }
++ }
++ target->pixel_mode = FT_PIXEL_MODE_LCD;
++ } else {
++ /* copy gray into gray */
++
++ for (h = height; h > 0; h--, srcLine += src_pitch, dstLine += pitch)
++ memcpy (dstLine, srcLine, width);
++ }
++ break;
++
++ case FT_PIXEL_MODE_LCD:
++ if (!bgr) {
++ /* convert horizontal RGB into ARGB32 */
++
++ for (h = height; h > 0; h--, srcLine += src_pitch, dstLine += pitch) {
++ int x;
++ unsigned char *src = srcLine;
++ unsigned int *dst = (unsigned int *) dstLine;
++
++ for (x = 0; x < width; x++, src += 3) {
++ unsigned int pix;
++
++ pix = ((unsigned int)src[0] << 16) |
++ ((unsigned int)src[1] << 8) |
++ ((unsigned int)src[2] ) |
++ ((unsigned int)src[1] << 24) ;
++
++ dst[x] = pix;
++ }
++ }
++ } else {
++ /* convert horizontal BGR into ARGB32 */
++
++ for (h = height; h > 0; h--, srcLine += src_pitch, dstLine += pitch) {
++
++ int x;
++ unsigned char *src = srcLine;
++ unsigned int *dst = (unsigned int *) dstLine;
++
++ for (x = 0; x < width; x++, src += 3) {
++ unsigned int pix;
++
++ pix = ((unsigned int)src[2] << 16) |
++ ((unsigned int)src[1] << 8) |
++ ((unsigned int)src[0] ) |
++ ((unsigned int)src[1] << 24) ;
++
++ dst[x] = pix;
++ }
++ }
++ }
++ break;
++
++ default: /* FT_PIXEL_MODE_LCD_V */
++ /* convert vertical RGB into ARGB32 */
++ if (!bgr) {
++
++ for (h = height; h > 0; h--, srcLine += 3 * src_pitch, dstLine += pitch) {
++ int x;
++ unsigned char* src = srcLine;
++ unsigned int* dst = (unsigned int *) dstLine;
++
++ for (x = 0; x < width; x++, src += 1) {
++ unsigned int pix;
++#if 1
++ pix = ((unsigned int)src[0] << 16) |
++ ((unsigned int)src[src_pitch] << 8) |
++ ((unsigned int)src[src_pitch*2] ) |
++ 0xFF000000 ;
++#else
++ pix = ((unsigned int)src[0] << 16) |
++ ((unsigned int)src[src_pitch] << 8) |
++ ((unsigned int)src[src_pitch*2] ) |
++ ((unsigned int)src[src_pitch] << 24) ;
+ #endif
+- { 65538*9/13,65538*3/13,65538*1/13 },
+- /* green */
+- { 65538*1/6, 65538*4/6, 65538*1/6 },
+- /* blue */
+- { 65538*1/13,65538*3/13,65538*9/13 },
+-};
++ dst[x] = pix;
++ }
++ }
++ } else {
++
++ for (h = height; h > 0; h--, srcLine += 3*src_pitch, dstLine += pitch) {
++ int x;
++ unsigned char *src = srcLine;
++ unsigned int *dst = (unsigned int *) dstLine;
++
++ for (x = 0; x < width; x++, src += 1) {
++ unsigned int pix;
++
++ pix = ((unsigned int)src[src_pitch * 2] << 16) |
++ ((unsigned int)src[src_pitch] << 8) |
++ ((unsigned int)src[0] ) |
++ ((unsigned int)src[src_pitch] << 24) ;
++
++ dst[x] = pix;
++ }
++ }
++ }
++ }
++}
++
+
+ /* Fills in val->image with an image surface created from @bitmap
+ */
+@@ -753,7 +1018,7 @@ _get_bitmap_surface (FT_Bitmap *bitmap,
+ int width, height, stride;
+ unsigned char *data;
+ int format = CAIRO_FORMAT_A8;
+- cairo_bool_t subpixel = FALSE;
++ cairo_image_surface_t *image;
+
+ width = bitmap->width;
+ height = bitmap->rows;
+@@ -810,11 +1075,7 @@ _get_bitmap_surface (FT_Bitmap *bitmap,
+ case FT_PIXEL_MODE_LCD:
+ case FT_PIXEL_MODE_LCD_V:
+ case FT_PIXEL_MODE_GRAY:
+- switch (font_options->antialias) {
+- case CAIRO_ANTIALIAS_DEFAULT:
+- case CAIRO_ANTIALIAS_GRAY:
+- case CAIRO_ANTIALIAS_NONE:
+- default:
++ if (font_options->antialias != CAIRO_ANTIALIAS_SUBPIXEL) {
+ stride = bitmap->pitch;
+ if (own_buffer) {
+ data = bitmap->buffer;
+@@ -826,104 +1087,16 @@ _get_bitmap_surface (FT_Bitmap *bitmap,
+ memcpy (data, bitmap->buffer, stride * height);
+ }
+ format = CAIRO_FORMAT_A8;
+- break;
+- case CAIRO_ANTIALIAS_SUBPIXEL: {
+- int x, y;
+- unsigned char *in_line, *out_line, *in;
+- unsigned int *out;
+- unsigned int red, green, blue;
+- int rf, gf, bf;
+- int s;
+- int o, os;
+- unsigned char *data_rgba;
+- unsigned int width_rgba, stride_rgba;
+- int vmul = 1;
+- int hmul = 1;
+-
+- switch (font_options->subpixel_order) {
+- case CAIRO_SUBPIXEL_ORDER_DEFAULT:
+- case CAIRO_SUBPIXEL_ORDER_RGB:
+- case CAIRO_SUBPIXEL_ORDER_BGR:
+- default:
+- width /= 3;
+- hmul = 3;
+- break;
+- case CAIRO_SUBPIXEL_ORDER_VRGB:
+- case CAIRO_SUBPIXEL_ORDER_VBGR:
+- vmul = 3;
+- height /= 3;
+- break;
+- }
+- /*
+- * Filter the glyph to soften the color fringes
+- */
+- width_rgba = width;
++ } else {
++ // if we get there, the data from the source bitmap
++ // really comes from _fill_xrender_bitmap, and is
++ // made of 32-bit ARGB or ABGR values
++ assert (own_buffer != 0);
++ assert (bitmap->pixel_mode != FT_PIXEL_MODE_GRAY);
++
++ data = bitmap->buffer;
+ stride = bitmap->pitch;
+- stride_rgba = (width_rgba * 4 + 3) & ~3;
+- data_rgba = calloc (stride_rgba, height);
+- if (data_rgba == NULL) {
+- if (own_buffer)
+- free (bitmap->buffer);
+- return _cairo_error (CAIRO_STATUS_NO_MEMORY);
+- }
+-
+- os = 1;
+- switch (font_options->subpixel_order) {
+- case CAIRO_SUBPIXEL_ORDER_VRGB:
+- os = stride;
+- case CAIRO_SUBPIXEL_ORDER_DEFAULT:
+- case CAIRO_SUBPIXEL_ORDER_RGB:
+- default:
+- rf = 0;
+- gf = 1;
+- bf = 2;
+- break;
+- case CAIRO_SUBPIXEL_ORDER_VBGR:
+- os = stride;
+- case CAIRO_SUBPIXEL_ORDER_BGR:
+- bf = 0;
+- gf = 1;
+- rf = 2;
+- break;
+- }
+- in_line = bitmap->buffer;
+- out_line = data_rgba;
+- for (y = 0; y < height; y++)
+- {
+- in = in_line;
+- out = (unsigned int *) out_line;
+- in_line += stride * vmul;
+- out_line += stride_rgba;
+- for (x = 0; x < width * hmul; x += hmul)
+- {
+- red = green = blue = 0;
+- o = 0;
+- for (s = 0; s < 3; s++)
+- {
+- red += filters[rf][s]*in[x+o];
+- green += filters[gf][s]*in[x+o];
+- blue += filters[bf][s]*in[x+o];
+- o += os;
+- }
+- red = red / 65536;
+- green = green / 65536;
+- blue = blue / 65536;
+- *out++ = (green << 24) | (red << 16) | (green << 8) | blue;
+- }
+- }
+-
+- /* Images here are stored in native format. The
+- * backend must convert to its own format as needed
+- */
+-
+- if (own_buffer)
+- free (bitmap->buffer);
+- data = data_rgba;
+- stride = stride_rgba;
+ format = CAIRO_FORMAT_ARGB32;
+- subpixel = TRUE;
+- break;
+- }
+ }
+ break;
+ case FT_PIXEL_MODE_GRAY2:
+@@ -935,19 +1108,20 @@ _get_bitmap_surface (FT_Bitmap *bitmap,
+ return _cairo_error (CAIRO_STATUS_NO_MEMORY);
+ }
+
+- *surface = (cairo_image_surface_t *)
++ /* XXX */
++ *surface = image = (cairo_image_surface_t *)
+ cairo_image_surface_create_for_data (data,
+ format,
+ width, height, stride);
+- if ((*surface)->base.status) {
++ if (image->base.status) {
+ free (data);
+ return (*surface)->base.status;
+ }
+
+- if (subpixel)
+- pixman_image_set_component_alpha ((*surface)->pixman_image, TRUE);
++ if (font_options->antialias == CAIRO_ANTIALIAS_SUBPIXEL)
++ pixman_image_set_component_alpha (image->pixman_image, TRUE);
+
+- _cairo_image_surface_assume_ownership_of_data ((*surface));
++ _cairo_image_surface_assume_ownership_of_data (image);
+
+ return CAIRO_STATUS_SUCCESS;
+ }
<<Diff was trimmed, longer than 597 lines>>
More information about the pld-cvs-commit
mailing list