rocksndiamonds-3.1.0

[rocksndiamonds.git] / src / libgame / x11.c

diff --git a/src/libgame/x11.c b/src/libgame/x11.c
index 38365464e3d8617bf4d7c512f84e25cc9f46a0a1..6d5cb0a9ffe513e25af43487da2dad744eb53aff 100644 (file)
--- 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,11 +399,12 @@ 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;
 }
 
+#if defined(TARGET_X11_NATIVE)
 inline Pixel X11GetPixelFromRGB(unsigned int color_r, unsigned int color_g,
                                unsigned int color_b)
 {
@@ -420,6 +421,22 @@ inline Pixel X11GetPixelFromRGB(unsigned int color_r, unsigned int color_g,
 
   return pixel;
 }
+#endif /* TARGET_X11_NATIVE */
+
+inline void X11DestroyImage(XImage *ximage)
+{
+#if defined(TARGET_X11_NATIVE)
+  /* 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;
+  }
+#endif /* TARGET_X11_NATIVE */
+
+  XDestroyImage(ximage);
+}
+
 
 /* ------------------------------------------------------------------------- */
 /* mouse pointer functions                                                   */