diff options
| author | mh0310.choi <mh0310.choi@samsung.com> | 2015-07-28 10:46:57 +0900 |
|---|---|---|
| committer | mh0310.choi <mh0310.choi@samsung.com> | 2015-07-28 13:08:12 +0900 |
| commit | 5e67a6f721eaedda61300baf0799199c7771ebd0 (patch) | |
| tree | 6cd50b52498aab50e79b966cdccc2a137db316d9 /src/cairo-xlib-display.c | |
| parent | d3aeffba37161d2b76b29c4ea13369bd67a47a8e (diff) | |
| download | cairo-5e67a6f721eaedda61300baf0799199c7771ebd0.tar.gz cairo-5e67a6f721eaedda61300baf0799199c7771ebd0.tar.bz2 cairo-5e67a6f721eaedda61300baf0799199c7771ebd0.zip | |
Cairo version Upgrade for Tizen3.0submit/tizen_tv/20150728.091927submit/tizen_mobile/20150728.091912submit/tizen_common/20150728.091859accepted/tizen/tv/20150729.011254accepted/tizen/mobile/20150729.011230
- from 1.12.14 to 1.14.2
Change-Id: I3b62d212041b337bbb926d579f9ce74f42a45c3b
Diffstat (limited to 'src/cairo-xlib-display.c')
| -rw-r--r--[-rwxr-xr-x] | src/cairo-xlib-display.c | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/src/cairo-xlib-display.c b/src/cairo-xlib-display.c index cc82b3a99..88efe9c0e 100755..100644 --- a/src/cairo-xlib-display.c +++ b/src/cairo-xlib-display.c @@ -292,7 +292,7 @@ _cairo_xlib_device_create (Display *dpy) * * 1. The original bug that led to the buggy_repeat * workaround. This was a bug that Owen Taylor investigated, - * understood well, and characterized against carious X + * understood well, and characterized against various X * servers. Confirmed X servers with this bug include: * * "XFree86" <= 40500000 @@ -484,7 +484,7 @@ _cairo_xlib_display_get_xrender_format_for_pixman(cairo_xlib_display_t *display, #undef MASK /* XXX caching? */ - return XRenderFindFormat(dpy, mask, &tmpl, 1); + return XRenderFindFormat(dpy, mask, &tmpl, 0); } XRenderPictFormat * @@ -493,12 +493,6 @@ _cairo_xlib_display_get_xrender_format (cairo_xlib_display_t *display, { XRenderPictFormat *xrender_format; -#if ! ATOMIC_OP_NEEDS_MEMORY_BARRIER - xrender_format = display->cached_xrender_formats[format]; - if (likely (xrender_format != NULL)) - return xrender_format; -#endif - xrender_format = display->cached_xrender_formats[format]; if (xrender_format == NULL) { int pict_format = PictStandardNUM; @@ -576,7 +570,7 @@ _cairo_xlib_display_has_gradients (cairo_device_t *device) * * Restricts all future Xlib surfaces for this devices to the specified version * of the RENDER extension. This function exists solely for debugging purpose. - * It let's you find out how cairo would behave with an older version of + * It lets you find out how cairo would behave with an older version of * the RENDER extension. * * Use the special values -1 and -1 for disabling the RENDER extension. |