Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-02-16 13:56:29 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

cairo: Fix a clip test to test the right coordinate. r=ehsan,a=gavin

Browse Source 
Fixed upstream by 498c10032ea3f8631a928cd7df96766f2c8ddca4
This commit is contained in:
Jeff Muizelaar 2010-08-17 20:08:57 -04:00
parent 378490ae79
commit 7ed56960b2
3 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gfx/cairo/README
View File

@ -138,6 +138,8 @@ disable-previous-scaled-font-cache.patch: Disable the previous-scaled-font-cache
copyarea-with-alpha.patch: support simple overlapping self copies in (some) color_alpha xlib surfaces. https://bugs.freedesktop.org/show_bug.cgi?id=29250
fix-clip-test.patch: Use y 498c10032ea3f8631a928cd7df96766f2c8ddca4
==== pixman patches ====
pixman-android-cpu-detect.patch: Add CPU detection support for Android, where we can't reliably access /proc/self/auxv.

2
gfx/cairo/cairo/src/cairo-clip.c
View File

@ -408,7 +408,7 @@ _cairo_clip_rectangle (cairo_clip_t *clip,
/* if a smaller clip has already been set, ignore the new path */
if (clip->path != NULL) {
if (rectangle->x <= clip->path->extents.x &&
rectangle->y <= clip->path->extents.x &&
rectangle->y <= clip->path->extents.y &&
rectangle->x + rectangle->width >= clip->path->extents.x + clip->path->extents.width &&
rectangle->y + rectangle->height >= clip->path->extents.y + clip->path->extents.height)
{

15
gfx/cairo/fix-clip-test.patch Normal file
View File

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