X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Flibgame%2Fx11.c;h=2a21abcc89af91b55eb78c2c134cb0d1042bb5d6;hb=d42e0a36609c7990f8b9f6fcd80f37f65bcf5149;hp=d7acc801be5ae6ced5087e396fa48f35ccce3bfb;hpb=34ca525d659f14cec647449f4be8ee009a5bc267;p=rocksndiamonds.git

diff --git a/src/libgame/x11.c b/src/libgame/x11.c
index d7acc801..2a21abcc 100644
--- a/src/libgame/x11.c
+++ b/src/libgame/x11.c
@@ -214,7 +214,7 @@ static DrawWindow *X11InitWindow()
     XCreateGC(display, new_window->drawable, gc_valuemask, &gc_values);
 
   /* create GCs for line drawing (black and white) */
-  for(i=0; i<2; i++)
+  for (i = 0; i < 2; i++)
   {
     gc_values.graphics_exposures = False;
     gc_values.foreground = (i ? pen_fg : pen_bg);
@@ -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                                                   */