From 77f3fe8b0fda355fffed293427164a60ff097feb Mon Sep 17 00:00:00 2001 From: caro Date: Mon, 14 Jun 2010 19:19:30 +0000 Subject: [PATCH] fix code. Patch by Mikhail Gusarov git-svn-id: http://svn.enlightenment.org/svn/e/trunk/ecore@49668 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33 --- src/lib/ecore_x/xcb/ecore_xcb_region.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/src/lib/ecore_x/xcb/ecore_xcb_region.c b/src/lib/ecore_x/xcb/ecore_xcb_region.c index 24d27a1..ac6ffc9 100644 --- a/src/lib/ecore_x/xcb/ecore_xcb_region.c +++ b/src/lib/ecore_x/xcb/ecore_xcb_region.c @@ -6,7 +6,9 @@ # include #endif -#include "ecore_x_private.h" +#include + +#include "ecore_xcb_private.h" /* @@ -62,6 +64,7 @@ ecore_x_xregion_set(Ecore_X_XRegion *region, Ecore_X_GC gc) xcb_rectangle_t *rects; pixman_box16_t *boxes; int num; + int i; if (!region) return 0; @@ -83,7 +86,7 @@ ecore_x_xregion_set(Ecore_X_XRegion *region, Ecore_X_GC gc) rects[i].height = boxes[i].y2 - boxes[i].y1 + 1; } - xcb_set_clip_rectangles(_ecore_x_connection, + xcb_set_clip_rectangles(_ecore_xcb_conn, XCB_CLIP_ORDERING_YX_BANDED, gc, 0, 0, @@ -121,7 +124,7 @@ ecore_x_xregion_union_rect(Ecore_X_XRegion *dst, Ecore_X_XRegion *src, Ecore_X_R } EAPI int -ecore_x_xregion_subtract(Ecore_X_XRegion *dst, Ecore_X_XRegion *r1, Ecore_X_XRegion *r2) +ecore_x_xregion_subtract(Ecore_X_XRegion *dst, Ecore_X_XRegion *rm, Ecore_X_XRegion *rs) { return pixman_region_subtract((pixman_region16_t *)dst, (pixman_region16_t *)rm, (pixman_region16_t *)rs); } @@ -150,7 +153,7 @@ ecore_x_xregion_point_contain(Ecore_X_XRegion *region, int x, int y) if (!region) return 0; - return pixman_region_contains_point((pixman_region16_t *)region, x, y); + return pixman_region_contains_point((pixman_region16_t *)region, x, y, NULL); } EAPI int -- 2.7.4