Attachment 27246 Details for Bug 22484 – revert patch

[patch] revert patch

pixman-0.15.14-revert-fast-path-call.patch (text/plain), 1.52 KB, created by Daisuke SUZUKI on 2009-06-29 23:18:57 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Daisuke SUZUKI

Created: 2009-06-29 23:18:57 UTC

Size: 1.52 KB

patch

obsolete

>diff -up pixman-0.15.14/pixman/pixman-utils.c.revert-fast-path-call pixman-0.15.14/pixman/pixman-utils.c
>--- pixman-0.15.14/pixman/pixman-utils.c.revert-fast-path-call	2009-06-25 01:30:45.000000000 +0900
>+++ pixman-0.15.14/pixman/pixman-utils.c	2009-06-30 14:52:56.000000000 +0900
>@@ -566,22 +566,6 @@ get_fast_path (const pixman_fast_path_t 
>     return NULL;
> }
> 
>-static inline pixman_bool_t
>-image_covers (pixman_image_t *image, pixman_box32_t *extents, int x, int y)
>-{
>-    if (image->common.type == BITS && image->common.repeat == PIXMAN_REPEAT_NONE)
>-    {
>-	if (x > extents->x1 || y > extents->y1 ||
>-	    x + image->bits.width < extents->x2 ||
>-	    y + image->bits.height < extents->y2)
>-	{
>-	    return FALSE;
>-	}
>-    }
>-
>-    return TRUE;
>-}
>-
> pixman_bool_t
> _pixman_run_fast_path (const pixman_fast_path_t *paths,
> 		       pixman_implementation_t *imp,
>@@ -673,11 +657,6 @@ _pixman_run_fast_path (const pixman_fast
> 	if (pixman_compute_composite_region32 (
> 		&region, src, mask, dest, src_x, src_y, mask_x, mask_y, dest_x, dest_y, width, height))
> 	{
>-	    pixman_box32_t *extents = pixman_region32_extents (&region);
>-
>-	    if (image_covers (src, extents, dest_x - src_x, dest_y - src_y)   &&
>-		(!mask || image_covers (mask, extents, dest_x - mask_x, dest_y - mask_y)))
>-	    {
> 		walk_region_internal (imp, op,
> 				      src, mask, dest,
> 				      src_x, src_y, mask_x, mask_y,
>@@ -688,7 +667,6 @@ _pixman_run_fast_path (const pixman_fast
> 				      func);
> 	    
> 		result = TRUE;
>-	    }
> 	}
> 	    
> 	pixman_region32_fini (&region);

Actions: View | Splinter Review

Attachments on bug 22484: 27246 | 27268 | 27269 | 27274 | 27275 | 27366 | 27382

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.