From 77b7161a32d261fedf7852433b4a4870d80c0334 Mon Sep 17 00:00:00 2001 From: Sven Neumann Date: Mon, 10 Sep 2007 15:29:48 +0000 Subject: [PATCH] app/core/gimp-transform-region.[ch] app/core/gimpchannel.c 2007-09-10 Sven Neumann * app/core/gimp-transform-region.[ch] * app/core/gimpchannel.c * app/core/gimpdrawable-transform.[ch] * app/core/gimpdrawable.c * app/core/gimpimage-item-list.[ch] * app/core/gimpitem-linked.[ch] * app/core/gimpitem.[ch] * app/core/gimplayer.c * app/paint/gimpperspectiveclone.c * app/vectors/gimpvectors.c: removed supersample parameter from transform functions and perform it depending on the interpolation type (bug #473265). * app/tools/gimptransformoptions.[ch] * app/tools/gimptransformtool.c: removed Supersample toggle from the transform tool options. * tools/pdbgen/pdb/drawable_transform.pdb * tools/pdbgen/pdb/transform_tools.pdb: document that the supersample parameter is unused and improved documentation of the recursion-level parameter. * app/pdb/transform_tools_cmds.c * app/pdb/drawable_transform_cmds.c * libgimp/gimpdrawabletransform_pdb.c: regenerated. svn path=/trunk/; revision=23494 --- ChangeLog | 28 ++++++++++ app/core/gimp-transform-region.c | 22 +++----- app/core/gimp-transform-region.h | 1 - app/core/gimpchannel.c | 7 ++- app/core/gimpdrawable-transform.c | 4 -- app/core/gimpdrawable-transform.h | 2 - app/core/gimpdrawable.c | 4 +- app/core/gimpimage-item-list.c | 4 +- app/core/gimpimage-item-list.h | 1 - app/core/gimpitem-linked.c | 4 +- app/core/gimpitem-linked.h | 1 - app/core/gimpitem.c | 4 +- app/core/gimpitem.h | 2 - app/core/gimplayer.c | 10 ++-- app/paint/gimpperspectiveclone.c | 3 +- app/pdb/drawable_transform_cmds.c | 70 ++++++++++--------------- app/pdb/transform_tools_cmds.c | 10 ++-- app/tools/gimptransformoptions.c | 40 +------------- app/tools/gimptransformoptions.h | 1 - app/tools/gimptransformtool.c | 4 -- app/vectors/gimpvectors.c | 2 - libgimp/gimpdrawabletransform_pdb.c | 28 +++++----- tools/pdbgen/pdb/drawable_transform.pdb | 34 ++++++------ tools/pdbgen/pdb/transform_tools.pdb | 10 ++-- 24 files changed, 115 insertions(+), 181 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3d386abd42..6fa52907e1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,31 @@ +2007-09-10 Sven Neumann + + * app/core/gimp-transform-region.[ch] + * app/core/gimpchannel.c + * app/core/gimpdrawable-transform.[ch] + * app/core/gimpdrawable.c + * app/core/gimpimage-item-list.[ch] + * app/core/gimpitem-linked.[ch] + * app/core/gimpitem.[ch] + * app/core/gimplayer.c + * app/paint/gimpperspectiveclone.c + * app/vectors/gimpvectors.c: removed supersample parameter from + transform functions and perform it depending on the interpolation + type (bug #473265). + + * app/tools/gimptransformoptions.[ch] + * app/tools/gimptransformtool.c: removed Supersample toggle from + the transform tool options. + + * tools/pdbgen/pdb/drawable_transform.pdb + * tools/pdbgen/pdb/transform_tools.pdb: document that the + supersample parameter is unused and improved documentation of the + recursion-level parameter. + + * app/pdb/transform_tools_cmds.c + * app/pdb/drawable_transform_cmds.c + * libgimp/gimpdrawabletransform_pdb.c: regenerated. + 2007-09-10 Sven Neumann * app/tools/gimpperspectiveclonetool.c diff --git a/app/core/gimp-transform-region.c b/app/core/gimp-transform-region.c index e3dd55f563..5b15f960f3 100644 --- a/app/core/gimp-transform-region.c +++ b/app/core/gimp-transform-region.c @@ -70,7 +70,6 @@ static void gimp_transform_region_linear (TileManager *orig_tiles, gint v2, const GimpMatrix3 *m, gint alpha, - gboolean supersample, gint recursion_level, const guchar *bg_color, GimpProgress *progress); @@ -86,7 +85,6 @@ static void gimp_transform_region_cubic (TileManager *orig_tiles, gint v2, const GimpMatrix3 *m, gint alpha, - gboolean supersample, gint recursion_level, const guchar *bg_color, GimpProgress *progress); @@ -102,7 +100,6 @@ static void gimp_transform_region_lanczos (TileManager *orig_tiles, gint v2, const GimpMatrix3 *m, gint alpha, - gboolean supersample, gint recursion_level, const guchar *bg_color, GimpProgress *progress); @@ -180,7 +177,6 @@ gimp_transform_region (GimpPickable *pickable, gint dest_y2, const GimpMatrix3 *matrix, GimpInterpolationType interpolation_type, - gboolean supersample, gint recursion_level, GimpProgress *progress) { @@ -259,7 +255,7 @@ gimp_transform_region (GimpPickable *pickable, gimp_transform_region_linear (orig_tiles, destPR, dest_x1, dest_y1, dest_x2, dest_y2, u1, v1, u2, v2, - &m, alpha, supersample, recursion_level, + &m, alpha, recursion_level, bg_color, progress); break; @@ -267,7 +263,7 @@ gimp_transform_region (GimpPickable *pickable, gimp_transform_region_cubic (orig_tiles, destPR, dest_x1, dest_y1, dest_x2, dest_y2, u1, v1, u2, v2, - &m, alpha, supersample, recursion_level, + &m, alpha, recursion_level, bg_color, progress); break; @@ -275,7 +271,7 @@ gimp_transform_region (GimpPickable *pickable, gimp_transform_region_lanczos (orig_tiles, destPR, dest_x1, dest_y1, dest_x2, dest_y2, u1, v1, u2, v2, - &m, alpha, supersample, recursion_level, + &m, alpha, recursion_level, bg_color, progress); break; } @@ -387,7 +383,6 @@ gimp_transform_region_linear (TileManager *orig_tiles, gint v2, const GimpMatrix3 *m, gint alpha, - gboolean supersample, gint recursion_level, const guchar *bg_color, GimpProgress *progress) @@ -433,8 +428,7 @@ gimp_transform_region_linear (TileManager *orig_tiles, normalize_coords (5, tu, tv, tw, u, v); /* Set the destination pixels */ - if (supersample && - supersample_dtest (u[1], v[1], u[2], v[2], + if (supersample_dtest (u[1], v[1], u[2], v[2], u[3], v[3], u[4], v[4])) { sample_adapt (orig_tiles, @@ -491,7 +485,6 @@ gimp_transform_region_cubic (TileManager *orig_tiles, gint v2, const GimpMatrix3 *m, gint alpha, - gboolean supersample, gint recursion_level, const guchar *bg_color, GimpProgress *progress) @@ -536,8 +529,7 @@ gimp_transform_region_cubic (TileManager *orig_tiles, /* normalize homogeneous coords */ normalize_coords (5, tu, tv, tw, u, v); - if (supersample && - supersample_dtest (u[1], v[1], u[2], v[2], + if (supersample_dtest (u[1], v[1], u[2], v[2], u[3], v[3], u[4], v[4])) { sample_adapt (orig_tiles, @@ -594,7 +586,6 @@ gimp_transform_region_lanczos (TileManager *orig_tiles, gint v2, const GimpMatrix3 *m, gint alpha, - gboolean supersample, gint recursion_level, const guchar *bg_color, GimpProgress *progress) @@ -644,8 +635,7 @@ gimp_transform_region_lanczos (TileManager *orig_tiles, /* normalize homogeneous coords */ normalize_coords (5, tu, tv, tw, u, v); - if (supersample && - supersample_dtest (u[1], v[1], u[2], v[2], + if (supersample_dtest (u[1], v[1], u[2], v[2], u[3], v[3], u[4], v[4])) { sample_adapt (orig_tiles, diff --git a/app/core/gimp-transform-region.h b/app/core/gimp-transform-region.h index 1d67d7618a..63c3d04419 100644 --- a/app/core/gimp-transform-region.h +++ b/app/core/gimp-transform-region.h @@ -30,7 +30,6 @@ void gimp_transform_region (GimpPickable *pickable, gint dest_y2, const GimpMatrix3 *matrix, GimpInterpolationType interpolation_type, - gboolean supersample, gint recursion_level, GimpProgress *progress); diff --git a/app/core/gimpchannel.c b/app/core/gimpchannel.c index 00008043fb..669f9f86fa 100644 --- a/app/core/gimpchannel.c +++ b/app/core/gimpchannel.c @@ -114,7 +114,6 @@ static void gimp_channel_transform (GimpItem *item, const GimpMatrix3 *matrix, GimpTransformDirection direction, GimpInterpolationType interpolation_type, - gboolean supersample, gint recursion_level, GimpTransformResize clip_result, GimpProgress *progress); @@ -654,7 +653,6 @@ gimp_channel_transform (GimpItem *item, const GimpMatrix3 *matrix, GimpTransformDirection direction, GimpInterpolationType interpolation_type, - gboolean supersample, gint recursion_level, GimpTransformResize clip_result, GimpProgress *progress) @@ -664,8 +662,9 @@ gimp_channel_transform (GimpItem *item, GIMP_ITEM_CLASS (parent_class)->transform (item, context, matrix, direction, interpolation_type, - supersample, recursion_level, - clip_result, progress); + recursion_level, + clip_result, + progress); } static gboolean diff --git a/app/core/gimpdrawable-transform.c b/app/core/gimpdrawable-transform.c index 7754c14a27..33c8fd6380 100644 --- a/app/core/gimpdrawable-transform.c +++ b/app/core/gimpdrawable-transform.c @@ -74,7 +74,6 @@ gimp_drawable_transform_tiles_affine (GimpDrawable *drawable, const GimpMatrix3 *matrix, GimpTransformDirection direction, GimpInterpolationType interpolation_type, - gboolean supersample, gint recursion_level, GimpTransformResize clip_result, GimpProgress *progress) @@ -143,7 +142,6 @@ gimp_drawable_transform_tiles_affine (GimpDrawable *drawable, y2, &inv, interpolation_type, - supersample, recursion_level, progress); @@ -537,7 +535,6 @@ gimp_drawable_transform_affine (GimpDrawable *drawable, const GimpMatrix3 *matrix, GimpTransformDirection direction, GimpInterpolationType interpolation_type, - gboolean supersample, gint recursion_level, GimpTransformResize clip_result, GimpProgress *progress) @@ -576,7 +573,6 @@ gimp_drawable_transform_affine (GimpDrawable *drawable, matrix, GIMP_TRANSFORM_FORWARD, interpolation_type, - supersample, recursion_level, clip_result, progress); diff --git a/app/core/gimpdrawable-transform.h b/app/core/gimpdrawable-transform.h index b46eb1ab6f..11829fc215 100644 --- a/app/core/gimpdrawable-transform.h +++ b/app/core/gimpdrawable-transform.h @@ -39,7 +39,6 @@ TileManager * gimp_drawable_transform_tiles_affine (GimpDrawable *draw const GimpMatrix3 *matrix, GimpTransformDirection direction, GimpInterpolationType interpolation_type, - gboolean supersample, gint recursion_level, GimpTransformResize clip_result, GimpProgress *progress); @@ -63,7 +62,6 @@ gboolean gimp_drawable_transform_affine (GimpDrawable *draw const GimpMatrix3 *matrix, GimpTransformDirection direction, GimpInterpolationType interpolation_type, - gboolean supersample, gint recursion_level, GimpTransformResize clip_result, GimpProgress *progress); diff --git a/app/core/gimpdrawable.c b/app/core/gimpdrawable.c index 37219d9e03..f538a77fbc 100644 --- a/app/core/gimpdrawable.c +++ b/app/core/gimpdrawable.c @@ -110,7 +110,6 @@ static void gimp_drawable_transform (GimpItem *item, const GimpMatrix3 *matrix, GimpTransformDirection direction, GimpInterpolationType interpolation_type, - gboolean supersample, gint recursion_level, GimpTransformResize clip_result, GimpProgress *progress); @@ -556,7 +555,6 @@ gimp_drawable_transform (GimpItem *item, const GimpMatrix3 *matrix, GimpTransformDirection direction, GimpInterpolationType interpolation_type, - gboolean supersample, gint recursion_level, GimpTransformResize clip_result, GimpProgress *progress) @@ -575,7 +573,7 @@ gimp_drawable_transform (GimpItem *item, drawable->tiles, matrix, direction, interpolation_type, - supersample, recursion_level, + recursion_level, clip_result, progress); diff --git a/app/core/gimpimage-item-list.c b/app/core/gimpimage-item-list.c index 82156039fa..2b719c5aa2 100644 --- a/app/core/gimpimage-item-list.c +++ b/app/core/gimpimage-item-list.c @@ -121,7 +121,6 @@ gimp_image_item_list_transform (GimpImage *image, const GimpMatrix3 *matrix, GimpTransformDirection direction, GimpInterpolationType interpolation_type, - gboolean supersample, gint recursion_level, GimpTransformResize clip_result, GimpProgress *progress) @@ -140,8 +139,7 @@ gimp_image_item_list_transform (GimpImage *image, for (l = list; l; l = g_list_next (l)) gimp_item_transform (GIMP_ITEM (l->data), context, matrix, direction, - interpolation_type, - supersample, recursion_level, + interpolation_type, recursion_level, clip_result, progress); gimp_image_undo_group_end (image); diff --git a/app/core/gimpimage-item-list.h b/app/core/gimpimage-item-list.h index 2d6809df2a..d3dfd3ddc2 100644 --- a/app/core/gimpimage-item-list.h +++ b/app/core/gimpimage-item-list.h @@ -44,7 +44,6 @@ void gimp_image_item_list_transform (GimpImage *image, const GimpMatrix3 *matrix, GimpTransformDirection direction, GimpInterpolationType interpolation_type, - gboolean supersample, gint recursion_level, GimpTransformResize clip_result, GimpProgress *progress); diff --git a/app/core/gimpitem-linked.c b/app/core/gimpitem-linked.c index e3b725186e..e763f35896 100644 --- a/app/core/gimpitem-linked.c +++ b/app/core/gimpitem-linked.c @@ -120,7 +120,6 @@ gimp_item_linked_transform (GimpItem *item, const GimpMatrix3 *matrix, GimpTransformDirection direction, GimpInterpolationType interpolation_type, - gboolean supersample, gint recursion_level, GimpTransformResize clip_result, GimpProgress *progress) @@ -139,8 +138,7 @@ gimp_item_linked_transform (GimpItem *item, gimp_image_item_list_transform (gimp_item_get_image (item), list, context, matrix, direction, - interpolation_type, - supersample, recursion_level, + interpolation_type, recursion_level, clip_result, progress); g_list_free (list); diff --git a/app/core/gimpitem-linked.h b/app/core/gimpitem-linked.h index 1d8708b30b..66f523c15e 100644 --- a/app/core/gimpitem-linked.h +++ b/app/core/gimpitem-linked.h @@ -40,7 +40,6 @@ void gimp_item_linked_transform (GimpItem *item, const GimpMatrix3 *matrix, GimpTransformDirection direction, GimpInterpolationType interpolation_type, - gboolean supersample, gint recursion_level, GimpTransformResize clip_result, GimpProgress *progress); diff --git a/app/core/gimpitem.c b/app/core/gimpitem.c index 6f6d493807..13842eb3d4 100644 --- a/app/core/gimpitem.c +++ b/app/core/gimpitem.c @@ -975,7 +975,6 @@ gimp_item_transform (GimpItem *item, const GimpMatrix3 *matrix, GimpTransformDirection direction, GimpInterpolationType interpolation, - gboolean supersample, gint recursion_level, GimpTransformResize clip_result, GimpProgress *progress) @@ -996,8 +995,7 @@ gimp_item_transform (GimpItem *item, item_class->transform_desc); item_class->transform (item, context, matrix, direction, interpolation, - supersample, recursion_level, - clip_result, progress); + recursion_level, clip_result, progress); gimp_image_undo_group_end (image); } diff --git a/app/core/gimpitem.h b/app/core/gimpitem.h index ce0e7933bb..e4cf70f5ad 100644 --- a/app/core/gimpitem.h +++ b/app/core/gimpitem.h @@ -105,7 +105,6 @@ struct _GimpItemClass const GimpMatrix3 *matrix, GimpTransformDirection direction, GimpInterpolationType interpolation_type, - gboolean supersample, gint recursion_level, GimpTransformResize clip_result, GimpProgress *progress); @@ -207,7 +206,6 @@ void gimp_item_transform (GimpItem *item, const GimpMatrix3 *matrix, GimpTransformDirection direction, GimpInterpolationType interpolation_type, - gboolean supersample, gint recursion_level, GimpTransformResize clip_result, GimpProgress *progress); diff --git a/app/core/gimplayer.c b/app/core/gimplayer.c index 731c827cad..7ab86821f9 100644 --- a/app/core/gimplayer.c +++ b/app/core/gimplayer.c @@ -133,7 +133,6 @@ static void gimp_layer_transform (GimpItem *item, const GimpMatrix3 *matrix, GimpTransformDirection direction, GimpInterpolationType interpolation_type, - gboolean supersample, gint recursion_level, GimpTransformResize clip_result, GimpProgress *progress); @@ -776,7 +775,6 @@ gimp_layer_transform (GimpItem *item, const GimpMatrix3 *matrix, GimpTransformDirection direction, GimpInterpolationType interpolation_type, - gboolean supersample, gint recursion_level, GimpTransformResize clip_result, GimpProgress *progress) @@ -792,14 +790,14 @@ gimp_layer_transform (GimpItem *item, GIMP_ITEM_CLASS (parent_class)->transform (item, context, matrix, direction, interpolation_type, - supersample, recursion_level, - clip_result, progress); + recursion_level, + clip_result, + progress); if (layer->mask) gimp_item_transform (GIMP_ITEM (layer->mask), context, matrix, direction, - interpolation_type, - supersample, recursion_level, + interpolation_type, recursion_level, clip_result, progress); } diff --git a/app/paint/gimpperspectiveclone.c b/app/paint/gimpperspectiveclone.c index 1d8c3f809c..371988ff30 100644 --- a/app/paint/gimpperspectiveclone.c +++ b/app/paint/gimpperspectiveclone.c @@ -399,8 +399,7 @@ gimp_perspective_clone_get_source (GimpSourceCore *source_core, &destPR, x1d, y1d, x2d, y2d, &matrix, - GIMP_INTERPOLATION_LINEAR, - FALSE, 0, NULL); + GIMP_INTERPOLATION_LINEAR, 0, NULL); tile_manager_unref (orig_tiles); diff --git a/app/pdb/drawable_transform_cmds.c b/app/pdb/drawable_transform_cmds.c index d67f55b8fa..a48fe0d030 100644 --- a/app/pdb/drawable_transform_cmds.c +++ b/app/pdb/drawable_transform_cmds.c @@ -146,8 +146,7 @@ drawable_transform_flip_invoker (GimpProcedure *procedure, /* Transform the selection */ success = gimp_drawable_transform_affine (drawable, context, &matrix, transform_direction, - interpolation, supersample, - recursion_level, + interpolation, recursion_level, clip_result, progress); if (progress) @@ -220,8 +219,7 @@ drawable_transform_flip_default_invoker (GimpProcedure *procedure, /* Transform the selection */ success = gimp_drawable_transform_affine (drawable, context, &matrix, GIMP_TRANSFORM_FORWARD, - interpolation_type, - interpolate, 3, + interpolation_type, 3, clip_result, progress); if (progress) @@ -306,8 +304,7 @@ drawable_transform_perspective_invoker (GimpProcedure *procedure, /* Transform the selection */ success = gimp_drawable_transform_affine (drawable, context, &matrix, transform_direction, - interpolation, supersample, - recursion_level, + interpolation, recursion_level, clip_result, progress); if (progress) @@ -390,8 +387,7 @@ drawable_transform_perspective_default_invoker (GimpProcedure *procedure, /* Transform the selection */ success = gimp_drawable_transform_affine (drawable, context, &matrix, GIMP_TRANSFORM_FORWARD, - interpolation_type, - interpolate, 3, + interpolation_type, 3, clip_result, progress); if (progress) @@ -517,8 +513,7 @@ drawable_transform_rotate_invoker (GimpProcedure *procedure, /* Transform the selection */ success = gimp_drawable_transform_affine (drawable, context, &matrix, transform_direction, - interpolation, supersample, - recursion_level, + interpolation, recursion_level, clip_result, progress); if (progress) @@ -595,8 +590,7 @@ drawable_transform_rotate_default_invoker (GimpProcedure *procedure, /* Transform the selection */ success = gimp_drawable_transform_affine (drawable, context, &matrix, GIMP_TRANSFORM_FORWARD, - interpolation_type, - interpolate, 3, + interpolation_type, 3, clip_result, progress); if (progress) @@ -672,8 +666,7 @@ drawable_transform_scale_invoker (GimpProcedure *procedure, /* Transform the selection */ success = gimp_drawable_transform_affine (drawable, context, &matrix, transform_direction, - interpolation, supersample, - recursion_level, + interpolation, recursion_level, clip_result, progress); if (progress) @@ -747,8 +740,7 @@ drawable_transform_scale_default_invoker (GimpProcedure *procedure, /* Transform the selection */ success = gimp_drawable_transform_affine (drawable, context, &matrix, GIMP_TRANSFORM_FORWARD, - interpolation_type, - interpolate, 3, + interpolation_type, 3, clip_result, progress); if (progress) @@ -820,8 +812,7 @@ drawable_transform_shear_invoker (GimpProcedure *procedure, /* Transform the selection */ success = gimp_drawable_transform_affine (drawable, context, &matrix, transform_direction, - interpolation, supersample, - recursion_level, + interpolation, recursion_level, clip_result, progress); if (progress) @@ -891,8 +882,7 @@ drawable_transform_shear_default_invoker (GimpProcedure *procedure, /* Transform the selection */ success = gimp_drawable_transform_affine (drawable, context, &matrix, GIMP_TRANSFORM_FORWARD, - interpolation_type, - interpolate, 3, + interpolation_type, 3, clip_result, progress); if (progress) @@ -975,8 +965,7 @@ drawable_transform_2d_invoker (GimpProcedure *procedure, /* Transform the selection */ success = gimp_drawable_transform_affine (drawable, context, &matrix, transform_direction, - interpolation, supersample, - recursion_level, + interpolation, recursion_level, clip_result, progress); if (progress) @@ -1057,8 +1046,7 @@ drawable_transform_2d_default_invoker (GimpProcedure *procedure, /* Transform the selection */ success = gimp_drawable_transform_affine (drawable, context, &matrix, GIMP_TRANSFORM_FORWARD, - interpolation_type, - interpolate, 3, + interpolation_type, 3, clip_result, progress); if (progress) @@ -1149,8 +1137,7 @@ drawable_transform_matrix_invoker (GimpProcedure *procedure, /* Transform the selection */ success = gimp_drawable_transform_affine (drawable, context, &matrix, transform_direction, - interpolation, supersample, - recursion_level, + interpolation, recursion_level, clip_result, progress); if (progress) @@ -1239,8 +1226,7 @@ drawable_transform_matrix_default_invoker (GimpProcedure *procedure, /* Transform the selection */ success = gimp_drawable_transform_affine (drawable, context, &matrix, GIMP_TRANSFORM_FORWARD, - interpolation_type, - interpolate, 3, + interpolation_type, 3, clip_result, progress); if (progress) @@ -1376,13 +1362,13 @@ register_drawable_transform_procs (GimpPDB *pdb) gimp_procedure_add_argument (procedure, g_param_spec_boolean ("supersample", "supersample", - "Whether to perform supersample", + "This parameter is ignored, supersampling is performed based on the interpolation type", FALSE, GIMP_PARAM_READWRITE)); gimp_procedure_add_argument (procedure, gimp_param_spec_int32 ("recursion-level", "recursion level", - "Level of recursion (3 is a nice default)", + "Maximum recursion level used for supersampling (3 is a nice value)", 1, G_MAXINT32, 1, GIMP_PARAM_READWRITE)); gimp_procedure_add_argument (procedure, @@ -1548,13 +1534,13 @@ register_drawable_transform_procs (GimpPDB *pdb) gimp_procedure_add_argument (procedure, g_param_spec_boolean ("supersample", "supersample", - "Whether to perform supersample", + "This parameter is ignored, supersampling is performed based on the interpolation type", FALSE, GIMP_PARAM_READWRITE)); gimp_procedure_add_argument (procedure, gimp_param_spec_int32 ("recursion-level", "recursion level", - "Level of recursion (3 is a nice default)", + "Maximum recursion level used for supersampling (3 is a nice value)", 1, G_MAXINT32, 1, GIMP_PARAM_READWRITE)); gimp_procedure_add_argument (procedure, @@ -1781,13 +1767,13 @@ register_drawable_transform_procs (GimpPDB *pdb) gimp_procedure_add_argument (procedure, g_param_spec_boolean ("supersample", "supersample", - "Whether to perform supersample", + "This parameter is ignored, supersampling is performed based on the interpolation type", FALSE, GIMP_PARAM_READWRITE)); gimp_procedure_add_argument (procedure, gimp_param_spec_int32 ("recursion-level", "recursion level", - "Level of recursion (3 is a nice default)", + "Maximum recursion level used for supersampling (3 is a nice value)", 1, G_MAXINT32, 1, GIMP_PARAM_READWRITE)); gimp_procedure_add_argument (procedure, @@ -1931,13 +1917,13 @@ register_drawable_transform_procs (GimpPDB *pdb) gimp_procedure_add_argument (procedure, g_param_spec_boolean ("supersample", "supersample", - "Whether to perform supersample", + "This parameter is ignored, supersampling is performed based on the interpolation type", FALSE, GIMP_PARAM_READWRITE)); gimp_procedure_add_argument (procedure, gimp_param_spec_int32 ("recursion-level", "recursion level", - "Level of recursion (3 is a nice default)", + "Maximum recursion level used for supersampling (3 is a nice value)", 1, G_MAXINT32, 1, GIMP_PARAM_READWRITE)); gimp_procedure_add_argument (procedure, @@ -2072,13 +2058,13 @@ register_drawable_transform_procs (GimpPDB *pdb) gimp_procedure_add_argument (procedure, g_param_spec_boolean ("supersample", "supersample", - "Whether to perform supersample", + "This parameter is ignored, supersampling is performed based on the interpolation type", FALSE, GIMP_PARAM_READWRITE)); gimp_procedure_add_argument (procedure, gimp_param_spec_int32 ("recursion-level", "recursion level", - "Level of recursion (3 is a nice default)", + "Maximum recursion level used for supersampling (3 is a nice value)", 1, G_MAXINT32, 1, GIMP_PARAM_READWRITE)); gimp_procedure_add_argument (procedure, @@ -2231,13 +2217,13 @@ register_drawable_transform_procs (GimpPDB *pdb) gimp_procedure_add_argument (procedure, g_param_spec_boolean ("supersample", "supersample", - "Whether to perform supersample", + "This parameter is ignored, supersampling is performed based on the interpolation type", FALSE, GIMP_PARAM_READWRITE)); gimp_procedure_add_argument (procedure, gimp_param_spec_int32 ("recursion-level", "recursion level", - "Level of recursion (3 is a nice default)", + "Maximum recursion level used for supersampling (3 is a nice value)", 1, G_MAXINT32, 1, GIMP_PARAM_READWRITE)); gimp_procedure_add_argument (procedure, @@ -2429,13 +2415,13 @@ register_drawable_transform_procs (GimpPDB *pdb) gimp_procedure_add_argument (procedure, g_param_spec_boolean ("supersample", "supersample", - "Whether to perform supersample", + "This parameter is ignored, supersampling is performed based on the interpolation type", FALSE, GIMP_PARAM_READWRITE)); gimp_procedure_add_argument (procedure, gimp_param_spec_int32 ("recursion-level", "recursion level", - "Level of recursion (3 is a nice default)", + "Maximum recursion level used for supersampling (3 is a nice value)", 1, G_MAXINT32, 1, GIMP_PARAM_READWRITE)); gimp_procedure_add_argument (procedure, diff --git a/app/pdb/transform_tools_cmds.c b/app/pdb/transform_tools_cmds.c index 6f2bedd4fe..9721d93cc5 100644 --- a/app/pdb/transform_tools_cmds.c +++ b/app/pdb/transform_tools_cmds.c @@ -145,7 +145,7 @@ perspective_invoker (GimpProcedure *procedure, success = gimp_drawable_transform_affine (drawable, context, &matrix, GIMP_TRANSFORM_FORWARD, - interpolation_type, TRUE, 3, + interpolation_type, 3, FALSE, progress); if (progress) @@ -212,7 +212,7 @@ rotate_invoker (GimpProcedure *procedure, success = gimp_drawable_transform_affine (drawable, context, &matrix, GIMP_TRANSFORM_FORWARD, - interpolation_type, FALSE, 3, + interpolation_type, 3, FALSE, progress); if (progress) @@ -286,7 +286,7 @@ scale_invoker (GimpProcedure *procedure, success = gimp_drawable_transform_affine (drawable, context, &matrix, GIMP_TRANSFORM_FORWARD, - interpolation_type, TRUE, 3, + interpolation_type, 3, FALSE, progress); if (progress) @@ -355,7 +355,7 @@ shear_invoker (GimpProcedure *procedure, success = gimp_drawable_transform_affine (drawable, context, &matrix, GIMP_TRANSFORM_FORWARD, - interpolation_type, FALSE, 3, + interpolation_type, 3, FALSE, progress); if (progress) @@ -428,7 +428,7 @@ transform_2d_invoker (GimpProcedure *procedure, /* Transform the selection */ success = gimp_drawable_transform_affine (drawable, context, &matrix, GIMP_TRANSFORM_FORWARD, - interpolation_type, TRUE, 3, + interpolation_type, 3, FALSE, progress); if (progress) diff --git a/app/tools/gimptransformoptions.c b/app/tools/gimptransformoptions.c index 51b37bd98a..a1d9e05d02 100644 --- a/app/tools/gimptransformoptions.c +++ b/app/tools/gimptransformoptions.c @@ -46,8 +46,6 @@ enum PROP_TYPE, PROP_DIRECTION, PROP_INTERPOLATION, - PROP_SUPERSAMPLE, - PROP_RECURSION_LEVEL, PROP_CLIP, PROP_PREVIEW_TYPE, PROP_GRID_TYPE, @@ -104,25 +102,6 @@ gimp_transform_options_class_init (GimpTransformOptionsClass *klass) GIMP_TYPE_INTERPOLATION_TYPE, GIMP_INTERPOLATION_LINEAR, GIMP_PARAM_STATIC_STRINGS); - GIMP_CONFIG_INSTALL_PROP_BOOLEAN (object_class, PROP_SUPERSAMPLE, - "supersample", NULL, - FALSE, - GIMP_PARAM_STATIC_STRINGS); - -#if 0 - GIMP_CONFIG_INSTALL_PROP_INT (object_class, PROP_RECURSION_LEVEL, - "recursion-level", NULL, - 1, 5, 3, - GIMP_PARAM_STATIC_STRINGS); -#endif - - g_object_class_install_property (object_class, PROP_RECURSION_LEVEL, - g_param_spec_int ("recursion-level", - NULL, NULL, - 1, 5, 3, - GIMP_PARAM_READWRITE | - G_PARAM_CONSTRUCT)); - GIMP_CONFIG_INSTALL_PROP_ENUM (object_class, PROP_CLIP, "clip", NULL, GIMP_TYPE_TRANSFORM_RESIZE, @@ -151,6 +130,7 @@ gimp_transform_options_class_init (GimpTransformOptionsClass *klass) static void gimp_transform_options_init (GimpTransformOptions *options) { + options->recursion_level = 3; } static void @@ -172,12 +152,6 @@ gimp_transform_options_set_property (GObject *object, case PROP_INTERPOLATION: options->interpolation = g_value_get_enum (value); break; - case PROP_SUPERSAMPLE: - options->supersample = g_value_get_boolean (value); - break; - case PROP_RECURSION_LEVEL: - options->recursion_level = g_value_get_int (value); - break; case PROP_CLIP: options->clip = g_value_get_enum (value); break; @@ -218,12 +192,6 @@ gimp_transform_options_get_property (GObject *object, case PROP_INTERPOLATION: g_value_set_enum (value, options->interpolation); break; - case PROP_SUPERSAMPLE: - g_value_set_boolean (value, options->supersample); - break; - case PROP_RECURSION_LEVEL: - g_value_set_int (value, options->recursion_level); - break; case PROP_CLIP: g_value_set_enum (value, options->clip); break; @@ -301,12 +269,6 @@ gimp_transform_options_gui (GimpToolOptions *tool_options) gtk_box_pack_start (GTK_BOX (hbox), combo, TRUE, TRUE, 0); gtk_widget_show (combo); - /* the supersample toggle button */ - button = gimp_prop_check_button_new (config, "supersample", - _("Supersampling")); - gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0); - gtk_widget_show (button); - /* the clipping menu */ hbox = gtk_hbox_new (FALSE, 6); gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0); diff --git a/app/tools/gimptransformoptions.h b/app/tools/gimptransformoptions.h index a415aec03e..946a5402a0 100644 --- a/app/tools/gimptransformoptions.h +++ b/app/tools/gimptransformoptions.h @@ -41,7 +41,6 @@ struct _GimpTransformOptions GimpTransformType type; GimpTransformDirection direction; GimpInterpolationType interpolation; - gboolean supersample; gint recursion_level; gboolean clip; GimpTransformPreviewType preview_type; diff --git a/app/tools/gimptransformtool.c b/app/tools/gimptransformtool.c index 6dff97fc28..4ea7026348 100644 --- a/app/tools/gimptransformtool.c +++ b/app/tools/gimptransformtool.c @@ -1069,7 +1069,6 @@ gimp_transform_tool_real_transform (GimpTransformTool *tr_tool, &tr_tool->transform, options->direction, options->interpolation, - options->supersample, options->recursion_level, options->clip, progress); @@ -1084,7 +1083,6 @@ gimp_transform_tool_real_transform (GimpTransformTool *tr_tool, &tr_tool->transform, options->direction, options->interpolation, - options->supersample, options->recursion_level, options->clip, progress); @@ -1113,7 +1111,6 @@ gimp_transform_tool_real_transform (GimpTransformTool *tr_tool, &tr_tool->transform, options->direction, options->interpolation, - options->supersample, options->recursion_level, clip_result, progress); @@ -1126,7 +1123,6 @@ gimp_transform_tool_real_transform (GimpTransformTool *tr_tool, &tr_tool->transform, options->direction, options->interpolation, - options->supersample, options->recursion_level, options->clip, progress); diff --git a/app/vectors/gimpvectors.c b/app/vectors/gimpvectors.c index 3d06026307..7427093c47 100644 --- a/app/vectors/gimpvectors.c +++ b/app/vectors/gimpvectors.c @@ -102,7 +102,6 @@ static void gimp_vectors_transform (GimpItem *item, const GimpMatrix3 *matrix, GimpTransformDirection direction, GimpInterpolationType interp_type, - gboolean supersample, gint recursion_level, GimpTransformResize clip_result, GimpProgress *progress); @@ -460,7 +459,6 @@ gimp_vectors_transform (GimpItem *item, const GimpMatrix3 *matrix, GimpTransformDirection direction, GimpInterpolationType interpolation_type, - gboolean supersample, gint recursion_level, GimpTransformResize clip_result, GimpProgress *progress) diff --git a/libgimp/gimpdrawabletransform_pdb.c b/libgimp/gimpdrawabletransform_pdb.c index dcd70575d0..2b5bc2a4ee 100644 --- a/libgimp/gimpdrawabletransform_pdb.c +++ b/libgimp/gimpdrawabletransform_pdb.c @@ -86,8 +86,8 @@ gimp_drawable_transform_flip_simple (gint32 drawable_ID, * @y1: vert. coord. of other end of axis. * @transform_direction: Direction of transformation. * @interpolation: Type of interpolation. - * @supersample: Whether to perform supersample. - * @recursion_level: Level of recursion (3 is a nice default). + * @supersample: This parameter is ignored, supersampling is performed based on the interpolation type. + * @recursion_level: Maximum recursion level used for supersampling (3 is a nice value). * @clip_result: Whether to clip results. * * Flip the specified drawable around a given line. @@ -210,8 +210,8 @@ gimp_drawable_transform_flip_default (gint32 drawable_ID, * @y3: The new y coordinate of lower-right corner of original bounding box. * @transform_direction: Direction of transformation. * @interpolation: Type of interpolation. - * @supersample: Whether to perform supersample. - * @recursion_level: Level of recursion (3 is a nice default). + * @supersample: This parameter is ignored, supersampling is performed based on the interpolation type. + * @recursion_level: Maximum recursion level used for supersampling (3 is a nice value). * @clip_result: How to clip results. * * Perform a possibly non-affine transformation on the specified @@ -411,8 +411,8 @@ gimp_drawable_transform_rotate_simple (gint32 drawable_ID, * @center_y: The vert. coordinate of the center of rotation. * @transform_direction: Direction of transformation. * @interpolation: Type of interpolation. - * @supersample: Whether to perform supersample. - * @recursion_level: Level of recursion (3 is a nice default). + * @supersample: This parameter is ignored, supersampling is performed based on the interpolation type. + * @recursion_level: Maximum recursion level used for supersampling (3 is a nice value). * @clip_result: How to clip results. * * Rotate the specified drawable about given coordinates through the @@ -530,8 +530,8 @@ gimp_drawable_transform_rotate_default (gint32 drawable_ID, * @y1: The new y coordinate of the lower-right corner of the scaled region. * @transform_direction: Direction of transformation. * @interpolation: Type of interpolation. - * @supersample: Whether to perform supersample. - * @recursion_level: Level of recursion (3 is a nice default). + * @supersample: This parameter is ignored, supersampling is performed based on the interpolation type. + * @recursion_level: Maximum recursion level used for supersampling (3 is a nice value). * @clip_result: How to clip results. * * Scale the specified drawable with extra parameters @@ -645,8 +645,8 @@ gimp_drawable_transform_scale_default (gint32 drawable_ID, * @magnitude: The magnitude of the shear. * @transform_direction: Direction of transformation. * @interpolation: Type of interpolation. - * @supersample: Whether to perform supersample. - * @recursion_level: Level of recursion (3 is a nice default). + * @supersample: This parameter is ignored, supersampling is performed based on the interpolation type. + * @recursion_level: Maximum recursion level used for supersampling (3 is a nice value). * @clip_result: How to clip results. * * Shear the specified drawable about its center by the specified @@ -760,8 +760,8 @@ gimp_drawable_transform_shear_default (gint32 drawable_ID, * @dest_y: Y coordinate of where the center goes. * @transform_direction: Direction of transformation. * @interpolation: Type of interpolation. - * @supersample: Whether to perform supersample. - * @recursion_level: Level of recursion (3 is a nice default). + * @supersample: This parameter is ignored, supersampling is performed based on the interpolation type. + * @recursion_level: Maximum recursion level used for supersampling (3 is a nice value). * @clip_result: How to clip results. * * Transform the specified drawable in 2d, with extra parameters. @@ -900,8 +900,8 @@ gimp_drawable_transform_2d_default (gint32 drawable_ID, * @coeff_2_2: coefficient (2,2) of the transformation matrix. * @transform_direction: Direction of transformation. * @interpolation: Type of interpolation. - * @supersample: Whether to perform supersample. - * @recursion_level: Level of recursion (3 is a nice default). + * @supersample: This parameter is ignored, supersampling is performed based on the interpolation type. + * @recursion_level: Maximum recursion level used for supersampling (3 is a nice value). * @clip_result: How to clip results. * * Transform the specified drawable in 2d, with extra parameters. diff --git a/tools/pdbgen/pdb/drawable_transform.pdb b/tools/pdbgen/pdb/drawable_transform.pdb index 2840f21598..eff21024cd 100644 --- a/tools/pdbgen/pdb/drawable_transform.pdb +++ b/tools/pdbgen/pdb/drawable_transform.pdb @@ -58,8 +58,7 @@ $assemble_matrix /* Transform the selection */ success = gimp_drawable_transform_affine (drawable, context, &matrix, transform_direction, - interpolation, supersample, - recursion_level, + interpolation, recursion_level, clip_result, progress); if (progress) @@ -109,8 +108,7 @@ $assemble_matrix /* Transform the selection */ success = gimp_drawable_transform_affine (drawable, context, &matrix, GIMP_TRANSFORM_FORWARD, - interpolation_type, - interpolate, 3, + interpolation_type, 3, clip_result, progress); if (progress) @@ -220,9 +218,9 @@ HELP { name => 'interpolation', type => 'enum GimpInterpolationType', desc => 'Type of interpolation' }, { name => 'supersample', type => 'boolean', - desc => 'Whether to perform supersample' }, + desc => 'This parameter is ignored, supersampling is performed based on the interpolation type' }, { name => 'recursion_level', type => '1 <= int32', - desc => 'Level of recursion (3 is a nice default)' }, + desc => 'Maximum recursion level used for supersampling (3 is a nice value)' }, { name => 'clip_result', type => 'boolean', desc => 'Whether to clip results' } ); @@ -340,9 +338,9 @@ HELP { name => 'interpolation', type => 'enum GimpInterpolationType', desc => 'Type of interpolation' }, { name => 'supersample', type => 'boolean', - desc => 'Whether to perform supersample' }, + desc => 'This parameter is ignored, supersampling is performed based on the interpolation type' }, { name => 'recursion_level', type => '1 <= int32', - desc => 'Level of recursion (3 is a nice default)' }, + desc => 'Maximum recursion level used for supersampling (3 is a nice value)' }, { name => 'clip_result', type => 'enum GimpTransformResize', desc => 'How to clip results' } ); @@ -514,9 +512,9 @@ HELP { name => 'interpolation', type => 'enum GimpInterpolationType', desc => 'Type of interpolation' }, { name => 'supersample', type => 'boolean', - desc => 'Whether to perform supersample' }, + desc => 'This parameter is ignored, supersampling is performed based on the interpolation type' }, { name => 'recursion_level', type => '1 <= int32', - desc => 'Level of recursion (3 is a nice default)' }, + desc => 'Maximum recursion level used for supersampling (3 is a nice value)' }, { name => 'clip_result', type => 'enum GimpTransformResize', desc => 'How to clip results' } ); @@ -620,9 +618,9 @@ HELP { name => 'interpolation', type => 'enum GimpInterpolationType', desc => 'Type of interpolation' }, { name => 'supersample', type => 'boolean', - desc => 'Whether to perform supersample' }, + desc => 'This parameter is ignored, supersampling is performed based on the interpolation type' }, { name => 'recursion_level', type => '1 <= int32', - desc => 'Level of recursion (3 is a nice default)' }, + desc => 'Maximum recursion level used for supersampling (3 is a nice value)' }, { name => 'clip_result', type => 'enum GimpTransformResize', desc => 'How to clip results' } ); @@ -720,9 +718,9 @@ HELP { name => 'interpolation', type => 'enum GimpInterpolationType', desc => 'Type of interpolation' }, { name => 'supersample', type => 'boolean', - desc => 'Whether to perform supersample' }, + desc => 'This parameter is ignored, supersampling is performed based on the interpolation type' }, { name => 'recursion_level', type => '1 <= int32', - desc => 'Level of recursion (3 is a nice default)' }, + desc => 'Maximum recursion level used for supersampling (3 is a nice value)' }, { name => 'clip_result', type => 'enum GimpTransformResize', desc => 'How to clip results' } ); @@ -825,9 +823,9 @@ HELP { name => 'interpolation', type => 'enum GimpInterpolationType', desc => 'Type of interpolation' }, { name => 'supersample', type => 'boolean', - desc => 'Whether to perform supersample' }, + desc => 'This parameter is ignored, supersampling is performed based on the interpolation type' }, { name => 'recursion_level', type => '1 <= int32', - desc => 'Level of recursion (3 is a nice default)' }, + desc => 'Maximum recursion level used for supersampling (3 is a nice value)' }, { name => 'clip_result', type => 'enum GimpTransformResize', desc => 'How to clip results' } ); @@ -942,9 +940,9 @@ HELP { name => 'interpolation', type => 'enum GimpInterpolationType', desc => 'Type of interpolation' }, { name => 'supersample', type => 'boolean', - desc => 'Whether to perform supersample' }, + desc => 'This parameter is ignored, supersampling is performed based on the interpolation type' }, { name => 'recursion_level', type => '1 <= int32', - desc => 'Level of recursion (3 is a nice default)' }, + desc => 'Maximum recursion level used for supersampling (3 is a nice value)' }, { name => 'clip_result', type => 'enum GimpTransformResize', desc => 'How to clip results' } ); diff --git a/tools/pdbgen/pdb/transform_tools.pdb b/tools/pdbgen/pdb/transform_tools.pdb index 8ddde80df3..0a902c9b08 100644 --- a/tools/pdbgen/pdb/transform_tools.pdb +++ b/tools/pdbgen/pdb/transform_tools.pdb @@ -126,7 +126,7 @@ sub perspective { success = gimp_drawable_transform_affine (drawable, context, &matrix, GIMP_TRANSFORM_FORWARD, - interpolation_type, TRUE, 3, + interpolation_type, 3, FALSE, progress); if (progress) @@ -189,7 +189,7 @@ sub rotate { success = gimp_drawable_transform_affine (drawable, context, &matrix, GIMP_TRANSFORM_FORWARD, - interpolation_type, FALSE, 3, + interpolation_type, 3, FALSE, progress); if (progress) @@ -263,7 +263,7 @@ sub scale { success = gimp_drawable_transform_affine (drawable, context, &matrix, GIMP_TRANSFORM_FORWARD, - interpolation_type, TRUE, 3, + interpolation_type, 3, FALSE, progress); if (progress) @@ -329,7 +329,7 @@ sub shear { success = gimp_drawable_transform_affine (drawable, context, &matrix, GIMP_TRANSFORM_FORWARD, - interpolation_type, FALSE, 3, + interpolation_type, 3, FALSE, progress); if (progress) @@ -398,7 +398,7 @@ sub transform_2d { /* Transform the selection */ success = gimp_drawable_transform_affine (drawable, context, &matrix, GIMP_TRANSFORM_FORWARD, - interpolation_type, TRUE, 3, + interpolation_type, 3, FALSE, progress); if (progress) -- 2.22.0