From e8468d5e6d5d76d0068d4800f951a52cf6390a27 Mon Sep 17 00:00:00 2001 From: Owen Taylor Date: Mon, 5 Aug 2002 19:28:56 +0000 Subject: [PATCH] Fix problem with wrong depth being used. (#89941, Jacob Berkman.) Remove Mon Aug 5 15:25:40 2002 Owen Taylor * 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 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) --- ChangeLog | 6 ++++++ ChangeLog.pre-2-10 | 6 ++++++ ChangeLog.pre-2-2 | 6 ++++++ ChangeLog.pre-2-4 | 6 ++++++ ChangeLog.pre-2-6 | 6 ++++++ ChangeLog.pre-2-8 | 6 ++++++ gdk/gdkpixbuf-render.c | 4 +--- gdk/x11/gdkfont-x11.c | 2 +- gdk/x11/xsettings-client.c | 2 +- gtk/gtkaccelmap.c | 3 ++- 10 files changed, 41 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index afd12e69a..6a1605dd3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Mon Aug 5 15:25:40 2002 Owen Taylor + + * 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 More fixes for warnings reported by David L. Cooper II diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index afd12e69a..6a1605dd3 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,9 @@ +Mon Aug 5 15:25:40 2002 Owen Taylor + + * 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 More fixes for warnings reported by David L. Cooper II diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index afd12e69a..6a1605dd3 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,9 @@ +Mon Aug 5 15:25:40 2002 Owen Taylor + + * 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 More fixes for warnings reported by David L. Cooper II diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index afd12e69a..6a1605dd3 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,9 @@ +Mon Aug 5 15:25:40 2002 Owen Taylor + + * 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 More fixes for warnings reported by David L. Cooper II diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index afd12e69a..6a1605dd3 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,9 @@ +Mon Aug 5 15:25:40 2002 Owen Taylor + + * 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 More fixes for warnings reported by David L. Cooper II diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index afd12e69a..6a1605dd3 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,9 @@ +Mon Aug 5 15:25:40 2002 Owen Taylor + + * 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 More fixes for warnings reported by David L. Cooper II diff --git a/gdk/gdkpixbuf-render.c b/gdk/gdkpixbuf-render.c index 3f24da390..98d0b62e9 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); diff --git a/gdk/x11/gdkfont-x11.c b/gdk/x11/gdkfont-x11.c index dbafcdee8..a04770419 100644 --- a/gdk/x11/gdkfont-x11.c +++ b/gdk/x11/gdkfont-x11.c @@ -257,7 +257,7 @@ gdk_font_charset_for_locale (void) return g_strdup (result); else return g_strdup ("iso8859-1"); -}; +} /** * gdk_font_from_description_for_display: diff --git a/gdk/x11/xsettings-client.c b/gdk/x11/xsettings-client.c index b98535bc8..7be2dd1bb 100644 --- a/gdk/x11/xsettings-client.c +++ b/gdk/x11/xsettings-client.c @@ -194,7 +194,7 @@ parse_settings (unsigned char *data, buffer.pos = buffer.data = data; buffer.len = len; - result = fetch_card8 (&buffer, &buffer.byte_order); + result = fetch_card8 (&buffer, (char *)&buffer.byte_order); if (buffer.byte_order != MSBFirst && buffer.byte_order != LSBFirst) { diff --git a/gtk/gtkaccelmap.c b/gtk/gtkaccelmap.c index 3c1058047..5dd21c04e 100644 --- a/gtk/gtkaccelmap.c +++ b/gtk/gtkaccelmap.c @@ -407,7 +407,8 @@ gtk_accel_map_change_entry (const gchar *accel_path, static guint accel_map_parse_accel_path (GScanner *scanner) { - guint accel_key = 0, accel_mods = 0; + guint accel_key = 0; + GdkModifierType accel_mods = 0; gchar *path, *accel; /* parse accel path */