Lerking/gtk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Handle closed displays correctly. (Coverity)

Browse Source 
2006-04-12  Matthias Clasen  <mclasen@redhat.com>

        * gdk/x11/gdkimage-x11.c (gdk_image_new_bitmap): Handle
        closed displays correctly.  (Coverity)
This commit is contained in:
Matthias Clasen
2006-04-12 20:51:19 +00:00
committed by Matthias Clasen
parent eb675a98a0
commit b898f3379a
3 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@@ -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)

3
ChangeLog.pre-2-10
View File

@@ -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)

13
gdk/x11/gdkimage-x11.c
View File

@@ -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)