Attachment 37143 Details for Bug 29124 – consider all_clipped in _cairo_clip_get_extents

[patch] consider all_clipped in _cairo_clip_get_extents

empty-clip-extents.patch (text/plain), 1.77 KB, created by Karl Tomlinson on 2010-07-16 16:49:23 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Karl Tomlinson

Created: 2010-07-16 16:49:23 UTC

Size: 1.77 KB

patch

obsolete

>commit 17ecdf65f835f54a4158652d40d89927df6f0fb9
>Author: Karl Tomlinson <karlt+@karlt.net>
>Date:   Sat Jul 17 11:46:25 2010 +1200
>
>    clip: consider all_clipped in _cairo_clip_get_extents
>    
>    fixes https://bugs.freedesktop.org/show_bug.cgi?id=29124
>
>diff --git a/src/cairo-clip.c b/src/cairo-clip.c
>index f6173c6..77d8214 100644
>--- a/src/cairo-clip.c
>+++ b/src/cairo-clip.c
>@@ -1264,9 +1264,14 @@ _cairo_clip_combine_with_surface (cairo_clip_t *clip,
>     return CAIRO_STATUS_SUCCESS;
> }
> 
>+static const cairo_rectangle_int_t _cairo_empty_rectangle_int = { 0, 0, 0, 0 };
>+
> const cairo_rectangle_int_t *
> _cairo_clip_get_extents (const cairo_clip_t *clip)
> {
>+    if (clip->all_clipped)
>+	return &_cairo_empty_rectangle_int;
>+
>     if (clip->path == NULL)
> 	return NULL;
> 
>diff --git a/test/get-clip.c b/test/get-clip.c
>index 9d6e796..f0477a1 100644
>--- a/test/get-clip.c
>+++ b/test/get-clip.c
>@@ -83,6 +83,8 @@ check_clip_extents (const cairo_test_context_t *ctx,
>     cairo_clip_extents (cr, &ext_x1, &ext_y1, &ext_x2, &ext_y2);
>     if (ext_x1 == x && ext_y1 == y && ext_x2 == x + width && ext_y2 == y + height)
>         return 1;
>+    if (width == 0.0 && height == 0.0 && ext_x1 == ext_x2 && ext_y1 == ext_y2)
>+        return 1;
>     cairo_test_log (ctx, "Error: %s; clip extents %f,%f,%f,%f should be %f,%f,%f,%f\n",
>                     message, ext_x1, ext_y1, ext_x2 - ext_x1, ext_y2 - ext_y1,
>                     x, y, width, height);
>@@ -138,7 +140,8 @@ preamble (cairo_test_context_t *ctx)
>     cairo_save (cr);
>     cairo_clip (cr);
>     rectangle_list = cairo_copy_clip_rectangle_list (cr);
>-    if (! check_count (ctx, phase, rectangle_list, 0))
>+    if (! check_count (ctx, phase, rectangle_list, 0) ||
>+        ! check_clip_extents (ctx, phase, cr, 0, 0, 0, 0))
>     {
> 	goto FAIL;
>     }

Actions: View | Splinter Review

Attachments on bug 29124: 37143

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.