gfx/cairo/xlib-initialize-members.patch@deefc01c0e14
gfx/cairo/xlib-initialize-members.patch
Thu, 15 Jan 2015 21:03:48 +0100
- author
- Michael Schloh von Bennewitz <michael@schloh.com>
- date
- Thu, 15 Jan 2015 21:03:48 +0100
- branch
- TOR_BUG_9701
- changeset 11
- deefc01c0e14
- permissions
- -rw-r--r--
Integrate friendly tips from Tor colleagues to make (or not) 4.5 alpha 3;
This includes removal of overloaded (but unused) methods, and addition of
a overlooked call to DataStruct::SetData(nsISupports, uint32_t, bool.)
1 diff -r 059e9961a122 gfx/cairo/cairo/src/cairo-xlib-display.c
2 --- a/gfx/cairo/cairo/src/cairo-xlib-display.c Thu Feb 25 03:59:05 2010 -0800
3 +++ b/gfx/cairo/cairo/src/cairo-xlib-display.c Fri Feb 26 16:15:29 2010 +0100
4 @@ -259,7 +259,14 @@
5 * add our hook. For now, that means Render, so we call into its
6 * QueryVersion function to ensure it gets initialized.
7 */
8 - XRenderQueryVersion (dpy, &render_major, &render_minor);
9 + Status s = XRenderQueryVersion (dpy, &render_major, &render_minor);
10 + if (s == 0) {
11 + /* XRenderQueryVersion failed, possibly because the server
12 + * doesn't have the RENDER extension. Don't leave the version
13 + * numbers uninitialised. See #548793.
14 + */
15 + render_major = render_minor = 0;
16 + }
18 codes = XAddExtension (dpy);
19 if (unlikely (codes == NULL)) {
