diff --git a/ChangeLog b/ChangeLog index 601fd79159..b0c732f0a6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2007-12-30 Sven Neumann + + * app/core/gimpdrawable-invert.[ch]: let gimp_drawable_invert() + take a GimpProgress parameter. + + * tools/pdbgen/pdb/color.pdb + * app/pdb/color_cmds.c + * app/actions/drawable-commands.c: changed accordingly. + 2007-12-29 Michael Natterer * app/actions/Makefile.am diff --git a/app/actions/drawable-commands.c b/app/actions/drawable-commands.c index bae5f9ad8a..601dd8ae05 100644 --- a/app/actions/drawable-commands.c +++ b/app/actions/drawable-commands.c @@ -34,6 +34,7 @@ #include "core/gimpitem-linked.h" #include "core/gimpitemundo.h" #include "core/gimplayermask.h" +#include "core/gimpprogress.h" #include "dialogs/desaturate-dialog.h" #include "dialogs/offset-dialog.h" @@ -114,8 +115,10 @@ drawable_invert_cmd_callback (GtkAction *action, { GimpImage *image; GimpDrawable *drawable; + GimpDisplay *display; GtkWidget *widget; return_if_no_drawable (image, drawable, data); + return_if_no_display (display, data); return_if_no_widget (widget, data); if (gimp_drawable_is_indexed (drawable)) @@ -125,7 +128,7 @@ drawable_invert_cmd_callback (GtkAction *action, return; } - gimp_drawable_invert (drawable); + gimp_drawable_invert (drawable, GIMP_PROGRESS (display)); gimp_image_flush (image); } diff --git a/app/core/gimpdrawable-invert.c b/app/core/gimpdrawable-invert.c index 63658ed79a..4ec735ddbc 100644 --- a/app/core/gimpdrawable-invert.c +++ b/app/core/gimpdrawable-invert.c @@ -29,12 +29,14 @@ #include "gimpdrawable.h" #include "gimpdrawable-invert.h" +#include "gimpprogress.h" #include "gimp-intl.h" void -gimp_drawable_invert (GimpDrawable *drawable) +gimp_drawable_invert (GimpDrawable *drawable, + GimpProgress *progress) { PixelRegion srcPR, destPR; gint x, y, width, height; @@ -42,6 +44,7 @@ gimp_drawable_invert (GimpDrawable *drawable) g_return_if_fail (GIMP_IS_DRAWABLE (drawable)); g_return_if_fail (gimp_item_is_attached (GIMP_ITEM (drawable))); + g_return_if_fail (progress == NULL || GIMP_IS_PROGRESS (progress)); if (! gimp_drawable_mask_intersect (drawable, &x, &y, &width, &height)) return; diff --git a/app/core/gimpdrawable-invert.h b/app/core/gimpdrawable-invert.h index 150e0ee8be..90b217055c 100644 --- a/app/core/gimpdrawable-invert.h +++ b/app/core/gimpdrawable-invert.h @@ -20,7 +20,8 @@ #define __GIMP_DRAWABLE_INVERT_H__ -void gimp_drawable_invert (GimpDrawable *drawable); +void gimp_drawable_invert (GimpDrawable *drawable, + GimpProgress *progress); #endif /* __GIMP_DRAWABLE_INVERT_H__ */ diff --git a/app/pdb/color_cmds.c b/app/pdb/color_cmds.c index 16498be86d..2f56776dcf 100644 --- a/app/pdb/color_cmds.c +++ b/app/pdb/color_cmds.c @@ -363,7 +363,7 @@ invert_invoker (GimpProcedure *procedure, success = FALSE; if (success) - gimp_drawable_invert (drawable); + gimp_drawable_invert (drawable, progress); } return gimp_procedure_get_return_values (procedure, success); diff --git a/tools/pdbgen/pdb/color.pdb b/tools/pdbgen/pdb/color.pdb index 07d095c350..e25e3cab53 100644 --- a/tools/pdbgen/pdb/color.pdb +++ b/tools/pdbgen/pdb/color.pdb @@ -388,7 +388,7 @@ HELP success = FALSE; if (success) - gimp_drawable_invert (drawable); + gimp_drawable_invert (drawable, progress); } CODE );