summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarl Worth <cworth@cworth.org>2007-06-27 11:07:07 -0700
committerCarl Worth <cworth@cworth.org>2007-06-27 11:07:07 -0700
commitb019cb8a7a910879c7af304edbd06fd105c9d89e (patch)
tree09c008e0fa28fc434ab71be90d037f3d182852db
parent6d021eb4b6e319dd2bb3e5e126de07c6844d5c07 (diff)
Revert "[cairo-xlib-surface] Check for errors before installing a NOOP error handler."
This reverts commit 7016614dd90798247524f0c118f462aa2e7ef673. We want to avoid any negative performance impacts due to extra calls to XSync. The fact that X errors can be missed with this appraoch is undesirable of course---a proper fix will likely involve moving to XCB which will hopefully allow us to do the error-checking the way we want without any performance penalty.
-rw-r--r--src/cairo-xlib-surface.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/src/cairo-xlib-surface.c b/src/cairo-xlib-surface.c
index 131551e7..39175bdf 100644
--- a/src/cairo-xlib-surface.c
+++ b/src/cairo-xlib-surface.c
@@ -547,7 +547,6 @@ _get_image_surface (cairo_xlib_surface_t *surface,
{
cairo_xlib_error_func_t old_handler;
- XSync (surface->dpy, False);
old_handler = XSetErrorHandler (_noop_error_handler);
ximage = XGetImage (surface->dpy,
@@ -556,7 +555,6 @@ _get_image_surface (cairo_xlib_surface_t *surface,
x2 - x1, y2 - y1,
AllPlanes, ZPixmap);
- XSync (surface->dpy, False);
XSetErrorHandler (old_handler);
/* If we get an error, the surface must have been a window,