From afecb32dbc680acdf961b40d589d3db3d8ae9c58 Mon Sep 17 00:00:00 2001 From: Owen Taylor Date: Fri, 27 Sep 2002 21:26:18 +0000 Subject: [PATCH] Fix some signed/unsigned warnings. (#85863, David L. Cooper II) Fri Sep 27 17:23:31 2002 Owen Taylor * gtk/gtkcolorsel.c: Fix some signed/unsigned warnings. (#85863, David L. Cooper II) --- ChangeLog | 5 +++++ ChangeLog.pre-2-10 | 5 +++++ ChangeLog.pre-2-2 | 5 +++++ ChangeLog.pre-2-4 | 5 +++++ ChangeLog.pre-2-6 | 5 +++++ ChangeLog.pre-2-8 | 5 +++++ gtk/gtkcolorsel.c | 10 +++++----- 7 files changed, 35 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 01f1f395ff..a3e6b48cdd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Fri Sep 27 17:23:31 2002 Owen Taylor + + * gtk/gtkcolorsel.c: Fix some signed/unsigned warnings. + (#85863, David L. Cooper II) + Fri Sep 27 16:23:49 2002 Owen Taylor * gtk/gtklabel.c : Replaced instances where strlen (label->label) is diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 01f1f395ff..a3e6b48cdd 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,8 @@ +Fri Sep 27 17:23:31 2002 Owen Taylor + + * gtk/gtkcolorsel.c: Fix some signed/unsigned warnings. + (#85863, David L. Cooper II) + Fri Sep 27 16:23:49 2002 Owen Taylor * gtk/gtklabel.c : Replaced instances where strlen (label->label) is diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 01f1f395ff..a3e6b48cdd 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,8 @@ +Fri Sep 27 17:23:31 2002 Owen Taylor + + * gtk/gtkcolorsel.c: Fix some signed/unsigned warnings. + (#85863, David L. Cooper II) + Fri Sep 27 16:23:49 2002 Owen Taylor * gtk/gtklabel.c : Replaced instances where strlen (label->label) is diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 01f1f395ff..a3e6b48cdd 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,8 @@ +Fri Sep 27 17:23:31 2002 Owen Taylor + + * gtk/gtkcolorsel.c: Fix some signed/unsigned warnings. + (#85863, David L. Cooper II) + Fri Sep 27 16:23:49 2002 Owen Taylor * gtk/gtklabel.c : Replaced instances where strlen (label->label) is diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 01f1f395ff..a3e6b48cdd 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,8 @@ +Fri Sep 27 17:23:31 2002 Owen Taylor + + * gtk/gtkcolorsel.c: Fix some signed/unsigned warnings. + (#85863, David L. Cooper II) + Fri Sep 27 16:23:49 2002 Owen Taylor * gtk/gtklabel.c : Replaced instances where strlen (label->label) is diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 01f1f395ff..a3e6b48cdd 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,8 @@ +Fri Sep 27 17:23:31 2002 Owen Taylor + + * gtk/gtkcolorsel.c: Fix some signed/unsigned warnings. + (#85863, David L. Cooper II) + Fri Sep 27 16:23:49 2002 Owen Taylor * gtk/gtklabel.c : Replaced instances where strlen (label->label) is diff --git a/gtk/gtkcolorsel.c b/gtk/gtkcolorsel.c index 17b1176071..069fa8c576 100644 --- a/gtk/gtkcolorsel.c +++ b/gtk/gtkcolorsel.c @@ -190,14 +190,14 @@ static GtkColorSelectionChangePaletteWithScreenFunc change_palette_hook = defaul #define DROPPER_Y_HOT 16 -static char dropper_bits[] = { +static guchar dropper_bits[] = { 0xff, 0x8f, 0x01, 0xff, 0x77, 0x01, 0xff, 0xfb, 0x00, 0xff, 0xf8, 0x00, 0x7f, 0xff, 0x00, 0xff, 0x7e, 0x01, 0xff, 0x9d, 0x01, 0xff, 0xd8, 0x01, 0x7f, 0xd4, 0x01, 0x3f, 0xee, 0x01, 0x1f, 0xff, 0x01, 0x8f, 0xff, 0x01, 0xc7, 0xff, 0x01, 0xe3, 0xff, 0x01, 0xf3, 0xff, 0x01, 0xfd, 0xff, 0x01, 0xff, 0xff, 0x01, }; -static char dropper_mask[] = { +static guchar dropper_mask[] = { 0x00, 0x70, 0x00, 0x00, 0xf8, 0x00, 0x00, 0xfc, 0x01, 0x00, 0xff, 0x01, 0x80, 0xff, 0x01, 0x00, 0xff, 0x00, 0x00, 0x7f, 0x00, 0x80, 0x3f, 0x00, 0xc0, 0x3f, 0x00, 0xe0, 0x13, 0x00, 0xf0, 0x01, 0x00, 0xf8, 0x00, 0x00, @@ -638,7 +638,7 @@ get_focus_gc (GtkWidget *drawing_area, GDK_CAP_BUTT, GDK_JOIN_MITER); if (dash_list[0]) - gdk_gc_set_dashes (gc, 0, dash_list, strlen (dash_list)); + gdk_gc_set_dashes (gc, 0, dash_list, strlen ((char *)dash_list)); g_free (dash_list); @@ -1121,11 +1121,11 @@ make_picker_cursor (GdkScreen *screen) GdkPixmap *pixmap = gdk_bitmap_create_from_data (gdk_screen_get_root_window (screen), - dropper_bits, DROPPER_WIDTH, DROPPER_HEIGHT); + (gchar *)dropper_bits, DROPPER_WIDTH, DROPPER_HEIGHT); GdkPixmap *mask = gdk_bitmap_create_from_data (gdk_screen_get_root_window (screen), - dropper_mask, DROPPER_WIDTH, DROPPER_HEIGHT); + (gchar *)dropper_mask, DROPPER_WIDTH, DROPPER_HEIGHT); gdk_color_white (gdk_screen_get_system_colormap (screen), &bg);