diff --git a/ChangeLog b/ChangeLog index 40542305e6..f535311f6d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,35 @@ +2003-07-02 Sven Neumann + + * app/gui/edit-commands.c + * app/gui/image-menu.c: added "Fill with Pattern" menu entry as + suggested in bug #116365. + + * app/base/temp-buf.c + * app/base/tile-swap.c + * app/config/gimpbaseconfig.c + * app/config/gimpconfig-types.c + * app/display/gimpdisplayshell-filter-dialog.c + * app/display/gimpdisplayshell.c + * app/file/file-utils.c + * app/paint-funcs/paint-funcs-types.h + * app/tools/gimpdrawtool.c + * app/tools/gimpinktool.c + * app/tools/gimpiscissorstool.h + * app/tools/gimptextoptions.c + * app/paint-funcs/paint-funcs-types.h + * app/vectors/gimpbezierstroke.c + * app/vectors/gimpstroke.c + * app/vectors/gimpvectors.c + * app/vectors/vectors-types.h + * libgimp/gimpbrushmenu.c + * libgimp/gimpmisc.h + * libgimpmodule/gimpmodule.c: fixed some minor issues found + compiling with -pedantic. + + * app/pdb/misc_tools_cmds.c + * tools/pdbgen/pdb/misc_tools.pdb: adapt to the changed order of + arguments for gimp_image_pick_color(). + 2003-07-02 Michael Natterer * libgimpbase/gimpbasetypes.h: changed GimpDatafileLoaderFunc to diff --git a/app/actions/edit-commands.c b/app/actions/edit-commands.c index 94356a6e85..afe9d3bf84 100644 --- a/app/actions/edit-commands.c +++ b/app/actions/edit-commands.c @@ -31,6 +31,7 @@ #include "core/gimpcontainer.h" #include "core/gimpcontext.h" #include "core/gimpdrawable.h" +#include "core/gimpdrawable-bucket-fill.h" #include "core/gimpedit.h" #include "core/gimpimage.h" #include "core/gimpimage-mask.h" @@ -240,15 +241,17 @@ edit_fill_cmd_callback (GtkWidget *widget, gpointer data, guint action) { - GimpImage *gimage; - GimpFillType fill_type; + GimpImage *gimage; + GimpBucketFillMode fill_mode; return_if_no_image (gimage, data); - fill_type = (GimpFillType) action; + fill_mode = (GimpBucketFillMode) action; - gimp_edit_fill (gimage, - gimp_image_active_drawable (gimage), - fill_type); + gimp_drawable_bucket_fill (gimp_image_active_drawable (gimage), + fill_mode, + GIMP_NORMAL_MODE, 1.0, + FALSE /* no seed fill */, + FALSE, 0.0, FALSE, 0.0, 0.0); gimp_image_flush (gimage); } diff --git a/app/base/temp-buf.c b/app/base/temp-buf.c index 16739af06a..81737b3824 100644 --- a/app/base/temp-buf.c +++ b/app/base/temp-buf.c @@ -21,10 +21,11 @@ #include #include #include +#include +#include #ifdef HAVE_UNISTD_H #include #endif -#include #include diff --git a/app/base/tile-swap.c b/app/base/tile-swap.c index c548992a9d..471efabac0 100644 --- a/app/base/tile-swap.c +++ b/app/base/tile-swap.c @@ -412,7 +412,7 @@ tile_swap_open (SwapFile *swap_file) swap_file->fd = open (swap_file->filename, O_CREAT | O_RDWR | _O_BINARY | _O_TEMPORARY, - S_IREAD | S_IWRITE); + S_IRUSR | S_IWUSR); if (swap_file->fd == -1) { diff --git a/app/config/gimpbaseconfig.c b/app/config/gimpbaseconfig.c index c5e7e450f9..12bcc21c8a 100644 --- a/app/config/gimpbaseconfig.c +++ b/app/config/gimpbaseconfig.c @@ -55,7 +55,7 @@ enum PROP_SWAP_PATH, PROP_STINGY_MEMORY_USE, PROP_NUM_PROCESSORS, - PROP_TILE_CACHE_SIZE, + PROP_TILE_CACHE_SIZE }; static GObjectClass *parent_class = NULL; diff --git a/app/config/gimpconfig-types.c b/app/config/gimpconfig-types.c index 19ff648e4a..7028df5fb8 100644 --- a/app/config/gimpconfig-types.c +++ b/app/config/gimpconfig-types.c @@ -205,7 +205,7 @@ memsize_to_string (const GValue *src_value, str = g_strdup_printf ("%lu", size); g_value_set_string_take_ownership (dest_value, str); -}; +} static void string_to_memsize (const GValue *src_value, @@ -215,7 +215,7 @@ string_to_memsize (const GValue *src_value, if (!str || !gimp_memsize_set_from_string (dest_value, str)) g_warning ("Can't convert string to GimpMemsize."); -}; +} static void @@ -225,7 +225,7 @@ unit_to_string (const GValue *src_value, GimpUnit unit = (GimpUnit) g_value_get_int (src_value); g_value_set_string (dest_value, gimp_unit_get_identifier (unit)); -}; +} static void string_to_unit (const GValue *src_value, @@ -254,4 +254,4 @@ string_to_unit (const GValue *src_value, error: g_warning ("Can't convert string to GimpUnit."); -}; +} diff --git a/app/display/gimpdisplayshell-draw.c b/app/display/gimpdisplayshell-draw.c index ae1f9ae179..69635e9415 100644 --- a/app/display/gimpdisplayshell-draw.c +++ b/app/display/gimpdisplayshell-draw.c @@ -1230,7 +1230,7 @@ gimp_display_shell_draw_guide (GimpDisplayShell *shell, GdkColor fg; GdkColor bg; - const gchar stipple[] = + const guchar stipple[] = { 0xF0, /* ####---- */ 0xE1, /* ###----# */ @@ -1255,7 +1255,8 @@ gimp_display_shell_draw_guide (GimpDisplayShell *shell, values.fill = GDK_OPAQUE_STIPPLED; values.stipple = gdk_bitmap_create_from_data (shell->canvas->window, - (gchar *) stipple, 8, 1); + (const gchar *) stipple, + 8, 1); normal_hgc = gdk_gc_new_with_values (shell->canvas->window, &values, GDK_GC_FILL | GDK_GC_STIPPLE); @@ -1265,7 +1266,8 @@ gimp_display_shell_draw_guide (GimpDisplayShell *shell, values.fill = GDK_OPAQUE_STIPPLED; values.stipple = gdk_bitmap_create_from_data (shell->canvas->window, - (gchar *) stipple, 1, 8); + (const gchar *) stipple, + 1, 8); normal_vgc = gdk_gc_new_with_values (shell->canvas->window, &values, GDK_GC_FILL | GDK_GC_STIPPLE); @@ -1285,7 +1287,8 @@ gimp_display_shell_draw_guide (GimpDisplayShell *shell, values.fill = GDK_OPAQUE_STIPPLED; values.stipple = gdk_bitmap_create_from_data (shell->canvas->window, - (gchar *) stipple, 8, 1); + (const gchar *) stipple, + 8, 1); active_hgc = gdk_gc_new_with_values (shell->canvas->window, &values, GDK_GC_FILL | GDK_GC_STIPPLE); @@ -1295,7 +1298,8 @@ gimp_display_shell_draw_guide (GimpDisplayShell *shell, values.fill = GDK_OPAQUE_STIPPLED; values.stipple = gdk_bitmap_create_from_data (shell->canvas->window, - (gchar *) stipple, 1, 8); + (const gchar *) stipple, + 1, 8); active_vgc = gdk_gc_new_with_values (shell->canvas->window, &values, GDK_GC_FILL | GDK_GC_STIPPLE); @@ -1349,7 +1353,7 @@ gimp_display_shell_draw_guides (GimpDisplayShell *shell) GList *list; GimpGuide *guide; - for (list = shell->gdisp->gimage->guides; list; list = g_list_next (list)) + for (list = shell->gdisp->gimage->guides; list; list = list->next) { guide = (GimpGuide *) list->data; diff --git a/app/display/gimpdisplayshell-filter-dialog.c b/app/display/gimpdisplayshell-filter-dialog.c index 1f8af16210..a3d5f44b37 100644 --- a/app/display/gimpdisplayshell-filter-dialog.c +++ b/app/display/gimpdisplayshell-filter-dialog.c @@ -529,7 +529,7 @@ gimp_display_shell_filter_dialog_new (GimpDisplayShell *shell) { ColorDisplayDialog *cdd; GType *filter_types; - gint n_filter_types; + guint n_filter_types; gint i; cdd = g_new0 (ColorDisplayDialog, 1); diff --git a/app/display/gimpdisplayshell.c b/app/display/gimpdisplayshell.c index ae1f9ae179..69635e9415 100644 --- a/app/display/gimpdisplayshell.c +++ b/app/display/gimpdisplayshell.c @@ -1230,7 +1230,7 @@ gimp_display_shell_draw_guide (GimpDisplayShell *shell, GdkColor fg; GdkColor bg; - const gchar stipple[] = + const guchar stipple[] = { 0xF0, /* ####---- */ 0xE1, /* ###----# */ @@ -1255,7 +1255,8 @@ gimp_display_shell_draw_guide (GimpDisplayShell *shell, values.fill = GDK_OPAQUE_STIPPLED; values.stipple = gdk_bitmap_create_from_data (shell->canvas->window, - (gchar *) stipple, 8, 1); + (const gchar *) stipple, + 8, 1); normal_hgc = gdk_gc_new_with_values (shell->canvas->window, &values, GDK_GC_FILL | GDK_GC_STIPPLE); @@ -1265,7 +1266,8 @@ gimp_display_shell_draw_guide (GimpDisplayShell *shell, values.fill = GDK_OPAQUE_STIPPLED; values.stipple = gdk_bitmap_create_from_data (shell->canvas->window, - (gchar *) stipple, 1, 8); + (const gchar *) stipple, + 1, 8); normal_vgc = gdk_gc_new_with_values (shell->canvas->window, &values, GDK_GC_FILL | GDK_GC_STIPPLE); @@ -1285,7 +1287,8 @@ gimp_display_shell_draw_guide (GimpDisplayShell *shell, values.fill = GDK_OPAQUE_STIPPLED; values.stipple = gdk_bitmap_create_from_data (shell->canvas->window, - (gchar *) stipple, 8, 1); + (const gchar *) stipple, + 8, 1); active_hgc = gdk_gc_new_with_values (shell->canvas->window, &values, GDK_GC_FILL | GDK_GC_STIPPLE); @@ -1295,7 +1298,8 @@ gimp_display_shell_draw_guide (GimpDisplayShell *shell, values.fill = GDK_OPAQUE_STIPPLED; values.stipple = gdk_bitmap_create_from_data (shell->canvas->window, - (gchar *) stipple, 1, 8); + (const gchar *) stipple, + 1, 8); active_vgc = gdk_gc_new_with_values (shell->canvas->window, &values, GDK_GC_FILL | GDK_GC_STIPPLE); @@ -1349,7 +1353,7 @@ gimp_display_shell_draw_guides (GimpDisplayShell *shell) GList *list; GimpGuide *guide; - for (list = shell->gdisp->gimage->guides; list; list = g_list_next (list)) + for (list = shell->gdisp->gimage->guides; list; list = list->next) { guide = (GimpGuide *) list->data; diff --git a/app/file/file-utils.c b/app/file/file-utils.c index 0b3ab52e24..e6eb7c9a70 100644 --- a/app/file/file-utils.c +++ b/app/file/file-utils.c @@ -360,12 +360,12 @@ file_convert_string (gchar *instr, gint *nmem) { /* Convert a string in C-notation to array of char */ - guchar *uin = (guchar *) instr; + guchar *uin = (guchar *) instr; guchar *uout = (guchar *) outmem; guchar tmp[5], *tmpptr; - gint k; + guint k; - while ((*uin != '\0') && ((((char *)uout) - outmem) < maxmem)) + while ((*uin != '\0') && ((((gchar *) uout) - outmem) < maxmem)) { if (*uin != '\\') /* Not an escaped character ? */ { @@ -388,7 +388,7 @@ file_convert_string (gchar *instr, break; } *tmpptr = '\0'; - sscanf ((char *)tmp, "%o", &k); + sscanf ((gchar *) tmp, "%o", &k); *(uout++) = k; break; @@ -462,7 +462,7 @@ file_check_single_magic (gchar *offset, if (g_ascii_isdigit (num_operator_ptr[1])) { if (num_operator_ptr[1] != '0') /* decimal */ - sscanf (num_operator_ptr+1, "%ld", &num_operatorval); + sscanf (num_operator_ptr+1, "%lu", &num_operatorval); else if (num_operator_ptr[2] == 'x') /* hexadecimal */ sscanf (num_operator_ptr+3, "%lx", &num_operatorval); else /* octal */ diff --git a/app/gui/edit-commands.c b/app/gui/edit-commands.c index 94356a6e85..afe9d3bf84 100644 --- a/app/gui/edit-commands.c +++ b/app/gui/edit-commands.c @@ -31,6 +31,7 @@ #include "core/gimpcontainer.h" #include "core/gimpcontext.h" #include "core/gimpdrawable.h" +#include "core/gimpdrawable-bucket-fill.h" #include "core/gimpedit.h" #include "core/gimpimage.h" #include "core/gimpimage-mask.h" @@ -240,15 +241,17 @@ edit_fill_cmd_callback (GtkWidget *widget, gpointer data, guint action) { - GimpImage *gimage; - GimpFillType fill_type; + GimpImage *gimage; + GimpBucketFillMode fill_mode; return_if_no_image (gimage, data); - fill_type = (GimpFillType) action; + fill_mode = (GimpBucketFillMode) action; - gimp_edit_fill (gimage, - gimp_image_active_drawable (gimage), - fill_type); + gimp_drawable_bucket_fill (gimp_image_active_drawable (gimage), + fill_mode, + GIMP_NORMAL_MODE, 1.0, + FALSE /* no seed fill */, + FALSE, 0.0, FALSE, 0.0, 0.0); gimp_image_flush (gimage); } diff --git a/app/gui/image-menu.c b/app/gui/image-menu.c index 7f6e8dc339..b05d33b2b4 100644 --- a/app/gui/image-menu.c +++ b/app/gui/image-menu.c @@ -220,12 +220,17 @@ GimpItemFactoryEntry image_menu_entries[] = NULL, "edit/clear.html", NULL }, { { N_("/Edit/Fill with _FG Color"), "comma", - edit_fill_cmd_callback, (guint) GIMP_FOREGROUND_FILL, + edit_fill_cmd_callback, (guint) GIMP_FG_BUCKET_FILL, "", GIMP_STOCK_TOOL_BUCKET_FILL }, NULL, "edit/fill.html", NULL }, { { N_("/Edit/Fill with B_G Color"), "period", - edit_fill_cmd_callback, (guint) GIMP_BACKGROUND_FILL, + edit_fill_cmd_callback, (guint) GIMP_BG_BUCKET_FILL, + "", GIMP_STOCK_TOOL_BUCKET_FILL }, + NULL, + "edit/fill.html", NULL }, + { { N_("/Edit/Fill with Pattern"), NULL, + edit_fill_cmd_callback, (guint) GIMP_PATTERN_BUCKET_FILL, "", GIMP_STOCK_TOOL_BUCKET_FILL }, NULL, "edit/fill.html", NULL }, diff --git a/app/menus/image-menu.c b/app/menus/image-menu.c index 7f6e8dc339..b05d33b2b4 100644 --- a/app/menus/image-menu.c +++ b/app/menus/image-menu.c @@ -220,12 +220,17 @@ GimpItemFactoryEntry image_menu_entries[] = NULL, "edit/clear.html", NULL }, { { N_("/Edit/Fill with _FG Color"), "comma", - edit_fill_cmd_callback, (guint) GIMP_FOREGROUND_FILL, + edit_fill_cmd_callback, (guint) GIMP_FG_BUCKET_FILL, "", GIMP_STOCK_TOOL_BUCKET_FILL }, NULL, "edit/fill.html", NULL }, { { N_("/Edit/Fill with B_G Color"), "period", - edit_fill_cmd_callback, (guint) GIMP_BACKGROUND_FILL, + edit_fill_cmd_callback, (guint) GIMP_BG_BUCKET_FILL, + "", GIMP_STOCK_TOOL_BUCKET_FILL }, + NULL, + "edit/fill.html", NULL }, + { { N_("/Edit/Fill with Pattern"), NULL, + edit_fill_cmd_callback, (guint) GIMP_PATTERN_BUCKET_FILL, "", GIMP_STOCK_TOOL_BUCKET_FILL }, NULL, "edit/fill.html", NULL }, diff --git a/app/paint-funcs/paint-funcs-types.h b/app/paint-funcs/paint-funcs-types.h index 172d6f7b16..49c08e0b00 100644 --- a/app/paint-funcs/paint-funcs-types.h +++ b/app/paint-funcs/paint-funcs-types.h @@ -40,7 +40,7 @@ typedef enum /*< pdb-skip >*/ INITIAL_INDEXED, INITIAL_INDEXED_ALPHA, INITIAL_INTENSITY, - INITIAL_INTENSITY_ALPHA, + INITIAL_INTENSITY_ALPHA } InitialMode; /* Combine two source regions with the help of an optional mask @@ -70,7 +70,7 @@ typedef enum /*< pdb-skip >*/ ERASE_INDEXED, ANTI_ERASE_INTEN, ANTI_ERASE_INDEXED, - COLOR_ERASE_INTEN, + COLOR_ERASE_INTEN } CombinationMode; diff --git a/app/paint/gimpink.c b/app/paint/gimpink.c index 17ebf2aa40..289108474a 100644 --- a/app/paint/gimpink.c +++ b/app/paint/gimpink.c @@ -970,7 +970,7 @@ ink_paste (GimpInkTool *ink_tool, GimpContext *context; PixelRegion srcPR; gint offx, offy; - gchar col[MAX_CHANNELS]; + guchar col[MAX_CHANNELS]; if (! (gimage = gimp_item_get_image (GIMP_ITEM (drawable)))) return; diff --git a/app/pdb/misc_tools_cmds.c b/app/pdb/misc_tools_cmds.c index ac1cb86918..6272c28966 100644 --- a/app/pdb/misc_tools_cmds.c +++ b/app/pdb/misc_tools_cmds.c @@ -395,12 +395,12 @@ color_picker_invoker (Gimp *gimp, if (success) success = gimp_image_pick_color (gimage, drawable, - sample_merged, (gint) x, (gint) y, + sample_merged, sample_average, average_radius, - &color, NULL, + &color, NULL); } diff --git a/app/tools/gimpdrawtool.c b/app/tools/gimpdrawtool.c index dca951ccd2..94a505c516 100644 --- a/app/tools/gimpdrawtool.c +++ b/app/tools/gimpdrawtool.c @@ -174,10 +174,15 @@ gimp_draw_tool_control (GimpTool *tool, static void gimp_draw_tool_draw (GimpDrawTool *draw_tool) { - if (draw_tool->gdisp) - { + if (draw_tool->draw_state == GIMP_DRAW_TOOL_STATE_VISIBLE) + draw_tool->draw_state = GIMP_DRAW_TOOL_STATE_INVISIBLE; + else + draw_tool->draw_state = GIMP_DRAW_TOOL_STATE_VISIBLE; + + if (draw_tool->gdisp) + { GIMP_DRAW_TOOL_GET_CLASS (draw_tool)->draw (draw_tool); - } + } } void @@ -210,8 +215,6 @@ gimp_draw_tool_start (GimpDrawTool *draw_tool, draw_tool->join_style); gimp_draw_tool_draw (draw_tool); - - draw_tool->draw_state = GIMP_DRAW_TOOL_STATE_VISIBLE; } void @@ -224,7 +227,6 @@ gimp_draw_tool_stop (GimpDrawTool *draw_tool) gimp_draw_tool_draw (draw_tool); } - draw_tool->draw_state = GIMP_DRAW_TOOL_STATE_INVISIBLE; draw_tool->paused_count = 0; draw_tool->gdisp = NULL; @@ -252,8 +254,6 @@ gimp_draw_tool_pause (GimpDrawTool *draw_tool) if (draw_tool->paused_count == 0) { - draw_tool->draw_state = GIMP_DRAW_TOOL_STATE_INVISIBLE; - gimp_draw_tool_draw (draw_tool); } @@ -271,8 +271,6 @@ gimp_draw_tool_resume (GimpDrawTool *draw_tool) if (draw_tool->paused_count == 0) { - draw_tool->draw_state = GIMP_DRAW_TOOL_STATE_VISIBLE; - gimp_draw_tool_draw (draw_tool); } } diff --git a/app/tools/gimpinktool.c b/app/tools/gimpinktool.c index 17ebf2aa40..289108474a 100644 --- a/app/tools/gimpinktool.c +++ b/app/tools/gimpinktool.c @@ -970,7 +970,7 @@ ink_paste (GimpInkTool *ink_tool, GimpContext *context; PixelRegion srcPR; gint offx, offy; - gchar col[MAX_CHANNELS]; + guchar col[MAX_CHANNELS]; if (! (gimage = gimp_item_get_image (GIMP_ITEM (drawable)))) return; diff --git a/app/tools/gimpiscissorstool.h b/app/tools/gimpiscissorstool.h index 105121a4df..358fb87f9b 100644 --- a/app/tools/gimpiscissorstool.h +++ b/app/tools/gimpiscissorstool.h @@ -49,7 +49,7 @@ typedef enum ISCISSORS_OP_SELECT, ISCISSORS_OP_MOVE_POINT, ISCISSORS_OP_ADD_POINT, - ISCISSORS_OP_IMPOSSIBLE, + ISCISSORS_OP_IMPOSSIBLE } IscissorsOps; typedef struct _ICurve ICurve; diff --git a/app/tools/gimptextoptions.c b/app/tools/gimptextoptions.c index 46fc64e70b..fb8d0beff4 100644 --- a/app/tools/gimptextoptions.c +++ b/app/tools/gimptextoptions.c @@ -52,7 +52,7 @@ enum { PROP_0, - PROP_TEXT, + PROP_TEXT }; diff --git a/app/vectors/gimpbezierstroke.c b/app/vectors/gimpbezierstroke.c index 535e101b38..b7832a7413 100644 --- a/app/vectors/gimpbezierstroke.c +++ b/app/vectors/gimpbezierstroke.c @@ -143,7 +143,7 @@ static void gimp_bezier_stroke_init (GimpBezierStroke *bezier_stroke) { /* pass */ -}; +} static void gimp_bezier_stroke_finalize (GObject *object) diff --git a/app/vectors/gimpstroke.c b/app/vectors/gimpstroke.c index 924dc65683..95ba477115 100644 --- a/app/vectors/gimpstroke.c +++ b/app/vectors/gimpstroke.c @@ -156,7 +156,7 @@ gimp_stroke_init (GimpStroke *stroke) stroke->anchors = NULL; stroke->temp_anchor = NULL; stroke->closed = FALSE; -}; +} static void gimp_stroke_finalize (GObject *object) diff --git a/app/vectors/gimpvectors.c b/app/vectors/gimpvectors.c index 91ab773968..06f9fe271e 100644 --- a/app/vectors/gimpvectors.c +++ b/app/vectors/gimpvectors.c @@ -221,7 +221,7 @@ gimp_vectors_init (GimpVectors *vectors) { vectors->strokes = NULL; vectors->freeze_count = 0; -}; +} static void gimp_vectors_finalize (GObject *object) @@ -807,7 +807,7 @@ gimp_vectors_anchor_delete (GimpVectors *vectors, g_return_if_fail (GIMP_IS_VECTORS (vectors)); g_return_if_fail (anchor != NULL); - return GIMP_VECTORS_GET_CLASS (vectors)->anchor_delete (vectors, anchor); + GIMP_VECTORS_GET_CLASS (vectors)->anchor_delete (vectors, anchor); } static void diff --git a/app/vectors/vectors-types.h b/app/vectors/vectors-types.h index 1d7da336b9..0c52660258 100644 --- a/app/vectors/vectors-types.h +++ b/app/vectors/vectors-types.h @@ -30,7 +30,7 @@ typedef struct _GimpAnchor GimpAnchor; typedef enum { GIMP_ANCHOR_ANCHOR, - GIMP_ANCHOR_CONTROL, + GIMP_ANCHOR_CONTROL } GimpAnchorType; typedef enum @@ -38,13 +38,13 @@ typedef enum GIMP_ANCHOR_FEATURE_NONE, GIMP_ANCHOR_FEATURE_EDGE, GIMP_ANCHOR_FEATURE_ALIGNED, - GIMP_ANCHOR_FEATURE_SYMMETRIC, + GIMP_ANCHOR_FEATURE_SYMMETRIC } GimpAnchorFeatureType; typedef enum { EXTEND_SIMPLE, - EXTEND_EDITABLE, + EXTEND_EDITABLE } GimpVectorExtendMode; typedef struct _GimpStroke GimpStroke; diff --git a/app/widgets/gimpcolordisplayeditor.c b/app/widgets/gimpcolordisplayeditor.c index 1f8af16210..a3d5f44b37 100644 --- a/app/widgets/gimpcolordisplayeditor.c +++ b/app/widgets/gimpcolordisplayeditor.c @@ -529,7 +529,7 @@ gimp_display_shell_filter_dialog_new (GimpDisplayShell *shell) { ColorDisplayDialog *cdd; GType *filter_types; - gint n_filter_types; + guint n_filter_types; gint i; cdd = g_new0 (ColorDisplayDialog, 1); diff --git a/libgimp/gimpbrushmenu.c b/libgimp/gimpbrushmenu.c index 5a24746b44..aa4481850c 100644 --- a/libgimp/gimpbrushmenu.c +++ b/libgimp/gimpbrushmenu.c @@ -85,7 +85,7 @@ static gboolean gimp_brush_select_preview_events (GtkWidget *widget, static void gimp_brush_select_preview_update (GtkWidget *preview, gint brush_width, gint brush_height, - const gchar *mask_data); + const guchar *mask_data); static void gimp_brush_select_popup_open (BrushSelect *brush_sel, gint x, gint y); @@ -405,10 +405,10 @@ gimp_brush_select_preview_events (GtkWidget *widget, } static void -gimp_brush_select_preview_update (GtkWidget *preview, - gint brush_width, - gint brush_height, - const gchar *mask_data) +gimp_brush_select_preview_update (GtkWidget *preview, + gint brush_width, + gint brush_height, + const guchar *mask_data) { guchar *buf; guchar *b; diff --git a/libgimp/gimpmisc.h b/libgimp/gimpmisc.h index bfe1d9a61e..141665e552 100644 --- a/libgimp/gimpmisc.h +++ b/libgimp/gimpmisc.h @@ -35,7 +35,7 @@ enum { PIXEL_WRAP, PIXEL_SMEAR, - PIXEL_BLACK, + PIXEL_BLACK }; typedef struct _GimpPixelFetcher GimpPixelFetcher; diff --git a/libgimp/gimppixelfetcher.h b/libgimp/gimppixelfetcher.h index bfe1d9a61e..141665e552 100644 --- a/libgimp/gimppixelfetcher.h +++ b/libgimp/gimppixelfetcher.h @@ -35,7 +35,7 @@ enum { PIXEL_WRAP, PIXEL_SMEAR, - PIXEL_BLACK, + PIXEL_BLACK }; typedef struct _GimpPixelFetcher GimpPixelFetcher; diff --git a/libgimp/gimpregioniterator.h b/libgimp/gimpregioniterator.h index bfe1d9a61e..141665e552 100644 --- a/libgimp/gimpregioniterator.h +++ b/libgimp/gimpregioniterator.h @@ -35,7 +35,7 @@ enum { PIXEL_WRAP, PIXEL_SMEAR, - PIXEL_BLACK, + PIXEL_BLACK }; typedef struct _GimpPixelFetcher GimpPixelFetcher; diff --git a/libgimpmodule/gimpmodule.c b/libgimpmodule/gimpmodule.c index 8ba0765275..60f006fdb3 100644 --- a/libgimpmodule/gimpmodule.c +++ b/libgimpmodule/gimpmodule.c @@ -160,8 +160,8 @@ gimp_module_finalize (GObject *object) static gboolean gimp_module_load (GTypeModule *module) { - GimpModule *gimp_module; - gpointer symbol; + GimpModule *gimp_module; + GimpModuleRegisterFunc func; g_return_val_if_fail (GIMP_IS_MODULE (module), FALSE); @@ -180,7 +180,8 @@ gimp_module_load (GTypeModule *module) return FALSE; /* find the gimp_module_register symbol */ - if (! g_module_symbol (gimp_module->module, "gimp_module_register", &symbol)) + if (! g_module_symbol (gimp_module->module, "gimp_module_register", + (gpointer *) &func)) { gimp_module_set_last_error (gimp_module, "Missing gimp_module_register() symbol"); @@ -195,7 +196,7 @@ gimp_module_load (GTypeModule *module) return FALSE; } - gimp_module->register_module = symbol; + gimp_module->register_module = func; if (! gimp_module->register_module (module)) { @@ -290,7 +291,7 @@ gimp_module_query_module (GimpModule *module) { const GimpModuleInfo *info; gboolean close_module = FALSE; - gpointer symbol; + GimpModuleQueryFunc func; g_return_val_if_fail (GIMP_IS_MODULE (module), FALSE); @@ -303,7 +304,8 @@ gimp_module_query_module (GimpModule *module) } /* find the gimp_module_query symbol */ - if (! g_module_symbol (module->module, "gimp_module_query", &symbol)) + if (! g_module_symbol (module->module, "gimp_module_query", + (gpointer *) &func)) { gimp_module_set_last_error (module, "Missing gimp_module_query() symbol"); @@ -318,7 +320,7 @@ gimp_module_query_module (GimpModule *module) return FALSE; } - module->query_module = symbol; + module->query_module = func; if (module->info) { diff --git a/tools/pdbgen/pdb/misc_tools.pdb b/tools/pdbgen/pdb/misc_tools.pdb index 4c6d378c68..7998e23b88 100644 --- a/tools/pdbgen/pdb/misc_tools.pdb +++ b/tools/pdbgen/pdb/misc_tools.pdb @@ -249,12 +249,12 @@ HELP if (success) success = gimp_image_pick_color (gimage, drawable, - sample_merged, (gint) x, (gint) y, + sample_merged, sample_average, average_radius, - &color, NULL, + &color, NULL); } CODE