diff --git a/ChangeLog b/ChangeLog index a849c08420..c9ef73dd4f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2003-07-01 Sven Neumann + + * libgimp/gimpbrushselect.c + * libgimp/gimpfontselect.c + * libgimp/gimpgradientselect.c + * libgimp/gimppatternselect.c: added const qualifiers. + + * libgimp/gimpmiscui.c: reverted a bogus change from my last commit. + 2003-07-01 Sven Neumann * plug-ins/common: first set of plug-ins adapted to the constified diff --git a/libgimp/gimpbrushselect.c b/libgimp/gimpbrushselect.c index 83bde38309..ef9d676b9f 100644 --- a/libgimp/gimpbrushselect.c +++ b/libgimp/gimpbrushselect.c @@ -45,12 +45,12 @@ struct _GimpBrushData /* local function prototypes */ -static void gimp_temp_brush_run (gchar *name, - gint nparams, - GimpParam *param, - gint *nreturn_vals, - GimpParam **return_vals); -static gboolean gimp_temp_brush_run_idle (GimpBrushData *brush_data); +static void gimp_temp_brush_run (const gchar *name, + gint nparams, + const GimpParam *param, + gint *nreturn_vals, + GimpParam **return_vals); +static gboolean gimp_temp_brush_run_idle (GimpBrushData *brush_data); /* private variables */ @@ -162,11 +162,11 @@ gimp_brush_select_destroy (const gchar *brush_callback) /* private functions */ static void -gimp_temp_brush_run (gchar *name, - gint nparams, - GimpParam *param, - gint *nreturn_vals, - GimpParam **return_vals) +gimp_temp_brush_run (const gchar *name, + gint nparams, + const GimpParam *param, + gint *nreturn_vals, + GimpParam **return_vals) { static GimpParam values[1]; GimpBrushData *brush_data; diff --git a/libgimp/gimpfontselect.c b/libgimp/gimpfontselect.c index 5dd2b7d166..647cb523e4 100644 --- a/libgimp/gimpfontselect.c +++ b/libgimp/gimpfontselect.c @@ -39,12 +39,12 @@ struct _GimpFontData /* local function prototypes */ -static void gimp_temp_font_run (gchar *name, - gint nparams, - GimpParam *param, - gint *nreturn_vals, - GimpParam **return_vals); -static gboolean gimp_temp_font_run_idle (GimpFontData *font_data); +static void gimp_temp_font_run (const gchar *name, + gint nparams, + const GimpParam *param, + gint *nreturn_vals, + GimpParam **return_vals); +static gboolean gimp_temp_font_run_idle (GimpFontData *font_data); /* private variables */ @@ -144,11 +144,11 @@ gimp_font_select_destroy (const gchar *font_callback) /* private functions */ static void -gimp_temp_font_run (gchar *name, - gint nparams, - GimpParam *param, - gint *nreturn_vals, - GimpParam **return_vals) +gimp_temp_font_run (const gchar *name, + gint nparams, + const GimpParam *param, + gint *nreturn_vals, + GimpParam **return_vals) { static GimpParam values[1]; GimpFontData *font_data; diff --git a/libgimp/gimpgradientselect.c b/libgimp/gimpgradientselect.c index a6e8531149..fc5970f958 100644 --- a/libgimp/gimpgradientselect.c +++ b/libgimp/gimpgradientselect.c @@ -41,9 +41,9 @@ struct _GimpGradientData /* local function prototypes */ -static void gimp_temp_gradient_run (gchar *name, +static void gimp_temp_gradient_run (const gchar *name, gint nparams, - GimpParam *param, + const GimpParam *param, gint *nreturn_vals, GimpParam **return_vals); static gboolean gimp_temp_gradient_run_idle (GimpGradientData *gradient_data); @@ -96,7 +96,8 @@ gimp_gradient_select_new (const gchar *title, /* Now add to hash table so we can find it again */ if (! gimp_gradient_select_ht) - gimp_gradient_select_ht = g_hash_table_new_full (g_str_hash, g_str_equal, + gimp_gradient_select_ht = g_hash_table_new_full (g_str_hash, + g_str_equal, g_free, g_free); gradient_data = g_new0 (GimpGradientData, 1); @@ -153,11 +154,11 @@ gimp_gradient_select_destroy (const gchar *gradient_callback) /* private functions */ static void -gimp_temp_gradient_run (gchar *name, - gint nparams, - GimpParam *param, - gint *nreturn_vals, - GimpParam **return_vals) +gimp_temp_gradient_run (const gchar *name, + gint nparams, + const GimpParam *param, + gint *nreturn_vals, + GimpParam **return_vals) { static GimpParam values[1]; GimpGradientData *gradient_data; diff --git a/libgimp/gimpmiscui.c b/libgimp/gimpmiscui.c index 8db9a42d06..eca28a6080 100644 --- a/libgimp/gimpmiscui.c +++ b/libgimp/gimpmiscui.c @@ -374,7 +374,7 @@ gimp_fixme_preview_fill (GimpFixMePreview *preview, gint x1, x2, y1, y2; gint bpp; gint y; - const guchar *src; + guchar *src; gimp_drawable_mask_bounds (drawable->drawable_id, &x1, &y1, &x2, &y2); @@ -404,7 +404,7 @@ gimp_fixme_preview_fill (GimpFixMePreview *preview, preview->even = g_malloc (width * 3); preview->odd = g_malloc (width * 3); - src = g_malloc (width * bpp); + src = g_malloc (width * bpp); preview->cache = g_malloc(width * bpp * height); preview->rowstride = width * bpp; preview->bpp = bpp; @@ -417,8 +417,8 @@ gimp_fixme_preview_fill (GimpFixMePreview *preview, for (y = 0; y < height; y++) { - gimp_fixme_preview_do_row(preview, y, width, - preview->cache + (y * width * bpp)); + gimp_fixme_preview_do_row (preview, y, width, + preview->cache + (y * width * bpp)); } preview->buffer = GTK_PREVIEW (preview->widget)->buffer; diff --git a/libgimp/gimppatternselect.c b/libgimp/gimppatternselect.c index dc86f73269..f387a6b72e 100644 --- a/libgimp/gimppatternselect.c +++ b/libgimp/gimppatternselect.c @@ -43,9 +43,9 @@ struct _GimpPatternData /* local function prototypes */ -static void gimp_temp_pattern_run (gchar *name, +static void gimp_temp_pattern_run (const gchar *name, gint nparams, - GimpParam *param, + const GimpParam *param, gint *nreturn_vals, GimpParam **return_vals); static gboolean gimp_temp_pattern_run_idle (GimpPatternData *pattern_data); @@ -156,11 +156,11 @@ gimp_pattern_select_destroy (const gchar *pattern_callback) /* private functions */ static void -gimp_temp_pattern_run (gchar *name, - gint nparams, - GimpParam *param, - gint *nreturn_vals, - GimpParam **return_vals) +gimp_temp_pattern_run (const gchar *name, + gint nparams, + const GimpParam *param, + gint *nreturn_vals, + GimpParam **return_vals) { static GimpParam values[1]; GimpPatternData *pattern_data;