Attachment 172115 Details for Bug 324503

[patch] patch

81828.diff (text/plain), 5.72 KB, created by Thomas Wiest on 2007-07-06 23:51:00 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Thomas Wiest

Created: 2007-07-06 23:51:00 UTC

Size: 5.72 KB

patch

obsolete

>Index: src/bitmap.c
>===================================================================
>--- src/bitmap.c	(revision 81427)
>+++ src/bitmap.c	(working copy)
>@@ -2145,42 +2145,73 @@
> cairo_surface_t *
> gdip_bitmap_ensure_surface (GpBitmap *bitmap)
> {
>-	BitmapData	*data;
>+	cairo_format_t format;
>+	BitmapData *data = bitmap->active_bitmap;
> 
>-	data= bitmap->active_bitmap;
>+	if (bitmap->surface || !data || !data->scan0)
>+		return bitmap->surface;
> 
>-	if ((bitmap->surface == NULL) && (data != NULL) && (data->scan0 != NULL)) {
>-		switch (data->pixel_format) {
>-			case PixelFormat24bppRGB: {
>-				bitmap->surface = cairo_image_surface_create_for_data(
>-							(BYTE*)data->scan0,
>-							CAIRO_FORMAT_RGB24, 
>-							data->width, 
>-							data->height, 
>-							data->stride);
>-				break;
>-			}
>+	switch (data->pixel_format) {
>+	case PixelFormat24bppRGB:
>+		format = CAIRO_FORMAT_RGB24;
>+		break;
> 
>-			case PixelFormat32bppARGB:
>-			case PixelFormat32bppRGB:
>-			case PixelFormat32bppPARGB: {
>-				bitmap->surface = cairo_image_surface_create_for_data(
>-							(BYTE*)data->scan0,
>-							CAIRO_FORMAT_ARGB32,
>-							data->width, 
>-							data->height, 
>-							data->stride);
>-				break;
>-			}
>+	case PixelFormat32bppARGB:	/* premultiplication is required */
>+	case PixelFormat32bppRGB:	/* no alpha */
>+	case PixelFormat32bppPARGB:	/* alpha already premultiplied */
>+		format = CAIRO_FORMAT_ARGB32;
>+		break;
> 
>-			default: {
>-				g_warning ("gdip_bitmap_ensure_surface: Unable to create a surface for raw bitmap data of format 0x%08x", data->pixel_format);
>-				break;
>+	default:
>+		g_warning ("gdip_bitmap_ensure_surface: Unable to create a surface for raw bitmap data of format 0x%08x", data->pixel_format);
>+		return NULL;
>+	}
>+
>+	bitmap->surface = cairo_image_surface_create_for_data ((BYTE*)data->scan0, format, 
>+		data->width, data->height, data->stride);
>+	return bitmap->surface;
>+}
>+
>+BOOL
>+gdip_bitmap_format_needs_premultiplication (GpBitmap *bitmap)
>+{
>+	return (bitmap->active_bitmap->pixel_format == PixelFormat32bppARGB);
>+}
>+
>+BYTE*
>+gdip_bitmap_get_premultiplied_scan0 (GpBitmap *bitmap)
>+{
>+	BitmapData *data = bitmap->active_bitmap;
>+	BYTE* premul = (BYTE*) GdipAlloc (data->height * data->stride);
>+	if (!premul)
>+		return NULL;
>+
>+	BYTE *source = (BYTE*)data->scan0;
>+	BYTE *target = premul;
>+	int y, x;
>+	for (y = 0; y < data->height; y++) {
>+		ARGB *sp = (ARGB*) source;
>+		ARGB *tp = (ARGB*) target;
>+		for (x = 0; x < data->width; x++) {
>+			BYTE a = source [3]; /* format is BGRA */
>+			if (a < 0xff) {
>+				BYTE *s = (BYTE*)sp;
>+				BYTE *t = (BYTE*)tp;
>+				t[0] = pre_multiplied_table [s[0]][a];
>+				t[1] = pre_multiplied_table [s[1]][a];
>+				t[2] = pre_multiplied_table [s[2]][a];
>+				t[3] = a;
>+			} else {
>+				*tp = *sp;
> 			}
>+			sp++;
>+			tp++;
> 		}
>+		source += data->stride;
>+		target += data->stride;
> 	}
> 
>-	return bitmap->surface;
>+	return premul;
> }
> 
> GpBitmap *
>Index: src/texturebrush.c
>===================================================================
>--- src/texturebrush.c	(revision 81427)
>+++ src/texturebrush.c	(working copy)
>@@ -87,20 +87,32 @@
> static GpStatus
> draw_tile_texture (cairo_t *ct, GpBitmap *bitmap, GpTexture *brush)
> {
>-	cairo_surface_t *original;
>+	cairo_surface_t *original = NULL;
> 	cairo_surface_t *texture;
> 	cairo_pattern_t *pat;
> 	GpStatus	status;
> 	GpRect		*rect = &brush->rectangle;
> 	cairo_t		*ct2;
>+	BYTE *premul = NULL;
> 
>-	if (rect == NULL)  {
>+	if (!rect)
> 		return InvalidParameter;
>-	}
> 
> 	gdip_bitmap_ensure_surface (bitmap);
>-	original = bitmap->surface;
> 
>+	if (gdip_bitmap_format_needs_premultiplication (bitmap)) {
>+		premul = gdip_bitmap_get_premultiplied_scan0 (bitmap);
>+		if (premul) {
>+			BitmapData *data = bitmap->active_bitmap;
>+			original = cairo_image_surface_create_for_data (premul, CAIRO_FORMAT_ARGB32, 
>+				data->width, data->height, data->stride);
>+		}
>+	}
>+
>+	/* if premul isn't required (or couldn't be computed, e.g. out of memory) */
>+	if (!original)
>+		original = bitmap->surface;
>+
> 	/* Use the original as a pattern */
> 	pat = cairo_pattern_create_for_surface (original);
> 	status = gdip_get_pattern_status(pat);
>@@ -137,6 +149,10 @@
> 	cairo_pattern_destroy (pat);
> 	cairo_surface_destroy (texture);
> 
>+	if (premul) {
>+		cairo_surface_destroy (original);
>+		GdipFree (premul);
>+	}
> 	return gdip_get_status (cairo_status (ct));
> }
> 
>@@ -437,23 +453,16 @@
> 	cairo_pattern_t	*pattern;
> 	GpTexture	*texture;
> 	GpImage		*img;
>-	GpImage		*gr_img;
>-	GpBitmap	*gr_bmp;
>-	cairo_format_t	format;
>-	unsigned int	width;
>-	unsigned int	height;
> 	GpStatus	status = Ok;
> 	BOOL		dispose_bitmap;
> 
>-	if ((graphics == NULL) || (brush == NULL) || (graphics->ct == NULL)) {
>+	if (!graphics || !brush || !graphics->ct)
> 		return InvalidParameter;
>-	}
> 
> 	texture = (GpTexture *) brush;
> 	img = texture->image;
>-	if (img == NULL) {
>+	if (!img)
> 		return InvalidParameter;
>-	}
> 
> 	if (img->type != ImageTypeBitmap)
> 		return NotImplemented;
>@@ -470,9 +479,6 @@
> 	} else {
> 		dispose_bitmap = FALSE;
> 	}
>-	width = img->active_bitmap->width;
>-	height = img->active_bitmap->height;
>-	format = img->active_bitmap->pixel_format;
> 
> 	ct = graphics->ct;
> 
>Index: src/bitmap-private.h
>===================================================================
>--- src/bitmap-private.h	(revision 81427)
>+++ src/bitmap-private.h	(working copy)
>@@ -149,6 +149,9 @@
> cairo_surface_t* gdip_bitmap_ensure_surface (GpBitmap *bitmap) GDIP_INTERNAL;
> GpBitmap* gdip_convert_indexed_to_rgb (GpBitmap *bitmap) GDIP_INTERNAL;
> 
>+BOOL gdip_bitmap_format_needs_premultiplication (GpBitmap *bitmap) GDIP_INTERNAL;
>+BYTE* gdip_bitmap_get_premultiplied_scan0 (GpBitmap *bitmap) GDIP_INTERNAL;
>+
> void gdip_process_bitmap_attributes (GpBitmap *bitmap, void **dest, GpImageAttributes* attr, BOOL *allocated) GDIP_INTERNAL;
> 
> ColorPalette* gdip_create_greyscale_palette (int num_colors) GDIP_INTERNAL;

Actions: View | Diff

Attachments on bug 324503: 172114 | 172115