Fix another Coverity bug

diff --git a/ChangeLog b/ChangeLog
index decaa4ae92f0dc6421ad97703c8914d7d0ea649b..82b35ca6112a1ef7f7df52139503165887ad5192 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2006-04-12  Matthias Clasen  <mclasen@redhat.com>
 
+       * gdk/x11/gdkimage-x11.c (gdk_image_new_bitmap): Handle
+       closed displays correctly.  (Coverity)
+
         * contrib/gdk-pixbuf-xlib/Makefile.am:
         * modules/engines/pixbuf/Makefile.am
         * gdk-pixbuf/Makefile.am: Build fixes for Cygwin.  (#338262)

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index decaa4ae92f0dc6421ad97703c8914d7d0ea649b..82b35ca6112a1ef7f7df52139503165887ad5192 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,5 +1,8 @@
 2006-04-12  Matthias Clasen  <mclasen@redhat.com>
 
+       * gdk/x11/gdkimage-x11.c (gdk_image_new_bitmap): Handle
+       closed displays correctly.  (Coverity)
+
         * contrib/gdk-pixbuf-xlib/Makefile.am:
         * modules/engines/pixbuf/Makefile.am
         * gdk-pixbuf/Makefile.am: Build fixes for Cygwin.  (#338262)

diff --git a/gdk/x11/gdkimage-x11.c b/gdk/x11/gdkimage-x11.c
index 13715f8929df18849d8da6d1f4e6d0d98ddb8bdf..ee2934f980c3e6e422649d8b75f124b94354186b 100644 (file)
--- a/gdk/x11/gdkimage-x11.c
+++ b/gdk/x11/gdkimage-x11.c
@@ -160,17 +160,17 @@ gdk_image_new_bitmap (GdkVisual *visual,
       private->ximage = XCreateImage (GDK_SCREEN_XDISPLAY (private->screen),
                                      xvisual, 1, XYBitmap,
                                      0, NULL, width, height, 8, 0);
+      private->ximage->data = data;
+      private->ximage->bitmap_bit_order = MSBFirst;
+      private->ximage->byte_order = MSBFirst;
     }
   
-  private->ximage->data = data;
-  private->ximage->bitmap_bit_order = MSBFirst;
-  private->ximage->byte_order = MSBFirst;
   image->byte_order = MSBFirst;
   image->mem =  private->ximage->data;
   image->bpl = private->ximage->bytes_per_line;
   image->bpp = 1;
-  return(image);
-} /* gdk_image_new_bitmap() */
+  return image;
+} 
 
 void
 _gdk_windowing_image_init (GdkDisplay *display)