From 0e7a3e61545f6fa48709f28817ab3e0b4b854fd4213036308e6faa7144b4f4cf Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Mon, 16 Feb 2009 17:36:22 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/cairo?expand=0&rev=22 --- bugzilla-104365.patch | 63 -- cairo-1.4.10-lcd-filter-1.patch | 729 ----------------- cairo-ac.patch | 13 - cairo-lcd-filter-fdo10301.patch | 1354 +++++++++++++++++++++++++++++++ cairo.changes | 10 + cairo.spec | 39 +- 6 files changed, 1382 insertions(+), 826 deletions(-) delete mode 100644 bugzilla-104365.patch delete mode 100644 cairo-1.4.10-lcd-filter-1.patch delete mode 100644 cairo-ac.patch create mode 100644 cairo-lcd-filter-fdo10301.patch diff --git a/bugzilla-104365.patch b/bugzilla-104365.patch deleted file mode 100644 index d409a66..0000000 --- a/bugzilla-104365.patch +++ /dev/null @@ -1,63 +0,0 @@ -Fri Apr 28 18:46:08 CEST 2006 - mfabian@suse.de - -- Bugzilla #104365: delete fontconfig pattern elements before - trying to add them if the intention is to override default - settings. - -https://bugs.freedesktop.org/show_bug.cgi?id=10413 -================================================================================ ---- cairo-1.4.10/src/cairo-ft-font.c -+++ cairo-1.4.10/src/cairo-ft-font.c -@@ -2321,20 +2321,16 @@ - - if (options->antialias != CAIRO_ANTIALIAS_DEFAULT) - { -- if (FcPatternGet (pattern, FC_ANTIALIAS, 0, &v) == FcResultNoMatch) -- { -+ FcPatternDel (pattern, FC_ANTIALIAS); - FcPatternAddBool (pattern, FC_ANTIALIAS, options->antialias != CAIRO_ANTIALIAS_NONE); - if (options->antialias != CAIRO_ANTIALIAS_SUBPIXEL) { - FcPatternDel (pattern, FC_RGBA); - FcPatternAddInteger (pattern, FC_RGBA, FC_RGBA_NONE); - } -- } - } - - if (options->antialias != CAIRO_ANTIALIAS_DEFAULT) - { -- if (FcPatternGet (pattern, FC_RGBA, 0, &v) == FcResultNoMatch) -- { - int rgba; - - if (options->antialias == CAIRO_ANTIALIAS_SUBPIXEL) { -@@ -2358,19 +2354,17 @@ - rgba = FC_RGBA_NONE; - } - -+ FcPatternDel (pattern, FC_RGBA); - FcPatternAddInteger (pattern, FC_RGBA, rgba); -- } - } - - if (options->hint_style != CAIRO_HINT_STYLE_DEFAULT) - { -- if (FcPatternGet (pattern, FC_HINTING, 0, &v) == FcResultNoMatch) -- { -+ -+ FcPatternDel (pattern, FC_HINTING); - FcPatternAddBool (pattern, FC_HINTING, options->hint_style != CAIRO_HINT_STYLE_NONE); -- } - - #ifdef FC_HINT_STYLE -- if (FcPatternGet (pattern, FC_HINT_STYLE, 0, &v) == FcResultNoMatch) - { - int hint_style; - -@@ -2391,6 +2385,7 @@ - break; - } - -+ FcPatternDel (pattern, FC_HINT_STYLE); - FcPatternAddInteger (pattern, FC_HINT_STYLE, hint_style); - } - #endif diff --git a/cairo-1.4.10-lcd-filter-1.patch b/cairo-1.4.10-lcd-filter-1.patch deleted file mode 100644 index b231bbd..0000000 --- a/cairo-1.4.10-lcd-filter-1.patch +++ /dev/null @@ -1,729 +0,0 @@ ---- cairo-1.4.10/src/cairo-ft-font.c -+++ cairo-1.4.10/src/cairo-ft-font.c -@@ -55,6 +55,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)) -@@ -701,23 +703,300 @@ - 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 - */ -@@ -730,12 +1009,14 @@ - 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; - -- switch (bitmap->pixel_mode) { -+ { -+ switch (bitmap->pixel_mode) -+ { - case FT_PIXEL_MODE_MONO: - stride = (((width + 31) & ~31) >> 3); - if (own_buffer) { -@@ -765,7 +1046,6 @@ - } - } - } -- - #ifndef WORDS_BIGENDIAN - { - unsigned char *d = data; -@@ -777,17 +1057,15 @@ - } - } - #endif -+ - format = CAIRO_FORMAT_A1; - break; - - 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; -@@ -800,107 +1078,19 @@ - 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; -+ } 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; -+ format = CAIRO_FORMAT_ARGB32; - } -- /* -- * Filter the glyph to soften the color fringes -- */ -- width_rgba = width; -- stride = bitmap->pitch; -- stride_rgba = (width_rgba * 4 + 3) & ~3; -- data_rgba = calloc (1, stride_rgba * height); -- if (data_rgba == NULL) { -- if (own_buffer) -- free (bitmap->buffer); -- _cairo_error (CAIRO_STATUS_NO_MEMORY); -- return 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: - case FT_PIXEL_MODE_GRAY4: - /* These could be triggered by very rare types of TrueType fonts */ -@@ -911,20 +1101,21 @@ - return 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 CAIRO_STATUS_NO_MEMORY; - } - -- if (subpixel) -- pixman_image_set_component_alpha ((*surface)->pixman_image, TRUE); -- -- _cairo_image_surface_assume_ownership_of_data ((*surface)); -+ if (font_options->antialias == CAIRO_ANTIALIAS_SUBPIXEL) -+ pixman_image_set_component_alpha (image->pixman_image, TRUE); - -+ _cairo_image_surface_assume_ownership_of_data (image); -+ } - return CAIRO_STATUS_SUCCESS; - } - -@@ -948,16 +1139,44 @@ - cairo_font_options_t *font_options, - cairo_image_surface_t **surface) - { -+ int rgba = FC_RGBA_UNKNOWN; - FT_GlyphSlot glyphslot = face->glyph; - FT_Outline *outline = &glyphslot->outline; - FT_Bitmap bitmap; - FT_BBox cbox; -- FT_Matrix matrix; -- int hmul = 1; -- int vmul = 1; - unsigned int width, height, stride; -- cairo_bool_t subpixel = FALSE; -+ cairo_format_t format; - cairo_status_t status; -+ FT_Error fterror; -+ FT_Library library = glyphslot->library; -+ FT_Render_Mode render_mode = FT_RENDER_MODE_NORMAL; -+ -+ switch (font_options->antialias) -+ { -+ case CAIRO_ANTIALIAS_NONE: -+ render_mode = FT_RENDER_MODE_MONO; -+ break; -+ -+ case CAIRO_ANTIALIAS_SUBPIXEL: -+ switch (font_options->subpixel_order) -+ { -+ case CAIRO_SUBPIXEL_ORDER_DEFAULT: -+ case CAIRO_SUBPIXEL_ORDER_RGB: -+ case CAIRO_SUBPIXEL_ORDER_BGR: -+ render_mode = FT_RENDER_MODE_LCD; -+ break; -+ -+ case CAIRO_SUBPIXEL_ORDER_VRGB: -+ case CAIRO_SUBPIXEL_ORDER_VBGR: -+ render_mode = FT_RENDER_MODE_LCD_V; -+ break; -+ } -+ break; -+ -+ case CAIRO_ANTIALIAS_DEFAULT: -+ case CAIRO_ANTIALIAS_GRAY: -+ render_mode = FT_RENDER_MODE_NORMAL; -+ } - - FT_Outline_Get_CBox (outline, &cbox); - -@@ -968,100 +1187,88 @@ - - width = (unsigned int) ((cbox.xMax - cbox.xMin) >> 6); - height = (unsigned int) ((cbox.yMax - cbox.yMin) >> 6); -- stride = (width * hmul + 3) & ~3; -+ stride = (width + 3) & ~3; - - if (width * height == 0) { -- cairo_format_t format; - /* Looks like fb handles zero-sized images just fine */ -- switch (font_options->antialias) { -- case CAIRO_ANTIALIAS_NONE: -+ switch (render_mode) { -+ case FT_RENDER_MODE_MONO: - format = CAIRO_FORMAT_A1; - break; -- case CAIRO_ANTIALIAS_SUBPIXEL: -- format= CAIRO_FORMAT_ARGB32; -+ case FT_RENDER_MODE_LCD: -+ case FT_RENDER_MODE_LCD_V: -+ format = CAIRO_FORMAT_ARGB32; - break; -- case CAIRO_ANTIALIAS_DEFAULT: -- case CAIRO_ANTIALIAS_GRAY: - default: - format = CAIRO_FORMAT_A8; -- break; - } - - (*surface) = (cairo_image_surface_t *) - cairo_image_surface_create_for_data (NULL, format, 0, 0, 0); - if ((*surface)->base.status) - return CAIRO_STATUS_NO_MEMORY; -+ - } else { - -- matrix.xx = matrix.yy = 0x10000L; -- matrix.xy = matrix.yx = 0; -+ int bitmap_size; - -- switch (font_options->antialias) { -- case CAIRO_ANTIALIAS_NONE: -- bitmap.pixel_mode = FT_PIXEL_MODE_MONO; -- bitmap.num_grays = 1; -- stride = ((width + 31) & -32) >> 3; -+ switch (render_mode) -+ { -+ case FT_RENDER_MODE_LCD: -+ if (font_options->subpixel_order == CAIRO_SUBPIXEL_ORDER_BGR ) { -+ rgba = FC_RGBA_BGR; -+ } else { -+ rgba = FC_RGBA_RGB; -+ } - break; -- case CAIRO_ANTIALIAS_DEFAULT: -- case CAIRO_ANTIALIAS_GRAY: -- bitmap.pixel_mode = FT_PIXEL_MODE_GRAY; -- bitmap.num_grays = 256; -- stride = (width + 3) & -4; -+ -+ case FT_RENDER_MODE_LCD_V: -+ if (font_options->subpixel_order == CAIRO_SUBPIXEL_ORDER_VBGR ) { -+ rgba = FC_RGBA_VBGR; -+ } else { -+ rgba = FC_RGBA_VRGB; -+ } - break; -- case CAIRO_ANTIALIAS_SUBPIXEL: -- switch (font_options->subpixel_order) { -- case CAIRO_SUBPIXEL_ORDER_RGB: -- case CAIRO_SUBPIXEL_ORDER_BGR: -- case CAIRO_SUBPIXEL_ORDER_DEFAULT: -+ - default: -- matrix.xx *= 3; -- hmul = 3; -- subpixel = TRUE; -- break; -- case CAIRO_SUBPIXEL_ORDER_VRGB: -- case CAIRO_SUBPIXEL_ORDER_VBGR: -- matrix.yy *= 3; -- vmul = 3; -- subpixel = TRUE; -- break; -+ ; - } -- FT_Outline_Transform (outline, &matrix); - -- bitmap.pixel_mode = FT_PIXEL_MODE_GRAY; -- bitmap.num_grays = 256; -- stride = (width * hmul + 3) & -4; -- } -+ FT_Library_SetLcdFilter( library, FT_LCD_FILTER_DEFAULT ); - -- bitmap.pitch = stride; -- bitmap.width = width * hmul; -- bitmap.rows = height * vmul; -- bitmap.buffer = calloc (1, stride * bitmap.rows); -+ fterror = FT_Render_Glyph( face->glyph, render_mode ); - -- if (bitmap.buffer == NULL) { -- _cairo_error (CAIRO_STATUS_NO_MEMORY); -+ FT_Library_SetLcdFilter( library, FT_LCD_FILTER_NONE ); -+ -+ if (fterror != 0) - return CAIRO_STATUS_NO_MEMORY; -- } - -- FT_Outline_Translate (outline, -cbox.xMin*hmul, -cbox.yMin*vmul); -+ bitmap_size = _compute_xrender_bitmap_size( &bitmap, -+ face->glyph, -+ render_mode ); -+ if ( bitmap_size < 0 ) -+ return CAIRO_STATUS_NO_MEMORY; - -- if (FT_Outline_Get_Bitmap (glyphslot->library, outline, &bitmap) != 0) { -- free (bitmap.buffer); -- _cairo_error (CAIRO_STATUS_NO_MEMORY); -+ bitmap.buffer = calloc(1, bitmap_size); -+ if (bitmap.buffer == NULL) { - return CAIRO_STATUS_NO_MEMORY; - } - -+ _fill_xrender_bitmap( &bitmap, face->glyph, render_mode, -+ (rgba == FC_RGBA_BGR || rgba == FC_RGBA_VBGR) ); -+ -+ // NOTE: _get_bitmap_surface will free bitmap.buffer if there is an error - status = _get_bitmap_surface (&bitmap, TRUE, font_options, surface); - if (status) - return status; -- } -- - /* - * Note: the font's coordinate system is upside down from ours, so the - * Y coordinate of the control box needs to be negated. - */ - cairo_surface_set_device_offset (&(*surface)->base, -- floor ((double) cbox.xMin / 64.0), -- floor (-(double) cbox.yMax / 64.0)); -+ (double) glyphslot->bitmap_left, -+ (double)-glyphslot->bitmap_top); -+ } - - return CAIRO_STATUS_SUCCESS; - } -@@ -1433,11 +1640,11 @@ - case CAIRO_SUBPIXEL_ORDER_DEFAULT: - case CAIRO_SUBPIXEL_ORDER_RGB: - case CAIRO_SUBPIXEL_ORDER_BGR: -- load_target |= FT_LOAD_TARGET_LCD; -+ load_target = FT_LOAD_TARGET_LCD; - break; - case CAIRO_SUBPIXEL_ORDER_VRGB: - case CAIRO_SUBPIXEL_ORDER_VBGR: -- load_target |= FT_LOAD_TARGET_LCD_V; -+ load_target = FT_LOAD_TARGET_LCD_V; - break; - } - } diff --git a/cairo-ac.patch b/cairo-ac.patch deleted file mode 100644 index 4f430ff..0000000 --- a/cairo-ac.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/configure.ac b/configure.ac -index 02e8c8e..fc875a8 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -8,6 +8,8 @@ AC_CONFIG_HEADERS(config.h) - AC_CONFIG_AUX_DIR(build) - AC_CONFIG_MACRO_DIR(build) - AM_INIT_AUTOMAKE([1.9.6 gnu -Wall no-define]) -+m4_pattern_allow([^LT_(CURRENT|REVISION|AGE)$])dnl -+AC_PROG_CC_C_O - AC_LIBTOOL_WIN32_DLL dnl Must be called before AC_PROG_LIBTOOL - AC_PROG_LIBTOOL dnl ([1.4]) Don't remove! - GTK_DOC_CHECK([1.6]) diff --git a/cairo-lcd-filter-fdo10301.patch b/cairo-lcd-filter-fdo10301.patch new file mode 100644 index 0000000..41805ae --- /dev/null +++ b/cairo-lcd-filter-fdo10301.patch @@ -0,0 +1,1354 @@ +Index: cairo-1.8.6/src/cairo-font-options.c +=================================================================== +--- cairo-1.8.6.orig/src/cairo-font-options.c ++++ cairo-1.8.6/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_ + { + 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_fon + { + 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_opt + 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_fo + + 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_fon + + 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,48 @@ cairo_font_options_get_subpixel_order (c + } + + /** ++ * _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 +Index: cairo-1.8.6/src/cairo-ft-font.c +=================================================================== +--- cairo-1.8.6.orig/src/cairo-ft-font.c ++++ cairo-1.8.6/src/cairo-ft-font.c +@@ -57,6 +57,30 @@ + #include FT_SYNTHESIS_H + #endif + ++#if HAVE_FT_LIBRARY_SETLCDFILTER ++#include FT_LCD_FILTER_H ++#endif ++ ++/* Fontconfig version older than 2.6 didn't have these options */ ++#ifndef FC_LCD_FILTER ++#define FC_LCD_FILTER "lcdfilter" ++#endif ++/* Some Ubuntu versions defined FC_LCD_FILTER without defining the following */ ++#ifndef FC_LCD_NONE ++#define FC_LCD_NONE 0 ++#define FC_LCD_DEFAULT 1 ++#define FC_LCD_LIGHT 2 ++#define FC_LCD_LEGACY 3 ++#endif ++ ++/* FreeType version older than 2.3.5(?) didn't have these options */ ++#ifndef FT_LCD_FILTER_NONE ++#define FT_LCD_FILTER_NONE 0 ++#define FT_LCD_FILTER_DEFAULT 1 ++#define FT_LCD_FILTER_LIGHT 2 ++#define FT_LCD_FILTER_LEGACY 16 ++#endif ++ + #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)) +@@ -156,6 +180,25 @@ typedef struct _cairo_ft_unscaled_font_m + int num_open_faces; + } cairo_ft_unscaled_font_map_t; + ++static cairo_bool_t _ft_can_lcd_filter (void) { ++#if HAVE_FT_LIBRARY_SETLCDFILTER ++ FT_Library library; ++ FT_Error fterror; ++ ++ FT_Init_FreeType(&library); ++ fterror = FT_Library_SetLcdFilter(library, FT_LCD_FILTER_DEFAULT); ++ ++ if (fterror != FT_Err_Unimplemented_Feature) ++ return TRUE; ++ else ++ return FALSE; ++ ++ FT_Done_FreeType(library); ++#else ++ return FALSE; ++#endif ++} ++ + static cairo_ft_unscaled_font_map_t *cairo_ft_unscaled_font_map = NULL; + + static void +@@ -737,6 +780,282 @@ _cairo_ft_unscaled_font_set_scale (cairo + return CAIRO_STATUS_SUCCESS; + } + ++/* 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; ++ ++ pix = ((unsigned int)src[0] << 16) | ++ ((unsigned int)src[src_pitch] << 8) | ++ ((unsigned int)src[src_pitch*2] ) | ++ ((unsigned int)src[src_pitch] << 24) ; ++ ++ 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; ++ } ++ } ++ } ++ } ++} ++ ++ + /* Empirically-derived subpixel filtering values thanks to Keith + * Packard and libXft. */ + static const int filters[3][3] = { +@@ -766,7 +1085,6 @@ _get_bitmap_surface (FT_Bitmap *bi + int width, height, stride; + unsigned char *data; + int format = CAIRO_FORMAT_A8; +- cairo_bool_t subpixel = FALSE; + + width = bitmap->width; + height = bitmap->rows; +@@ -808,7 +1126,7 @@ _get_bitmap_surface (FT_Bitmap *bi + + #ifndef WORDS_BIGENDIAN + { +- uint8_t *d = data; ++ uint8_t *d = data; + int count = stride * height; + + while (count--) { +@@ -835,108 +1153,115 @@ _get_bitmap_surface (FT_Bitmap *bi + data = _cairo_malloc_ab (height, stride); + if (!data) + return _cairo_error (CAIRO_STATUS_NO_MEMORY); +- + 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; +- stride = bitmap->pitch; +- stride_rgba = (width_rgba * 4 + 3) & ~3; +- data_rgba = calloc (stride_rgba, height); +- if (data_rgba == NULL) { +- if (own_buffer) ++ format = CAIRO_FORMAT_A8; ++ break; ++ case CAIRO_ANTIALIAS_SUBPIXEL: ++ if (_ft_can_lcd_filter()) { ++ /* 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; ++ format = CAIRO_FORMAT_ARGB32; ++ } else { ++ 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; ++ 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); +- } ++ 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) ++ 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; +- } ++ data = data_rgba; ++ stride = stride_rgba; ++ format = CAIRO_FORMAT_ARGB32; ++ } + } + break; + case FT_PIXEL_MODE_GRAY2: +@@ -957,7 +1282,7 @@ _get_bitmap_surface (FT_Bitmap *bi + return (*surface)->base.status; + } + +- if (subpixel) ++ if (font_options->antialias == CAIRO_ANTIALIAS_SUBPIXEL) + pixman_image_set_component_alpha ((*surface)->pixman_image, TRUE); + + _cairo_image_surface_assume_ownership_of_data ((*surface)); +@@ -985,16 +1310,67 @@ _render_glyph_outline (FT_Face + cairo_font_options_t *font_options, + cairo_image_surface_t **surface) + { ++ int rgba = FC_RGBA_UNKNOWN; ++ int lcd_filter = FT_LCD_FILTER_LEGACY; + FT_GlyphSlot glyphslot = face->glyph; + FT_Outline *outline = &glyphslot->outline; + FT_Bitmap bitmap; + FT_BBox cbox; +- FT_Matrix matrix; +- int hmul = 1; +- int vmul = 1; +- unsigned int width, height, stride; +- cairo_bool_t subpixel = FALSE; ++ unsigned int width, height; ++ double device_offset_left, device_offset_top; + cairo_status_t status; ++ cairo_bool_t ft_can_filter = FALSE; ++ FT_Error fterror; ++ FT_Library library = glyphslot->library; ++ FT_Render_Mode render_mode = FT_RENDER_MODE_NORMAL; ++ ++#if HAVE_FT_LIBRARY_SETLCDFILTER ++ fterror = FT_Library_SetLcdFilter (library, FT_LCD_FILTER_NONE); ++ if(fterror != FT_Err_Unimplemented_Feature) ++ ft_can_filter = TRUE; ++#endif ++ ++ switch (font_options->antialias) { ++ case CAIRO_ANTIALIAS_NONE: ++ render_mode = FT_RENDER_MODE_MONO; ++ break; ++ case CAIRO_ANTIALIAS_SUBPIXEL: ++ switch (font_options->lcd_filter) { ++ 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_FIR5: ++ lcd_filter = FT_LCD_FILTER_DEFAULT; ++ break; ++ } ++ ++ if (ft_can_filter) { ++ switch (font_options->subpixel_order) { ++ case CAIRO_SUBPIXEL_ORDER_DEFAULT: ++ case CAIRO_SUBPIXEL_ORDER_RGB: ++ case CAIRO_SUBPIXEL_ORDER_BGR: ++ render_mode = FT_RENDER_MODE_LCD; ++ break; ++ ++ case CAIRO_SUBPIXEL_ORDER_VRGB: ++ case CAIRO_SUBPIXEL_ORDER_VBGR: ++ render_mode = FT_RENDER_MODE_LCD_V; ++ break; ++ } ++ } ++ ++ break; ++ case CAIRO_ANTIALIAS_DEFAULT: ++ case CAIRO_ANTIALIAS_GRAY: ++ render_mode = FT_RENDER_MODE_NORMAL; ++ } + + FT_Outline_Get_CBox (outline, &cbox); + +@@ -1005,20 +1381,21 @@ _render_glyph_outline (FT_Face + + width = (unsigned int) ((cbox.xMax - cbox.xMin) >> 6); + height = (unsigned int) ((cbox.yMax - cbox.yMin) >> 6); +- stride = (width * hmul + 3) & ~3; + + if (width * height == 0) { + cairo_format_t format; + /* Looks like fb handles zero-sized images just fine */ +- switch (font_options->antialias) { +- case CAIRO_ANTIALIAS_NONE: ++ switch (render_mode) { ++ case FT_RENDER_MODE_MONO: + format = CAIRO_FORMAT_A1; + break; +- case CAIRO_ANTIALIAS_SUBPIXEL: ++ case FT_RENDER_MODE_LCD: ++ case FT_RENDER_MODE_LCD_V: + format= CAIRO_FORMAT_ARGB32; + break; +- case CAIRO_ANTIALIAS_DEFAULT: +- case CAIRO_ANTIALIAS_GRAY: ++ case FT_RENDER_MODE_LIGHT: ++ case FT_RENDER_MODE_NORMAL: ++ case FT_RENDER_MODE_MAX: + default: + format = CAIRO_FORMAT_A8; + break; +@@ -1028,75 +1405,134 @@ _render_glyph_outline (FT_Face + cairo_image_surface_create_for_data (NULL, format, 0, 0, 0); + if ((*surface)->base.status) + return (*surface)->base.status; +- } else { +- +- matrix.xx = matrix.yy = 0x10000L; +- matrix.xy = matrix.yx = 0; +- +- switch (font_options->antialias) { +- case CAIRO_ANTIALIAS_NONE: +- bitmap.pixel_mode = FT_PIXEL_MODE_MONO; +- bitmap.num_grays = 1; +- stride = ((width + 31) & -32) >> 3; +- break; +- case CAIRO_ANTIALIAS_DEFAULT: +- case CAIRO_ANTIALIAS_GRAY: +- bitmap.pixel_mode = FT_PIXEL_MODE_GRAY; +- bitmap.num_grays = 256; +- stride = (width + 3) & -4; +- break; +- case CAIRO_ANTIALIAS_SUBPIXEL: +- switch (font_options->subpixel_order) { +- case CAIRO_SUBPIXEL_ORDER_RGB: +- case CAIRO_SUBPIXEL_ORDER_BGR: +- case CAIRO_SUBPIXEL_ORDER_DEFAULT: +- default: +- matrix.xx *= 3; +- hmul = 3; +- subpixel = TRUE; +- break; +- case CAIRO_SUBPIXEL_ORDER_VRGB: +- case CAIRO_SUBPIXEL_ORDER_VBGR: +- matrix.yy *= 3; +- vmul = 3; +- subpixel = TRUE; +- break; +- } +- FT_Outline_Transform (outline, &matrix); +- +- bitmap.pixel_mode = FT_PIXEL_MODE_GRAY; +- bitmap.num_grays = 256; +- stride = (width * hmul + 3) & -4; +- } +- +- bitmap.pitch = stride; +- bitmap.width = width * hmul; +- bitmap.rows = height * vmul; +- bitmap.buffer = calloc (stride, bitmap.rows); +- if (bitmap.buffer == NULL) +- return _cairo_error (CAIRO_STATUS_NO_MEMORY); +- +- FT_Outline_Translate (outline, -cbox.xMin*hmul, -cbox.yMin*vmul); +- +- if (FT_Outline_Get_Bitmap (glyphslot->library, outline, &bitmap) != 0) { +- free (bitmap.buffer); +- return _cairo_error (CAIRO_STATUS_NO_MEMORY); +- } +- ++ } else { ++ int bitmap_size; ++ if (ft_can_filter) { ++ switch (render_mode) { ++ case FT_RENDER_MODE_LCD: ++ if (font_options->subpixel_order == CAIRO_SUBPIXEL_ORDER_BGR) { ++ rgba = FC_RGBA_BGR; ++ } else { ++ rgba = FC_RGBA_RGB; ++ } ++ break; ++ case FT_RENDER_MODE_LCD_V: ++ if (font_options->subpixel_order == CAIRO_SUBPIXEL_ORDER_VBGR) { ++ rgba = FC_RGBA_VBGR; ++ } else { ++ rgba = FC_RGBA_VRGB; ++ } ++ break; ++ case FT_RENDER_MODE_MONO: ++ case FT_RENDER_MODE_LIGHT: ++ case FT_RENDER_MODE_NORMAL: ++ case FT_RENDER_MODE_MAX: ++ default: ++ break; ++ } ++ ++ #if HAVE_FT_LIBRARY_SETLCDFILTER ++ FT_Library_SetLcdFilter (library, lcd_filter); ++ #endif ++ ++ fterror = FT_Render_Glyph (face->glyph, render_mode); ++ ++ #if HAVE_FT_LIBRARY_SETLCDFILTER ++ FT_Library_SetLcdFilter (library, FT_LCD_FILTER_NONE); ++ #endif ++ ++ if (fterror != 0) ++ return _cairo_error (CAIRO_STATUS_NO_MEMORY); ++ ++ bitmap_size = _compute_xrender_bitmap_size (&bitmap, ++ face->glyph, ++ render_mode); ++ if (bitmap_size < 0) ++ return _cairo_error (CAIRO_STATUS_NO_MEMORY); ++ ++ bitmap.buffer = calloc (1, bitmap_size); ++ if (bitmap.buffer == NULL) ++ return _cairo_error (CAIRO_STATUS_NO_MEMORY); ++ ++ _fill_xrender_bitmap (&bitmap, face->glyph, render_mode, ++ (rgba == FC_RGBA_BGR || rgba == FC_RGBA_VBGR)); ++ ++ device_offset_left = (double)-glyphslot->bitmap_left; ++ device_offset_top = (double)+glyphslot->bitmap_top; ++ } else { ++ FT_Matrix matrix; ++ int hmul = 1; ++ int vmul = 1; ++ unsigned int stride; ++ ++ stride = (width * hmul + 3) & ~3; ++ ++ matrix.xx = matrix.yy = 0x10000L; ++ matrix.xy = matrix.yx = 0; ++ ++ switch (font_options->antialias) { ++ case CAIRO_ANTIALIAS_NONE: ++ bitmap.pixel_mode = FT_PIXEL_MODE_MONO; ++ bitmap.num_grays = 1; ++ stride = ((width + 31) & -32) >> 3; ++ break; ++ case CAIRO_ANTIALIAS_DEFAULT: ++ case CAIRO_ANTIALIAS_GRAY: ++ bitmap.pixel_mode = FT_PIXEL_MODE_GRAY; ++ bitmap.num_grays = 256; ++ stride = (width + 3) & -4; ++ break; ++ case CAIRO_ANTIALIAS_SUBPIXEL: ++ switch (font_options->subpixel_order) { ++ case CAIRO_SUBPIXEL_ORDER_RGB: ++ case CAIRO_SUBPIXEL_ORDER_BGR: ++ case CAIRO_SUBPIXEL_ORDER_DEFAULT: ++ default: ++ matrix.xx *= 3; ++ hmul = 3; ++ break; ++ case CAIRO_SUBPIXEL_ORDER_VRGB: ++ case CAIRO_SUBPIXEL_ORDER_VBGR: ++ matrix.yy *= 3; ++ vmul = 3; ++ break; ++ } ++ ++ FT_Outline_Transform (outline, &matrix); ++ ++ bitmap.pixel_mode = FT_PIXEL_MODE_GRAY; ++ bitmap.num_grays = 256; ++ stride = (width * hmul + 3) & -4; ++ } ++ bitmap.pitch = stride; ++ bitmap.width = width * hmul; ++ bitmap.rows = height * vmul; ++ bitmap.buffer = calloc (stride, bitmap.rows); ++ if (bitmap.buffer == NULL) ++ return _cairo_error (CAIRO_STATUS_NO_MEMORY); ++ FT_Outline_Translate (outline, -cbox.xMin*hmul, -cbox.yMin*vmul); ++ if (FT_Outline_Get_Bitmap (glyphslot->library, outline, &bitmap) != 0) { ++ free (bitmap.buffer); ++ return _cairo_error (CAIRO_STATUS_NO_MEMORY); ++ } ++ device_offset_left = floor (-(double) cbox.xMin / 64.0); ++ device_offset_top = floor (+(double) cbox.yMax / 64.0); ++ } ++ /* Note: ++ * _get_bitmap_surface will free bitmap.buffer if there is an error ++ */ + status = _get_bitmap_surface (&bitmap, TRUE, font_options, surface); + if (status) + return status; +- } +- +- /* +- * Note: the font's coordinate system is upside down from ours, so the +- * Y coordinate of the control box needs to be negated. Moreover, device +- * offsets are position of glyph origin relative to top left while xMin +- * and yMax are offsets of top left relative to origin. Another negation. +- */ +- cairo_surface_set_device_offset (&(*surface)->base, +- floor (-(double) cbox.xMin / 64.0), +- floor (+(double) cbox.yMax / 64.0)); ++ /* Note: the font's coordinate system is upside down from ours, so the ++ * Y coordinate of the control box needs to be negated. Moreover, device ++ * offsets are position of glyph origin relative to top left while xMin ++ * and yMax are offsets of top left relative to origin. Another negation. ++ */ ++ cairo_surface_set_device_offset (&(*surface)->base, ++ device_offset_left, ++ device_offset_top); ++ } + + return CAIRO_STATUS_SUCCESS; + } +@@ -1164,7 +1600,7 @@ _transform_glyph_bitmap (cairo_matrix_t + * the "shape" portion of the font transform + */ + original_to_transformed = *shape; +- ++ + cairo_surface_get_device_offset (&(*surface)->base, &origin_x, &origin_y); + orig_width = cairo_image_surface_get_width (&(*surface)->base); + orig_height = cairo_image_surface_get_height (&(*surface)->base); +@@ -1313,9 +1749,10 @@ _get_pattern_ft_options (FcPattern *patt + if (FcPatternGetBool (pattern, + FC_ANTIALIAS, 0, &antialias) != FcResultMatch) + antialias = FcTrue; +- ++ + if (antialias) { + cairo_subpixel_order_t subpixel_order; ++ int lcd_filter; + + /* disable hinting if requested */ + if (FcPatternGetBool (pattern, +@@ -1351,8 +1788,27 @@ _get_pattern_ft_options (FcPattern *patt + ft_options.base.antialias = CAIRO_ANTIALIAS_SUBPIXEL; + } + +-#ifdef FC_HINT_STYLE +- if (FcPatternGetInteger (pattern, ++ if (FcPatternGetInteger (pattern, ++ FC_LCD_FILTER, 0, &lcd_filter) == FcResultMatch) ++ { ++ switch (lcd_filter) { ++ case FC_LCD_NONE: ++ ft_options.base.lcd_filter = CAIRO_LCD_FILTER_NONE; ++ break; ++ case FC_LCD_DEFAULT: ++ ft_options.base.lcd_filter = CAIRO_LCD_FILTER_FIR5; ++ break; ++ case FC_LCD_LIGHT: ++ ft_options.base.lcd_filter = CAIRO_LCD_FILTER_FIR3; ++ break; ++ case FC_LCD_LEGACY: ++ ft_options.base.lcd_filter = CAIRO_LCD_FILTER_INTRA_PIXEL; ++ break; ++ } ++ } ++ ++#ifdef FC_HINT_STYLE ++ if (FcPatternGetInteger (pattern, + FC_HINT_STYLE, 0, &hintstyle) != FcResultMatch) + hintstyle = FC_HINT_FULL; + +@@ -1361,7 +1817,7 @@ _get_pattern_ft_options (FcPattern *patt + + switch (hintstyle) { + case FC_HINT_NONE: +- ft_options.base.hint_style = CAIRO_HINT_STYLE_NONE; ++ ft_options.base.hint_style = CAIRO_HINT_STYLE_NONE; + break; + case FC_HINT_SLIGHT: + ft_options.base.hint_style = CAIRO_HINT_STYLE_SLIGHT; +@@ -1405,14 +1861,14 @@ _get_pattern_ft_options (FcPattern *patt + + if (vertical_layout) + ft_options.load_flags |= FT_LOAD_VERTICAL_LAYOUT; +- ++ + #ifndef FC_EMBOLDEN + #define FC_EMBOLDEN "embolden" + #endif + if (FcPatternGetBool (pattern, + FC_EMBOLDEN, 0, &embolden) != FcResultMatch) + embolden = FcFalse; +- ++ + if (embolden) + ft_options.extra_flags |= CAIRO_FT_OPTIONS_EMBOLDEN; + +@@ -1428,7 +1884,7 @@ _cairo_ft_options_merge (cairo_ft_option + + /* clear load target mode */ + load_flags &= ~(FT_LOAD_TARGET_(FT_LOAD_TARGET_MODE(other->load_flags))); +- ++ + if (load_flags & FT_LOAD_NO_HINTING) + other->base.hint_style = CAIRO_HINT_STYLE_NONE; + +@@ -1439,7 +1895,7 @@ _cairo_ft_options_merge (cairo_ft_option + } + + if (other->base.antialias == CAIRO_ANTIALIAS_SUBPIXEL && +- (options->base.antialias == CAIRO_ANTIALIAS_DEFAULT || ++ (options->base.antialias == CAIRO_ANTIALIAS_DEFAULT || + options->base.antialias == CAIRO_ANTIALIAS_GRAY)) { + options->base.antialias = CAIRO_ANTIALIAS_SUBPIXEL; + options->base.subpixel_order = other->base.subpixel_order; +@@ -1451,6 +1907,12 @@ _cairo_ft_options_merge (cairo_ft_option + if (other->base.hint_style == CAIRO_HINT_STYLE_NONE) + options->base.hint_style = CAIRO_HINT_STYLE_NONE; + ++ if (options->base.lcd_filter == CAIRO_LCD_FILTER_DEFAULT) ++ options->base.lcd_filter = other->base.lcd_filter; ++ ++ if (other->base.lcd_filter == CAIRO_LCD_FILTER_NONE) ++ options->base.lcd_filter = CAIRO_LCD_FILTER_NONE; ++ + if (options->base.antialias == CAIRO_ANTIALIAS_NONE) { + if (options->base.hint_style == CAIRO_HINT_STYLE_NONE) + load_flags |= FT_LOAD_NO_HINTING; +@@ -1463,7 +1925,7 @@ _cairo_ft_options_merge (cairo_ft_option + load_flags |= FT_LOAD_NO_HINTING; + break; + case CAIRO_HINT_STYLE_SLIGHT: +- load_target = FT_LOAD_TARGET_LIGHT; ++ load_target |= FT_LOAD_TARGET_LIGHT; + break; + case CAIRO_HINT_STYLE_MEDIUM: + break; +@@ -1993,18 +2455,18 @@ _cairo_ft_scaled_glyph_init (void *abs + FT_Pos x1, x2; + FT_Pos y1, y2; + FT_Pos advance; +- ++ + if (!vertical_layout) { + x1 = (metrics->horiBearingX) & -64; + x2 = (metrics->horiBearingX + metrics->width + 63) & -64; + y1 = (-metrics->horiBearingY) & -64; + y2 = (-metrics->horiBearingY + metrics->height + 63) & -64; +- ++ + advance = ((metrics->horiAdvance + 32) & -64); +- ++ + fs_metrics.x_bearing = DOUBLE_FROM_26_6 (x1) * x_factor; + fs_metrics.y_bearing = DOUBLE_FROM_26_6 (y1) * y_factor; +- ++ + fs_metrics.width = DOUBLE_FROM_26_6 (x2 - x1) * x_factor; + fs_metrics.height = DOUBLE_FROM_26_6 (y2 - y1) * y_factor; + +@@ -2015,12 +2477,12 @@ _cairo_ft_scaled_glyph_init (void *abs + x2 = (metrics->vertBearingX + metrics->width + 63) & -64; + y1 = (metrics->vertBearingY) & -64; + y2 = (metrics->vertBearingY + metrics->height + 63) & -64; +- ++ + advance = ((metrics->vertAdvance + 32) & -64); +- ++ + fs_metrics.x_bearing = DOUBLE_FROM_26_6 (x1) * x_factor; + fs_metrics.y_bearing = DOUBLE_FROM_26_6 (y1) * y_factor; +- ++ + fs_metrics.width = DOUBLE_FROM_26_6 (x2 - x1) * x_factor; + fs_metrics.height = DOUBLE_FROM_26_6 (y2 - y1) * y_factor; + +@@ -2034,7 +2496,7 @@ _cairo_ft_scaled_glyph_init (void *abs + if (!vertical_layout) { + fs_metrics.x_bearing = DOUBLE_FROM_26_6 (metrics->horiBearingX) * x_factor; + fs_metrics.y_bearing = DOUBLE_FROM_26_6 (-metrics->horiBearingY) * y_factor; +- ++ + if (hint_metrics || glyph->format != FT_GLYPH_FORMAT_OUTLINE) + fs_metrics.x_advance = DOUBLE_FROM_26_6 (metrics->horiAdvance) * x_factor; + else +@@ -2043,7 +2505,7 @@ _cairo_ft_scaled_glyph_init (void *abs + } else { + fs_metrics.x_bearing = DOUBLE_FROM_26_6 (metrics->vertBearingX) * x_factor; + fs_metrics.y_bearing = DOUBLE_FROM_26_6 (metrics->vertBearingY) * y_factor; +- ++ + fs_metrics.x_advance = 0 * x_factor; + if (hint_metrics || glyph->format != FT_GLYPH_FORMAT_OUTLINE) + fs_metrics.y_advance = DOUBLE_FROM_26_6 (metrics->vertAdvance) * y_factor; +@@ -2423,6 +2885,34 @@ _cairo_ft_font_options_substitute (const + } + } + ++ if (options->lcd_filter != CAIRO_LCD_FILTER_DEFAULT) ++ { ++ if (FcPatternGet (pattern, FC_LCD_FILTER, 0, &v) == FcResultNoMatch) ++ { ++ int lcd_filter; ++ ++ switch (options->lcd_filter) { ++ 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; ++ default: ++ case CAIRO_LCD_FILTER_FIR5: ++ lcd_filter = FT_LCD_FILTER_DEFAULT; ++ break; ++ } ++ ++ if (! FcPatternAddInteger (pattern, FC_LCD_FILTER, lcd_filter)) ++ return _cairo_error (CAIRO_STATUS_NO_MEMORY); ++ } ++ } ++ + if (options->hint_style != CAIRO_HINT_STYLE_DEFAULT) + { + if (FcPatternGet (pattern, FC_HINTING, 0, &v) == FcResultNoMatch) +@@ -2729,10 +3219,10 @@ cairo_bool_t + _cairo_ft_scaled_font_is_vertical (cairo_scaled_font_t *scaled_font) + { + cairo_ft_scaled_font_t *ft_scaled_font; +- ++ + if (!_cairo_scaled_font_is_ft (scaled_font)) + return FALSE; +- ++ + ft_scaled_font = (cairo_ft_scaled_font_t *) scaled_font; + if (ft_scaled_font->ft_options.load_flags & FT_LOAD_VERTICAL_LAYOUT) + return TRUE; +Index: cairo-1.8.6/src/cairo-mutex.c +=================================================================== +--- cairo-1.8.6.orig/src/cairo-mutex.c ++++ cairo-1.8.6/src/cairo-mutex.c +@@ -35,7 +35,7 @@ + + #include "cairo-mutex-private.h" + +-#define CAIRO_MUTEX_DECLARE(mutex) cairo_mutex_t mutex = CAIRO_MUTEX_NIL_INITIALIZER; ++#define CAIRO_MUTEX_DECLARE(mutex) cairo_private cairo_mutex_t mutex = CAIRO_MUTEX_NIL_INITIALIZER; + #include "cairo-mutex-list-private.h" + #undef CAIRO_MUTEX_DECLARE + +Index: cairo-1.8.6/src/cairo-surface.c +=================================================================== +--- cairo-1.8.6.orig/src/cairo-surface.c ++++ cairo-1.8.6/src/cairo-surface.c +@@ -73,6 +73,7 @@ const cairo_surface_t name = { \ + FALSE, /* has_font_options */ \ + { CAIRO_ANTIALIAS_DEFAULT, /* antialias */ \ + CAIRO_SUBPIXEL_ORDER_DEFAULT, /* subpixel_order */ \ ++ CAIRO_LCD_FILTER_DEFAULT, /* lcd_filter */ \ + CAIRO_HINT_STYLE_DEFAULT, /* hint_style */ \ + CAIRO_HINT_METRICS_DEFAULT /* hint_metrics */ \ + } /* font_options */ \ +Index: cairo-1.8.6/src/cairo-types-private.h +=================================================================== +--- cairo-1.8.6.orig/src/cairo-types-private.h ++++ cairo-1.8.6/src/cairo-types-private.h +@@ -113,9 +113,35 @@ struct _cairo_array { + cairo_bool_t is_snapshot; + }; + ++ ++/** ++ * cairo_lcd_filter_t: ++ * @CAIRO_LCD_FILTER_DEFAULT: Use the default LCD filter for ++ * font backend and target device ++ * @CAIRO_LCD_FILTER_NONE: Do not perform LCD filtering ++ * @CAIRO_LCD_FILTER_INTRA_PIXEL: Intra-pixel filter ++ * @CAIRO_LCD_FILTER_FIR3: FIR filter with a 3x3 kernel ++ * @CAIRO_LCD_FILTER_FIR5: FIR filter with a 5x5 kernel ++ * ++ * The LCD filter specifies the low-pass filter applied to LCD-optimized ++ * bitmaps generated with an antialiasing mode of %CAIRO_ANTIALIAS_SUBPIXEL. ++ * ++ * Note: This API was temporarily made available in the public ++ * interface during the 1.7.x development series, but was made private ++ * before 1.8. ++ **/ ++typedef enum _cairo_lcd_filter { ++ CAIRO_LCD_FILTER_DEFAULT, ++ CAIRO_LCD_FILTER_NONE, ++ CAIRO_LCD_FILTER_INTRA_PIXEL, ++ CAIRO_LCD_FILTER_FIR3, ++ CAIRO_LCD_FILTER_FIR5 ++} cairo_lcd_filter_t; ++ + struct _cairo_font_options { + cairo_antialias_t antialias; + cairo_subpixel_order_t subpixel_order; ++ cairo_lcd_filter_t lcd_filter; + cairo_hint_style_t hint_style; + cairo_hint_metrics_t hint_metrics; + }; +Index: cairo-1.8.6/src/cairo-xlib-screen.c +=================================================================== +--- cairo-1.8.6.orig/src/cairo-xlib-screen.c ++++ cairo-1.8.6/src/cairo-xlib-screen.c +@@ -150,13 +150,22 @@ _cairo_xlib_init_screen_font_options (Di + 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; + +@@ -239,6 +248,24 @@ _cairo_xlib_init_screen_font_options (Di + 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; +@@ -251,6 +278,7 @@ _cairo_xlib_init_screen_font_options (Di + 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); + } + +Index: cairo-1.8.6/src/cairoint.h +=================================================================== +--- cairo-1.8.6.orig/src/cairoint.h ++++ cairo-1.8.6/src/cairoint.h +@@ -1366,6 +1366,13 @@ cairo_private void + _cairo_font_options_init_copy (cairo_font_options_t *options, + const cairo_font_options_t *other); + ++cairo_private void ++_cairo_font_options_set_lcd_filter (cairo_font_options_t *options, ++ cairo_lcd_filter_t lcd_filter); ++ ++cairo_private cairo_lcd_filter_t ++_cairo_font_options_get_lcd_filter (const cairo_font_options_t *options); ++ + /* cairo-hull.c */ + cairo_private cairo_status_t + _cairo_hull_compute (cairo_pen_vertex_t *vertices, int *num_vertices); diff --git a/cairo.changes b/cairo.changes index 37acbdc..39ff2ff 100644 --- a/cairo.changes +++ b/cairo.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Sun Feb 15 06:55:23 CET 2009 - mboman@suse.de + +- Remove bugzilla-104365.patch. Symptoms as described + in bnc#104365 are no longer an issue. +- Remove cairo-ac.patch. Not needed anymore +- Replace cairo-1.4.10-lcd-filter-1.patch with + cairo-lcd-filter-fdo10301.patch and updated so that it applied to + our version of cairo. + ------------------------------------------------------------------- Wed Jan 21 14:23:25 IST 2009 - msuman@suse.de diff --git a/cairo.spec b/cairo.spec index 6432801..0c311d8 100644 --- a/cairo.spec +++ b/cairo.spec @@ -19,11 +19,12 @@ Name: cairo -BuildRequires: freetype2-devel gtk-doc libpng-devel pkg-config xorg-x11-devel xorg-x11-libxcb-devel -# Use rpmbuild -D 'DIRECTFB_SUPPORT 1' to build wíth DirectFB support. -%if 0%{?DIRECTFB_SUPPORT} -BuildRequires: DirectFB-devel -%endif +BuildRequires: freetype2-devel +BuildRequires: gtk-doc +BuildRequires: libpng-devel +BuildRequires: pkg-config +BuildRequires: xorg-x11-devel +BuildRequires: xorg-x11-libxcb-devel # These libraries are needed only for tests. # Do not enable tests in build systems, it causes build loop! #BuildRequires: librsvg-devel poppler-devel @@ -32,13 +33,10 @@ Group: Development/Libraries/X11 Summary: Vector Graphics Library with Cross-Device Output Support Url: http://cairographics.org/ Version: 1.8.6 -Release: 1 +Release: 2 Source: %{name}-%{version}.tar.bz2 -Patch1: cairo-ac.patch -# PATCH-NEEDS-REBASE bugzilla-104365.patch bnc104365 -- it needs a rename too! -Patch6: bugzilla-104365.patch -# PATCH-NEEDS-REBASE cairo-1.4.10-lcd-filter-1.patch -Patch7: cairo-1.4.10-lcd-filter-1.patch +# PATCH-FIX-UPSTREAM cairo-lcd-filter-fdo10301.patch fdo#10301 mboman@suse.de - fix_lcd_filtering +Patch0: cairo-lcd-filter-fdo10301.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build # Last present in SuSE Linux 10.0 (and NLD9): Obsoletes: libpixman <= 0.1.1 @@ -67,9 +65,6 @@ License: LGPL v2.1 or later; MOZILLA PUBLIC LICENSE (MPL/NPL) Summary: Development environment for cairo Group: Development/Libraries/X11 Requires: %{name} = %{version} freetype2-devel fontconfig-devel libpng-devel xorg-x11-devel xorg-x11-libXrender-devel xorg-x11-libX11-devel xorg-x11-libxcb-devel -%if 0%{?DIRECTFB_SUPPORT} -Requires: DirectFB-devel -%endif # Last present in SuSE Linux 10.0 (and NLD9): Obsoletes: libpixman-devel <= 0.1.1 Provides: libpixman-devel <= 0.1.1 @@ -106,18 +101,13 @@ Authors: %prep %setup -q -%patch1 -p1 -# %patch6 -p1 -# %patch7 -p1 +%patch0 -p1 %build autoreconf -f -i # Only for tests: --enable-pdf --enable-svg %configure \ --with-pic \ -%if 0%{?DIRECTFB_SUPPORT} - --enable-directfb \ -%endif --enable-ps \ --enable-xcb \ --disable-gtk-doc \ @@ -157,7 +147,14 @@ autoreconf -f -i %{_datadir}/gtk-doc/html/* %changelog -* Tue Jan 20 2009 msuman@suse.de +* Sun Feb 15 2009 mboman@suse.de +- Remove bugzilla-104365.patch. Symptoms as described + in bnc#104365 are no longer an issue. +- Remove cairo-ac.patch. Not needed anymore +- Replace cairo-1.4.10-lcd-filter-1.patch with + cairo-lcd-filter-fdo10301.patch and updated so that it applied to + our version of cairo. +* Wed Jan 21 2009 msuman@suse.de - Continue to provide the "la" files for SUSE releases <= 11.1 * Tue Jan 13 2009 crrodriguez@suse.de - remove static libraries and "la" files