graphics/gimp
graphics/gimp
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/gimp synced 2024-10-19 06:14:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

added GimpProgress parameter to gimp_drawable_transform_affine().

Browse source 
2004-08-31  Michael Natterer  <mitch@gimp.org>

	* app/core/gimpdrawable-transform.[ch]: added GimpProgress
	parameter to gimp_drawable_transform_affine().

	* tools/pdbgen/pdb/edit.pdb
	* tools/pdbgen/pdb/transform_tools.pdb: show progress for "blend"
	and all transform functions.

	* app/pdb/edit_cmds.c
	* app/pdb/transform_tools_cmds.c: regenerated.
This commit is contained in:
Michael Natterer 2004-08-31 14:17:33 +00:00 committed by Michael Natterer
parent 0586ac0ba6
commit 6b43c205d1
8 changed files with 117 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
ChangeLog
View file

@ -1,3 +1,15 @@
2004-08-31 Michael Natterer <mitch@gimp.org>
* app/core/gimpdrawable-transform.[ch]: added GimpProgress
parameter to gimp_drawable_transform_affine().
* tools/pdbgen/pdb/edit.pdb
* tools/pdbgen/pdb/transform_tools.pdb: show progress for "blend"
and all transform functions.
* app/pdb/edit_cmds.c
* app/pdb/transform_tools_cmds.c: regenerated.
2004-08-31 Sven Neumann <sven@gimp.org>
* plug-ins/common/curve_bend.c: don't use GDK_TOP_LEFT_ARROW

6
app/core/gimp-transform-region.c
View file

@ -852,7 +852,8 @@ gimp_drawable_transform_affine (GimpDrawable *drawable,
GimpInterpolationType interpolation_type,
gboolean supersample,
gint recursion_level,
gboolean clip_result)
gboolean clip_result,
GimpProgress *progress)
{
GimpImage *gimage;
TileManager *orig_tiles;
@ -863,6 +864,7 @@ gimp_drawable_transform_affine (GimpDrawable *drawable,
g_return_val_if_fail (GIMP_IS_CONTEXT (context), FALSE);
g_return_val_if_fail (gimp_item_is_attached (GIMP_ITEM (drawable)), FALSE);
g_return_val_if_fail (matrix != NULL, FALSE);
g_return_val_if_fail (progress == NULL || GIMP_IS_PROGRESS (progress), FALSE);
gimage = gimp_item_get_image (GIMP_ITEM (drawable));
@ -890,7 +892,7 @@ gimp_drawable_transform_affine (GimpDrawable *drawable,
supersample,
recursion_level,
FALSE,
NULL);
progress);
/* Free the cut/copied buffer */
tile_manager_unref (orig_tiles);

6
app/core/gimpdrawable-transform.c
View file

@ -852,7 +852,8 @@ gimp_drawable_transform_affine (GimpDrawable *drawable,
GimpInterpolationType interpolation_type,
gboolean supersample,
gint recursion_level,
gboolean clip_result)
gboolean clip_result,
GimpProgress *progress)
{
GimpImage *gimage;
TileManager *orig_tiles;
@ -863,6 +864,7 @@ gimp_drawable_transform_affine (GimpDrawable *drawable,
g_return_val_if_fail (GIMP_IS_CONTEXT (context), FALSE);
g_return_val_if_fail (gimp_item_is_attached (GIMP_ITEM (drawable)), FALSE);
g_return_val_if_fail (matrix != NULL, FALSE);
g_return_val_if_fail (progress == NULL || GIMP_IS_PROGRESS (progress), FALSE);
gimage = gimp_item_get_image (GIMP_ITEM (drawable));
@ -890,7 +892,7 @@ gimp_drawable_transform_affine (GimpDrawable *drawable,
supersample,
recursion_level,
FALSE,
NULL);
progress);
/* Free the cut/copied buffer */
tile_manager_unref (orig_tiles);

3
app/core/gimpdrawable-transform.h
View file

@ -65,7 +65,8 @@ gboolean gimp_drawable_transform_affine (GimpDrawable *draw
GimpInterpolationType interpolation_type,
gboolean supersample,
gint recursion_level,
gboolean clip_result);
gboolean clip_result,
GimpProgress *progress);
gboolean gimp_drawable_transform_flip (GimpDrawable *drawable,
GimpContext *context,
GimpOrientationType flip_type);

