summaryrefslogtreecommitdiff
path: root/src/modules/evas/engines/software_x11/evas_xcb_image.c
diff options
context:
space:
mode:
authorStefan Schmidt <stefan@osg.samsung.com>2016-01-07 08:48:56 +0100
committerStefan Schmidt <stefan@osg.samsung.com>2016-01-07 08:50:47 +0100
commit3557b346c4c66a60a694385db62a63519ed7cb64 (patch)
treecb5ba2e86b2134167472b5b24b4aadcf2bec0b8c /src/modules/evas/engines/software_x11/evas_xcb_image.c
parent33975599145e6239bec604c8f9e662930cdc96af (diff)
evas_xcb: fix build with xcb after TBM patches
GLX was not the only thing which did no longer compile. Same for xcb here. Thanks Jenkins for testing this for us.
Diffstat (limited to '')
-rw-r--r--src/modules/evas/engines/software_x11/evas_xcb_image.c22
1 files changed, 11 insertions, 11 deletions
diff --git a/src/modules/evas/engines/software_x11/evas_xcb_image.c b/src/modules/evas/engines/software_x11/evas_xcb_image.c
index dc892456c4..f05968283a 100644
--- a/src/modules/evas/engines/software_x11/evas_xcb_image.c
+++ b/src/modules/evas/engines/software_x11/evas_xcb_image.c
@@ -14,20 +14,20 @@ _evas_xcb_image_update(void *data EINA_UNUSED, void *image, int x, int y, int w,
14 im = image; 14 im = image;
15 n = im->native.data; 15 n = im->native.data;
16 16
17 if (ecore_x_image_get(n->ns_data.x11->exim, n->ns_data.x11->pixmap, 0, 0, x, y, w, h)) 17 if (ecore_x_image_get(n->ns_data.x11.exim, n->ns_data.x11.pixmap, 0, 0, x, y, w, h))
18 { 18 {
19 char *pix; 19 char *pix;
20 int bpl, rows, bpp; 20 int bpl, rows, bpp;
21 21
22 pix = ecore_x_image_data_get(n->ns_data.x11->exim, &bpl, &rows, &bpp); 22 pix = ecore_x_image_data_get(n->ns_data.x11.exim, &bpl, &rows, &bpp);
23 if (!ecore_x_image_is_argb32_get(n->ns_data.x11->exim)) 23 if (!ecore_x_image_is_argb32_get(n->ns_data.x11.exim))
24 { 24 {
25 Ecore_X_Colormap colormap; 25 Ecore_X_Colormap colormap;
26 26
27 if (!im->image.data) 27 if (!im->image.data)
28 im->image.data = (DATA32 *)malloc(im->cache_entry.w * im->cache_entry.h * sizeof(DATA32)); 28 im->image.data = (DATA32 *)malloc(im->cache_entry.w * im->cache_entry.h * sizeof(DATA32));
29 colormap = ecore_x_default_colormap_get(ecore_x_display_get(), ecore_x_default_screen_get()); 29 colormap = ecore_x_default_colormap_get(ecore_x_display_get(), ecore_x_default_screen_get());
30 ecore_x_image_to_argb_convert(pix, bpp, bpl, colormap, n->ns_data.x11->visual, 30 ecore_x_image_to_argb_convert(pix, bpp, bpl, colormap, n->ns_data.x11.visual,
31 x, y, w, h, im->image.data, 31 x, y, w, h, im->image.data,
32 (w * sizeof(int)), 0, 0); 32 (w * sizeof(int)), 0, 0);
33 } 33 }
@@ -58,12 +58,12 @@ _native_cb_free(void *data EINA_UNUSED, void *image)
58 im = image; 58 im = image;
59 n = im->native.data; 59 n = im->native.data;
60 60
61 if (n->ns_data.x11->exim) 61 if (n->ns_data.x11.exim)
62 { 62 {
63 ecore_x_image_free(n->ns_data.x11->exim); 63 ecore_x_image_free(n->ns_data.x11.exim);
64 n->ns_data.x11->exim = NULL; 64 n->ns_data.x11.exim = NULL;
65 } 65 }
66 n->ns_data.x11->visual = NULL; 66 n->ns_data.x11.visual = NULL;
67 67
68 im->native.data = NULL; 68 im->native.data = NULL;
69 im->native.func.data = NULL; 69 im->native.func.data = NULL;
@@ -110,9 +110,9 @@ evas_xcb_image_native_set(void *data, void *image, void *native)
110 } 110 }
111 111
112 memcpy(&(n->ns), ns, sizeof(Evas_Native_Surface)); 112 memcpy(&(n->ns), ns, sizeof(Evas_Native_Surface));
113 n->ns_data.x11->pixmap = pm; 113 n->ns_data.x11.pixmap = pm;
114 n->ns_data.x11->visual = vis; 114 n->ns_data.x11.visual = vis;
115 n->ns_data.x11->exim = exim; 115 n->ns_data.x11.exim = exim;
116 116
117 im->native.data = n; 117 im->native.data = n;
118 im->native.func.data = NULL; 118 im->native.func.data = NULL;