Attachment 3089 Details for Bug 4260 – Debug patch with fix

[patch] Debug patch with fix

cairo-xlib-surface-bgr-2.patch (text/plain), 3.19 KB, created by Owen Taylor on 2005-08-28 12:38:07 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Owen Taylor

Created: 2005-08-28 12:38:07 UTC

Size: 3.19 KB

patch

obsolete

>Index: cairo-xlib-surface.c
>===================================================================
>RCS file: /cvs/cairo/cairo/src/cairo-xlib-surface.c,v
>retrieving revision 1.117
>diff -u -p -r1.117 cairo-xlib-surface.c
>--- cairo-xlib-surface.c	28 Aug 2005 01:49:06 -0000	1.117
>+++ cairo-xlib-surface.c	28 Aug 2005 19:35:40 -0000
>@@ -138,7 +138,7 @@ struct _cairo_xlib_surface {
> #define CAIRO_SURFACE_RENDER_HAS_PICTURE_TRANSFORM(surface)	CAIRO_SURFACE_RENDER_AT_LEAST((surface), 0, 6)
> #define CAIRO_SURFACE_RENDER_HAS_FILTERS(surface)	CAIRO_SURFACE_RENDER_AT_LEAST((surface), 0, 6)
> 
>-static cairo_bool_t cairo_xlib_render_disabled = FALSE;
>+static cairo_bool_t cairo_xlib_render_disabled = TRUE;
> 
> /**
>  * cairo_test_xlib_disable_render:
>@@ -302,6 +302,25 @@ _CAIRO_MASK_FORMAT (cairo_format_masks_t
>     return False;
> }
> 
>+static void
>+swap_ximage (XImage *ximage)
>+{
>+    unsigned char *line = ximage->data;
>+    int i, j;
>+
>+    for (i = ximage->height; i; i--) {
>+	uint32_t *p = (uint32_t *)line;
>+	for (j = ximage->width; j; j--) {
>+	    uint32_t pixel = *p;
>+	    *p = (((pixel & 0x0000ff) << 16) |
>+		  ((pixel & 0x00ff00)) |
>+		  ((pixel & 0xff0000) >> 16));
>+	    p++;
>+	}
>+	line += ximage->bytes_per_line;
>+    }
>+}
>+
> static cairo_status_t
> _get_image_surface (cairo_xlib_surface_t   *surface,
> 		    cairo_rectangle_t      *interest_rect,
>@@ -442,14 +461,31 @@ _get_image_surface (cairo_xlib_surface_t
>      */
>     if (_CAIRO_MASK_FORMAT (&masks, &format))
>     {
>-	image = (cairo_image_surface_t*)
>-	    cairo_image_surface_create_for_data ((unsigned char *) ximage->data,
>-						 format,
>-						 ximage->width, 
>-						 ximage->height,
>-						 ximage->bytes_per_line);
>-	if (image->base.status)
>-	    goto FAIL;
>+	if (format == CAIRO_FORMAT_RGB24 && surface->visual) {
>+	    unsigned long t = masks.red_mask;
>+	    masks.red_mask = masks.blue_mask;
>+	    masks.blue_mask = t;
>+
>+	    swap_ximage (ximage);
>+	    
>+	    image = (cairo_image_surface_t*)
>+		_cairo_image_surface_create_with_masks ((unsigned char *) ximage->data,
>+							&masks,
>+							ximage->width, 
>+							ximage->height,
>+							ximage->bytes_per_line);
>+	    if (image->base.status)
>+		goto FAIL;
>+	} else {
>+	    image = (cairo_image_surface_t*)
>+		cairo_image_surface_create_for_data ((unsigned char *) ximage->data,
>+						     format,
>+						     ximage->width, 
>+						     ximage->height,
>+						     ximage->bytes_per_line);
>+	    if (image->base.status)
>+		goto FAIL;
>+	}
>     }
>     else
>     {
>@@ -570,10 +606,23 @@ _draw_image_surface (cairo_xlib_surface_
> 	return CAIRO_STATUS_NO_MEMORY;
> 
>     _cairo_xlib_surface_ensure_gc (surface);
>+
>+    if (surface->visual &&
>+	surface->visual->red_mask == 0xff0000 &&
>+	surface->visual->green_mask == 0xff00 &&
>+	surface->visual->blue_mask == 0xff)
>+	swap_ximage (ximage);
>+    
>     XPutImage(surface->dpy, surface->drawable, surface->gc,
> 	      ximage, 0, 0, dst_x, dst_y,
> 	      image->width, image->height);
>-
>+    
>+    if (surface->visual &&
>+	surface->visual->red_mask == 0xff0000 &&
>+	surface->visual->green_mask == 0xff00 &&
>+	surface->visual->blue_mask == 0xff)
>+	swap_ximage (ximage);
>+    
>     /* Foolish XDestroyImage thinks it can free my data, but I won't
>        stand for it. */
>     ximage->data = NULL;

Actions: View | Splinter Review

Attachments on bug 4260: 3057 | 3078 | 3086 | 3089 | 3090 | 3092

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.