From b898f3379a5a555c20e457ebeb73df170c5bbf33 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Wed, 12 Apr 2006 20:51:19 +0000 Subject: [PATCH] Handle closed displays correctly. (Coverity) 2006-04-12 Matthias Clasen * gdk/x11/gdkimage-x11.c (gdk_image_new_bitmap): Handle closed displays correctly. (Coverity) --- ChangeLog | 3 +++ ChangeLog.pre-2-10 | 3 +++ gdk/x11/gdkimage-x11.c | 13 +++++++------ 3 files changed, 13 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index d83d61e09c..e927f7c911 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2006-04-12 Matthias Clasen + * 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 d83d61e09c..e927f7c911 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,5 +1,8 @@ 2006-04-12 Matthias Clasen + * 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 d6ca243395..3aaf5e4c81 100644 --- a/gdk/x11/gdkimage-x11.c +++ b/gdk/x11/gdkimage-x11.c @@ -158,7 +158,7 @@ _gdk_image_exit (void) * Return value: a new #GdkImage. **/ GdkImage * -gdk_image_new_bitmap(GdkVisual *visual, gpointer data, gint width, gint height) +gdk_image_new_bitmap (GdkVisual *visual, gpointer data, gint width, gint height) { Visual *xvisual; GdkImage *image; @@ -184,17 +184,18 @@ gdk_image_new_bitmap(GdkVisual *visual, gpointer data, gint width, gint height) 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)