af5916ee54
- TGA loader: Fix for corrupt RLE format. - Fix drawing of closed polygons in certain situations (ticket 2309). - Set warning options when using gcc. - Silence compiler warnings. - Don't set -std=gnu99. - XPM loader: Simplify and fix certain case of cpp > 2.
41 lines
1.2 KiB
Text
41 lines
1.2 KiB
Text
$NetBSD: patch-ac,v 1.9 2014/05/17 09:25:01 adam Exp $
|
|
|
|
Add minimalist #ifndef blocks to rip out XShm support on Interix.
|
|
|
|
--- src/lib/grab.c.orig 2013-12-21 10:16:10.000000000 +0000
|
|
+++ src/lib/grab.c
|
|
@@ -528,7 +528,9 @@ __imlib_GrabDrawableToRGBA(DATA32 * data
|
|
int i;
|
|
int src_x, src_y, src_w, src_h;
|
|
int width, height, clipx, clipy;
|
|
+#ifndef __INTERIX
|
|
XShmSegmentInfo shminfo, mshminfo;
|
|
+#endif
|
|
XImage *xim, *mxim;
|
|
XColor cols[256];
|
|
|
|
@@ -661,11 +663,13 @@ __imlib_GrabDrawableToRGBA(DATA32 * data
|
|
__imlib_ShmCheck(d);
|
|
|
|
xim = NULL;
|
|
+#ifndef __INTERIX
|
|
if (x_does_shm)
|
|
{
|
|
xim = __imlib_ShmGetXImage(d, v, p, xatt.depth, x, y, w, h, &shminfo);
|
|
is_shm = ! !xim;
|
|
}
|
|
+#endif /* !__INTERIX */
|
|
if (!xim)
|
|
xim = XGetImage(d, p, x, y, w, h, 0xffffffff, ZPixmap);
|
|
if (!xim)
|
|
@@ -736,8 +740,10 @@ __imlib_GrabDrawableToRGBA(DATA32 * data
|
|
d, xim, mxim, v, xatt.depth, x, y, w, h, 0);
|
|
|
|
/* destroy the Ximage */
|
|
+#ifndef __INTERIX
|
|
if (is_shm)
|
|
__imlib_ShmDetach(d, &shminfo);
|
|
+#endif /* !__INTERIX */
|
|
XDestroyImage(xim);
|
|
if (mxim)
|
|
{
|