From a3217d46fe07cce54f7474c0dea92370a947faca Mon Sep 17 00:00:00 2001 From: Michael Natterer Date: Sat, 2 Sep 2006 16:58:43 +0000 Subject: [PATCH] app/paint/gimpclone.c minor cosmetic cleanup merged from the 2006-09-02 Michael Natterer * app/paint/gimpclone.c * app/paint/gimpink.c: minor cosmetic cleanup merged from the soc-2006-healing-brush branch. --- ChangeLog | 6 ++++++ app/paint/gimpclone.c | 4 ++-- app/paint/gimpink.c | 2 +- app/paint/gimpsourcecore.c | 4 ++-- 4 files changed, 11 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index c881f683e7..0613c52435 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2006-09-02 Michael Natterer + + * app/paint/gimpclone.c + * app/paint/gimpink.c: minor cosmetic cleanup merged from the + soc-2006-healing-brush branch. + 2006-09-02 Michael Natterer * app/dialogs/quit-dialog.c (quit_close_all_dialog_new): create a diff --git a/app/paint/gimpclone.c b/app/paint/gimpclone.c index d51348da8b..29b6455ea9 100644 --- a/app/paint/gimpclone.c +++ b/app/paint/gimpclone.c @@ -349,7 +349,7 @@ gimp_clone_motion (GimpPaintCore *paint_core, return; src_pickable = GIMP_PICKABLE (clone->src_drawable); - src_image = gimp_pickable_get_image (src_pickable); + src_image = gimp_pickable_get_image (src_pickable); if (options->sample_merged) { @@ -396,7 +396,7 @@ gimp_clone_motion (GimpPaintCore *paint_core, * Otherwise, we need a call to get_orig_image to make sure * we get a copy of the unblemished (offset) image */ - if (( options->sample_merged && (src_image != image)) || + if (( options->sample_merged && (src_image != image)) || (! options->sample_merged && (clone->src_drawable != drawable))) { pixel_region_init (&srcPR, src_tiles, diff --git a/app/paint/gimpink.c b/app/paint/gimpink.c index 078e534398..5cc8a71394 100644 --- a/app/paint/gimpink.c +++ b/app/paint/gimpink.c @@ -321,7 +321,7 @@ gimp_ink_motion (GimpPaintCore *paint_core, blob_to_render = blob_union; } - /* Get the the buffer */ + /* Get the buffer */ ink->cur_blob = blob_to_render; area = gimp_paint_core_get_paint_area (paint_core, drawable, paint_options); ink->cur_blob = NULL; diff --git a/app/paint/gimpsourcecore.c b/app/paint/gimpsourcecore.c index d51348da8b..29b6455ea9 100644 --- a/app/paint/gimpsourcecore.c +++ b/app/paint/gimpsourcecore.c @@ -349,7 +349,7 @@ gimp_clone_motion (GimpPaintCore *paint_core, return; src_pickable = GIMP_PICKABLE (clone->src_drawable); - src_image = gimp_pickable_get_image (src_pickable); + src_image = gimp_pickable_get_image (src_pickable); if (options->sample_merged) { @@ -396,7 +396,7 @@ gimp_clone_motion (GimpPaintCore *paint_core, * Otherwise, we need a call to get_orig_image to make sure * we get a copy of the unblemished (offset) image */ - if (( options->sample_merged && (src_image != image)) || + if (( options->sample_merged && (src_image != image)) || (! options->sample_merged && (clone->src_drawable != drawable))) { pixel_region_init (&srcPR, src_tiles,