10
app/pdb/edit_cmds.c
View file

@ -35,7 +35,9 @@
#include "core/gimpdrawable.h"
#include "core/gimpimage.h"
#include "core/gimplayer.h"
#include "core/gimpprogress.h"
#include "core/gimptoolinfo.h"
#include "gimp-intl.h"
static ProcRecord edit_cut_proc;
static ProcRecord edit_copy_proc;
@ -582,6 +584,9 @@ edit_blend_invoker (Gimp *gimp,
}
else
{
if (progress)
gimp_progress_start (progress, _("Blending..."), FALSE);
gimp_drawable_blend (drawable,
context,
blend_mode,
@ -592,7 +597,10 @@ edit_blend_invoker (Gimp *gimp,
supersample, max_depth,
threshold, dither,
x1, y1, x2, y2,
NULL);
progress);
if (progress)
gimp_progress_end (progress);
}
}

42
app/pdb/transform_tools_cmds.c
View file

@ -34,6 +34,8 @@
#include "core/gimpdrawable-transform.h"
#include "core/gimpdrawable.h"
#include "core/gimpimage.h"
#include "core/gimpprogress.h"
#include "gimp-intl.h"
static ProcRecord flip_proc;
static ProcRecord perspective_proc;
@ -186,11 +188,17 @@ perspective_invoker (Gimp *gimp,
else
interpolation_type = GIMP_INTERPOLATION_NONE;
if (progress)
gimp_progress_start (progress, _("Perspective..."), FALSE);
/* Perspective the selection */
success = gimp_drawable_transform_affine (drawable, context,
&matrix, GIMP_TRANSFORM_FORWARD,
interpolation_type, TRUE, 3,
FALSE);
FALSE, progress);
if (progress)
gimp_progress_end (progress);
}
}
@ -322,11 +330,17 @@ rotate_invoker (Gimp *gimp,
else
interpolation_type = GIMP_INTERPOLATION_NONE;
if (progress)
gimp_progress_start (progress, _("Rotating..."), FALSE);
/* Rotate the selection */
success = gimp_drawable_transform_affine (drawable, context,
&matrix, GIMP_TRANSFORM_FORWARD,
interpolation_type, FALSE, 3,
FALSE);
FALSE, progress);
if (progress)
gimp_progress_end (progress);
}
}
@ -433,11 +447,17 @@ scale_invoker (Gimp *gimp,
else
interpolation_type = GIMP_INTERPOLATION_NONE;
if (progress)
gimp_progress_start (progress, _("Scaling..."), FALSE);
/* Scale the selection */
success = gimp_drawable_transform_affine (drawable, context,
&matrix, GIMP_TRANSFORM_FORWARD,
interpolation_type, TRUE, 3,
FALSE);
FALSE, progress);
if (progress)
gimp_progress_end (progress);
}
}
@ -555,11 +575,17 @@ shear_invoker (Gimp *gimp,
else
interpolation_type = GIMP_INTERPOLATION_NONE;
if (progress)
gimp_progress_start (progress, _("Shearing..."), FALSE);
/* Shear the selection */
success = gimp_drawable_transform_affine (drawable, context,
&matrix, GIMP_TRANSFORM_FORWARD,
interpolation_type, FALSE, 3,
FALSE);
FALSE, progress);
if (progress)
gimp_progress_end (progress);
}
}
@ -679,11 +705,17 @@ transform_2d_invoker (Gimp *gimp,
else
interpolation_type = GIMP_INTERPOLATION_NONE;
if (progress)
gimp_progress_start (progress, _("2D Transform..."), FALSE);
/* Transform the selection */
success = gimp_drawable_transform_affine (drawable, context,
&matrix, GIMP_TRANSFORM_FORWARD,
interpolation_type, TRUE, 3,
FALSE);
FALSE, progress);
if (progress)
gimp_progress_end (progress);
}
}

