SOURCES: cairo-1.2.4-lcd-filter-1.patch - updated

[arekm]

Author: arekm                        Date: Sun Apr 15 09:20:32 2007 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- updated

---- Files affected:
SOURCES:
   cairo-1.2.4-lcd-filter-1.patch (1.1 -> 1.2) 

---- Diffs:

================================================================
Index: SOURCES/cairo-1.2.4-lcd-filter-1.patch
diff -u SOURCES/cairo-1.2.4-lcd-filter-1.patch:1.1 SOURCES/cairo-1.2.4-lcd-filter-1.patch:1.2
--- SOURCES/cairo-1.2.4-lcd-filter-1.patch:1.1	Tue Feb 20 16:11:30 2007
+++ SOURCES/cairo-1.2.4-lcd-filter-1.patch	Sun Apr 15 11:20:27 2007
@@ -373,7 +373,7 @@
  	    stride = bitmap->pitch;
  	    if (own_buffer) {
  		data = bitmap->buffer;
-@@ -778,101 +1056,19 @@
+@@ -1062,104 +1062,15 @@
  		memcpy (data, bitmap->buffer, stride * height);
  	    }
  	    format = CAIRO_FORMAT_A8;
@@ -390,13 +390,7 @@
 -	    unsigned int    width_rgba, stride_rgba;
 -	    int		    vmul = 1;
 -	    int		    hmul = 1;
-+            } 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);
- 
+-
 -	    switch (font_options->subpixel_order) {
 -	    case CAIRO_SUBPIXEL_ORDER_DEFAULT:
 -	    case CAIRO_SUBPIXEL_ORDER_RGB:
@@ -415,10 +409,21 @@
 -	     * Filter the glyph to soften the color fringes
 -	     */
 -	    width_rgba = width;
-+                data   = bitmap->buffer;
++	    } 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 (1, stride_rgba * height);
+-	    if (data_rgba == NULL) {
+-		if (own_buffer)
+-		    free (bitmap->buffer);
+-		return CAIRO_STATUS_NO_MEMORY;
+-	    }
 -
 -	    os = 1;
 -	    switch (font_options->subpixel_order) {
@@ -479,10 +484,7 @@
 -	}
  	}
  	break;
-+
      case FT_PIXEL_MODE_GRAY2:
-     case FT_PIXEL_MODE_GRAY4:
- 	/* These could be triggered by very rare types of TrueType fonts */
 @@ -880,20 +1076,21 @@
  	return CAIRO_STATUS_NO_MEMORY;
      }
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/cairo-1.2.4-lcd-filter-1.patch?r1=1.1&r2=1.2&f=u