forked from old/legacy-imlib2
Fix excessive checking for shm extension in __imlib_GrabDrawableToRGBA().
SVN revision: 46333
This commit is contained in:
parent
b036dd5644
commit
7bf03a945c
|
@ -532,7 +532,6 @@ __imlib_GrabDrawableToRGBA(DATA32 * data, int ox, int oy, int ow, int oh,
|
||||||
int width, height, clipx, clipy;
|
int width, height, clipx, clipy;
|
||||||
XShmSegmentInfo shminfo, mshminfo;
|
XShmSegmentInfo shminfo, mshminfo;
|
||||||
XImage *xim, *mxim;
|
XImage *xim, *mxim;
|
||||||
static signed char x_does_shm = -1;
|
|
||||||
XColor cols[256];
|
XColor cols[256];
|
||||||
|
|
||||||
domask = (pdomask) ? *pdomask : 0;
|
domask = (pdomask) ? *pdomask : 0;
|
||||||
|
|
|
@ -7,8 +7,10 @@
|
||||||
#include <sys/shm.h>
|
#include <sys/shm.h>
|
||||||
#include "ximage.h"
|
#include "ximage.h"
|
||||||
|
|
||||||
|
/* global flags */
|
||||||
|
signed char x_does_shm = -1;
|
||||||
|
|
||||||
/* static private variables */
|
/* static private variables */
|
||||||
static signed char x_does_shm = -1;
|
|
||||||
static int list_num = 0;
|
static int list_num = 0;
|
||||||
static XImage **list_xim = NULL;
|
static XImage **list_xim = NULL;
|
||||||
static XShmSegmentInfo **list_si = NULL;
|
static XShmSegmentInfo **list_si = NULL;
|
||||||
|
|
|
@ -4,6 +4,8 @@
|
||||||
#include <X11/Xlib.h>
|
#include <X11/Xlib.h>
|
||||||
#include <X11/extensions/XShm.h>
|
#include <X11/extensions/XShm.h>
|
||||||
|
|
||||||
|
__hidden signed char x_does_shm;
|
||||||
|
|
||||||
void __imlib_SetMaxXImageCount(Display * d, int num);
|
void __imlib_SetMaxXImageCount(Display * d, int num);
|
||||||
__hidden int __imlib_GetMaxXImageCount(Display * d);
|
__hidden int __imlib_GetMaxXImageCount(Display * d);
|
||||||
__hidden void __imlib_SetMaxXImageTotalSize(Display * d, int num);
|
__hidden void __imlib_SetMaxXImageTotalSize(Display * d, int num);
|
||||||
|
|
Loading…
Reference in New Issue