diff options
author | Owen Taylor <otaylor@redhat.com> | 2002-08-05 19:28:56 +0000 |
---|---|---|
committer | Owen Taylor <otaylor@src.gnome.org> | 2002-08-05 19:28:56 +0000 |
commit | e8468d5e6d5d76d0068d4800f951a52cf6390a27 (patch) | |
tree | ccb021144786818ed8d4abac07f5b19210afb91e /gdk/gdkpixbuf-render.c | |
parent | 1f8ad87b9f9d908869227f56df60af8d96c4c865 (diff) | |
download | gtk+-e8468d5e6d5d76d0068d4800f951a52cf6390a27.tar.gz |
Fix problem with wrong depth being used. (#89941, Jacob Berkman.) Remove
Mon Aug 5 15:25:40 2002 Owen Taylor <otaylor@redhat.com>
* gdk/gdkpixbuf-render.c (gdk_pixbuf_render_pixmap_and_mask_for_colormap):
Fix problem with wrong depth being used. (#89941, Jacob
Berkman.) Remove an unneeded 'screen' variable.
Mon Aug 5 15:04:59 2002 Owen Taylor <otaylor@redhat.com>
More fixes for warnings reported by David L. Cooper II
* gtk/gtkaccelmap.c (accel_map_parse_accel_path): Use
GdkModifierType for accel_mods. (#85856)
* gdk/gdkdisplay.h (struct _GdkDisplay): Make button_number
signed, since we use -1 as an 'unset' value. (#85854)
* gdk/x11/xsettings-client.c (parse_settings): Suppress
a warning (#85853)
* gdk/x11/gdkfont-x11.c (gdk_font_charset_for_locale): Fix
accidental trailing ';'. (#85846)
Diffstat (limited to 'gdk/gdkpixbuf-render.c')
-rw-r--r-- | gdk/gdkpixbuf-render.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/gdk/gdkpixbuf-render.c b/gdk/gdkpixbuf-render.c index 3f24da390e..98d0b62e9c 100644 --- a/gdk/gdkpixbuf-render.c +++ b/gdk/gdkpixbuf-render.c @@ -316,7 +316,7 @@ gdk_pixbuf_render_pixmap_and_mask_for_colormap (GdkPixbuf *pixbuf, GdkGC *gc; *pixmap_return = gdk_pixmap_new (gdk_screen_get_root_window (screen), gdk_pixbuf_get_width (pixbuf), gdk_pixbuf_get_height (pixbuf), - gdk_screen_get_rgb_visual (screen)->depth); + gdk_colormap_get_visual (colormap)->depth); gdk_drawable_set_colormap (GDK_DRAWABLE (*pixmap_return), colormap); gc = gdk_gc_new (*pixmap_return); @@ -332,8 +332,6 @@ gdk_pixbuf_render_pixmap_and_mask_for_colormap (GdkPixbuf *pixbuf, { if (gdk_pixbuf_get_has_alpha (pixbuf)) { - GdkScreen *screen = gdk_colormap_get_screen (colormap); - *mask_return = gdk_pixmap_new (gdk_screen_get_root_window (screen), gdk_pixbuf_get_width (pixbuf), gdk_pixbuf_get_height (pixbuf), 1); |