diff options
| -rw-r--r-- | AUTHORS | 1 | ||||
| -rw-r--r-- | src/cairo-xcb-surface.c | 4 | ||||
| -rw-r--r-- | src/cairo-xlib-surface.c | 4 |
3 files changed, 7 insertions, 2 deletions
@@ -83,6 +83,7 @@ Travis Spencer <tspencer@cs.pdx.edu> XCB backend fix Bill Spitzak <spitzak@d2.com> Build fix to find Xrender.h without xrender.pc Zhe Su <james.su@gmail.com> Add support for fontconfig's embeddedbitmap option Owen Taylor <otaylor@redhat.com> Font rewrite, documentation, win32 backend +Karl Tomlinson <karlt+@karlt.net> Alp Toker <alp@atoker.com> Fix several code/comment typos Malcolm Tredinnick <malcolm@commsecure.com.au> Documentation fixes David Turner <david@freetype.org> Optimize gradient calculations diff --git a/src/cairo-xcb-surface.c b/src/cairo-xcb-surface.c index 7a8400728..fc72604cd 100644 --- a/src/cairo-xcb-surface.c +++ b/src/cairo-xcb-surface.c @@ -889,7 +889,9 @@ _surfaces_compatible (cairo_xcb_surface_t *dst, return FALSE; /* if Render is supported, match picture formats */ - if (src->xrender_format.id != XCB_NONE && src->xrender_format.id == dst->xrender_format.id) + if (src->xrender_format.id != dst->xrender_format.id) + return FALSE; + else if (src->xrender_format.id != XCB_NONE) return TRUE; /* Without Render, match visuals instead */ diff --git a/src/cairo-xlib-surface.c b/src/cairo-xlib-surface.c index 6012cfe52..3e126b7fa 100644 --- a/src/cairo-xlib-surface.c +++ b/src/cairo-xlib-surface.c @@ -1416,7 +1416,9 @@ _surfaces_compatible (cairo_xlib_surface_t *dst, return FALSE; /* if Render is supported, match picture formats */ - if (src->xrender_format != NULL && src->xrender_format == dst->xrender_format) + if (src->xrender_format != dst->xrender_format) + return FALSE; + else if (src->xrender_format != NULL) return TRUE; /* Without Render, match visuals instead */ |