gfx/cairo/fix-clip-test.patch

Thu, 22 Jan 2015 13:21:57 +0100

author
Michael Schloh von Bennewitz <michael@schloh.com>
date
Thu, 22 Jan 2015 13:21:57 +0100
branch
TOR_BUG_9701
changeset 15
b8a032363ba2
permissions
-rw-r--r--

Incorporate requested changes from Mozilla in review:
https://bugzilla.mozilla.org/show_bug.cgi?id=1123480#c6

michael@0 1 Fix a clip test to test the right coordinate.
michael@0 2
michael@0 3 Fixed upstream by 498c10032ea3f8631a928cd7df96766f2c8ddca4
michael@0 4 diff --git a/gfx/cairo/cairo/src/cairo-clip.c b/gfx/cairo/cairo/src/cairo-clip.c
michael@0 5 --- a/gfx/cairo/cairo/src/cairo-clip.c
michael@0 6 +++ b/gfx/cairo/cairo/src/cairo-clip.c
michael@0 7 @@ -408,7 +408,7 @@ _cairo_clip_rectangle (cairo_clip_t
michael@0 8 /* if a smaller clip has already been set, ignore the new path */
michael@0 9 if (clip->path != NULL) {
michael@0 10 if (rectangle->x <= clip->path->extents.x &&
michael@0 11 - rectangle->y <= clip->path->extents.x &&
michael@0 12 + rectangle->y <= clip->path->extents.y &&
michael@0 13 rectangle->x + rectangle->width >= clip->path->extents.x + clip->path->extents.width &&
michael@0 14 rectangle->y + rectangle->height >= clip->path->extents.y + clip->path->extents.height)
michael@0 15 {

mercurial