X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Flibgame%2Fx11.c;h=2a21abcc89af91b55eb78c2c134cb0d1042bb5d6;hb=1c636a51bb573815d24a27dcc20b3283d89d1b8b;hp=ce520f6452ed70613d8fc664aec436669293541e;hpb=9afd3ebaca7211c2c7e10926ddaaf422c73486dc;p=rocksndiamonds.git diff --git a/src/libgame/x11.c b/src/libgame/x11.c index ce520f64..2a21abcc 100644 --- a/src/libgame/x11.c +++ b/src/libgame/x11.c @@ -399,7 +399,7 @@ inline Pixel X11GetPixel(Bitmap *bitmap, int x, int y) AllPlanes, ZPixmap); pixel_value = XGetPixel(pixel_image, 0, 0); - XDestroyImage(pixel_image); + X11DestroyImage(pixel_image); return pixel_value; } @@ -423,6 +423,18 @@ inline Pixel X11GetPixelFromRGB(unsigned int color_r, unsigned int color_g, } #endif /* TARGET_X11_NATIVE */ +inline void X11DestroyImage(XImage *ximage) +{ + /* this seems to be needed for OS/2, but does not hurt on other platforms */ + if (ximage->data != NULL) + { + free(ximage->data); + ximage->data = NULL; + } + + XDestroyImage(ximage); +} + /* ------------------------------------------------------------------------- */ /* mouse pointer functions */