12
tools/pdbgen/pdb/edit.pdb
View file

@ -318,6 +318,9 @@ HELP
}
else
{
if (progress)
gimp_progress_start (progress, _("Blending..."), FALSE);
gimp_drawable_blend (drawable,
context,
blend_mode,
@ -328,7 +331,10 @@ HELP
supersample, max_depth,
threshold, dither,
x1, y1, x2, y2,
NULL);
progress);
if (progress)
gimp_progress_end (progress);
}
}
CODE
@ -367,7 +373,9 @@ CODE
);
}
@headers = qw("core/gimp.h" "core/gimpimage.h" "core/gimp-edit.h");
@headers = qw("core/gimp.h" "core/gimp-edit.h" "core/gimpimage.h"
"core/gimpprogress.h"
"gimp-intl.h");
@procs = qw(edit_cut edit_copy edit_paste edit_clear
edit_fill edit_bucket_fill edit_blend edit_stroke);

46
tools/pdbgen/pdb/transform_tools.pdb
View file

@ -149,11 +149,17 @@ HELP
else
interpolation_type = GIMP_INTERPOLATION_NONE;
if (progress)
gimp_progress_start (progress, _("Perspective..."), FALSE);
/* Perspective the selection */
success = gimp_drawable_transform_affine (drawable, context,
&matrix, GIMP_TRANSFORM_FORWARD,
interpolation_type, TRUE, 3,
FALSE);
FALSE, progress);
if (progress)
gimp_progress_end (progress);
}
}
CODE
@ -209,11 +215,17 @@ HELP
else
interpolation_type = GIMP_INTERPOLATION_NONE;
if (progress)
gimp_progress_start (progress, _("Rotating..."), FALSE);
/* Rotate the selection */
success = gimp_drawable_transform_affine (drawable, context,
&matrix, GIMP_TRANSFORM_FORWARD,
interpolation_type, FALSE, 3,
FALSE);
FALSE, progress);
if (progress)
gimp_progress_end (progress);
}
}
CODE
@ -283,11 +295,17 @@ HELP
else
interpolation_type = GIMP_INTERPOLATION_NONE;
if (progress)
gimp_progress_start (progress, _("Scaling..."), FALSE);
/* Scale the selection */
success = gimp_drawable_transform_affine (drawable, context,
&matrix, GIMP_TRANSFORM_FORWARD,
interpolation_type, TRUE, 3,
FALSE);
FALSE, progress);
if (progress)
gimp_progress_end (progress);
}
}
CODE
@ -350,11 +368,17 @@ HELP
else
interpolation_type = GIMP_INTERPOLATION_NONE;
if (progress)
gimp_progress_start (progress, _("Shearing..."), FALSE);
/* Shear the selection */
success = gimp_drawable_transform_affine (drawable, context,
&matrix, GIMP_TRANSFORM_FORWARD,
interpolation_type, FALSE, 3,
FALSE);
FALSE, progress);
if (progress)
gimp_progress_end (progress);
}
}
CODE
@ -426,11 +450,17 @@ HELP
else
interpolation_type = GIMP_INTERPOLATION_NONE;
if (progress)
gimp_progress_start (progress, _("2D Transform..."), FALSE);
/* Transform the selection */
success = gimp_drawable_transform_affine (drawable, context,
&matrix, GIMP_TRANSFORM_FORWARD,
interpolation_type, TRUE, 3,
FALSE);
FALSE, progress);
if (progress)
gimp_progress_end (progress);
}
}
CODE
@ -438,8 +468,10 @@ CODE
}
@headers = qw("libgimpmath/gimpmath.h" "config/gimpcoreconfig.h"
"core/gimp.h" "core/gimpimage.h" "core/gimp-transform-utils.h"
"core/gimpdrawable.h" "core/gimpdrawable-transform.h");
"core/gimp.h" "core/gimp-transform-utils.h" "core/gimpimage.h"
"core/gimpdrawable.h" "core/gimpdrawable-transform.h"
"core/gimpprogress.h"
"gimp-intl.h");
@procs = qw(flip perspective rotate scale shear transform_2d);