Commit 3b68ae0f authored by Michael Natterer's avatar Michael Natterer 😴
Browse files

app, pdb, libgimp: Remove all traces of the supersampling recursion level

from all transform APIs. This is no longer used since we use GEGL to
transform, the value was only passed around and never used.
parent 38e9c79d
......@@ -113,7 +113,6 @@ static void gimp_channel_transform (GimpItem *item,
const GimpMatrix3 *matrix,
GimpTransformDirection direction,
GimpInterpolationType interpolation_type,
gint recursion_level,
GimpTransformResize clip_result,
GimpProgress *progress);
static gboolean gimp_channel_stroke (GimpItem *item,
......@@ -750,7 +749,6 @@ gimp_channel_transform (GimpItem *item,
const GimpMatrix3 *matrix,
GimpTransformDirection direction,
GimpInterpolationType interpolation_type,
gint recursion_level,
GimpTransformResize clip_result,
GimpProgress *progress)
{
......@@ -759,7 +757,6 @@ gimp_channel_transform (GimpItem *item,
GIMP_ITEM_CLASS (parent_class)->transform (item, context, matrix, direction,
interpolation_type,
recursion_level,
clip_result,
progress);
}
......
......@@ -72,7 +72,6 @@ gimp_drawable_transform_buffer_affine (GimpDrawable *drawable,
const GimpMatrix3 *matrix,
GimpTransformDirection direction,
GimpInterpolationType interpolation_type,
gint recursion_level,
GimpTransformResize clip_result,
gint *new_offset_x,
gint *new_offset_y,
......@@ -613,7 +612,6 @@ gimp_drawable_transform_affine (GimpDrawable *drawable,
const GimpMatrix3 *matrix,
GimpTransformDirection direction,
GimpInterpolationType interpolation_type,
gint recursion_level,
GimpTransformResize clip_result,
GimpProgress *progress)
{
......@@ -664,7 +662,6 @@ gimp_drawable_transform_affine (GimpDrawable *drawable,
matrix,
direction,
interpolation_type,
recursion_level,
clip_result,
progress);
}
......@@ -677,7 +674,6 @@ gimp_drawable_transform_affine (GimpDrawable *drawable,
matrix,
direction,
interpolation_type,
recursion_level,
clip_result,
&new_offset_x,
&new_offset_y,
......
......@@ -27,7 +27,6 @@ GeglBuffer * gimp_drawable_transform_buffer_affine (GimpDrawable *dra
const GimpMatrix3 *matrix,
GimpTransformDirection direction,
GimpInterpolationType interpolation_type,
gint recursion_level,
GimpTransformResize clip_result,
gint *new_offset_x,
gint *new_offset_y,
......@@ -60,7 +59,6 @@ GimpDrawable * gimp_drawable_transform_affine (GimpDrawable *dra
const GimpMatrix3 *matrix,
GimpTransformDirection direction,
GimpInterpolationType interpolation_type,
gint recursion_level,
GimpTransformResize clip_result,
GimpProgress *progress);
......
......@@ -126,7 +126,6 @@ static void gimp_drawable_transform (GimpItem *item,
const GimpMatrix3 *matrix,
GimpTransformDirection direction,
GimpInterpolationType interpolation_type,
gint recursion_level,
GimpTransformResize clip_result,
GimpProgress *progress);
......@@ -672,7 +671,6 @@ gimp_drawable_transform (GimpItem *item,
const GimpMatrix3 *matrix,
GimpTransformDirection direction,
GimpInterpolationType interpolation_type,
gint recursion_level,
GimpTransformResize clip_result,
GimpProgress *progress)
{
......@@ -688,7 +686,6 @@ gimp_drawable_transform (GimpItem *item,
off_x, off_y,
matrix, direction,
interpolation_type,
recursion_level,
clip_result,
&new_off_x, &new_off_y,
progress);
......
......@@ -125,7 +125,6 @@ static void gimp_group_layer_transform (GimpItem *item,
const GimpMatrix3 *matrix,
GimpTransformDirection direction,
GimpInterpolationType interpolation_type,
gint recursion_level,
GimpTransformResize clip_result,
GimpProgress *progress);
......@@ -769,7 +768,6 @@ gimp_group_layer_transform (GimpItem *item,
const GimpMatrix3 *matrix,
GimpTransformDirection direction,
GimpInterpolationType interpolation_type,
gint recursion_level,
GimpTransformResize clip_result,
GimpProgress *progress)
{
......@@ -788,7 +786,7 @@ gimp_group_layer_transform (GimpItem *item,
gimp_item_transform (child, context,
matrix, direction,
interpolation_type, recursion_level,
interpolation_type,
clip_result, progress);
}
......@@ -797,7 +795,7 @@ gimp_group_layer_transform (GimpItem *item,
if (mask)
gimp_item_transform (GIMP_ITEM (mask), context,
matrix, direction,
interpolation_type, recursion_level,
interpolation_type,
clip_result, progress);
gimp_group_layer_resume_resize (group, TRUE);
......
......@@ -119,7 +119,6 @@ gimp_image_item_list_transform (GimpImage *image,
const GimpMatrix3 *matrix,
GimpTransformDirection direction,
GimpInterpolationType interpolation_type,
gint recursion_level,
GimpTransformResize clip_result,
GimpProgress *progress)
{
......@@ -137,7 +136,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, recursion_level,
interpolation_type,
clip_result, progress);
gimp_image_undo_group_end (image);
......
......@@ -43,7 +43,6 @@ void gimp_image_item_list_transform (GimpImage *image,
const GimpMatrix3 *matrix,
GimpTransformDirection direction,
GimpInterpolationType interpolation_type,
gint recursion_level,
GimpTransformResize clip_result,
GimpProgress *progress);
......
......@@ -165,7 +165,6 @@ gimp_item_linked_transform (GimpItem *item,
const GimpMatrix3 *matrix,
GimpTransformDirection direction,
GimpInterpolationType interpolation_type,
gint recursion_level,
GimpTransformResize clip_result,
GimpProgress *progress)
{
......@@ -185,7 +184,7 @@ gimp_item_linked_transform (GimpItem *item,
gimp_image_item_list_transform (gimp_item_get_image (item), list, context,
matrix, direction,
interpolation_type, recursion_level,
interpolation_type,
clip_result, progress);
g_list_free (list);
......
......@@ -41,7 +41,6 @@ void gimp_item_linked_transform (GimpItem *item,
const GimpMatrix3 *matrix,
GimpTransformDirection direction,
GimpInterpolationType interpolation_type,
gint recursion_level,
GimpTransformResize clip_result,
GimpProgress *progress);
......
......@@ -1461,7 +1461,6 @@ gimp_item_transform (GimpItem *item,
const GimpMatrix3 *matrix,
GimpTransformDirection direction,
GimpInterpolationType interpolation,
gint recursion_level,
GimpTransformResize clip_result,
GimpProgress *progress)
{
......@@ -1483,7 +1482,7 @@ gimp_item_transform (GimpItem *item,
g_object_freeze_notify (G_OBJECT (item));
item_class->transform (item, context, matrix, direction, interpolation,
recursion_level, clip_result, progress);
clip_result, progress);
g_object_thaw_notify (G_OBJECT (item));
......
......@@ -95,7 +95,6 @@ struct _GimpItemClass
const GimpMatrix3 *matrix,
GimpTransformDirection direction,
GimpInterpolationType interpolation_type,
gint recursion_level,
GimpTransformResize clip_result,
GimpProgress *progress);
gboolean (* stroke) (GimpItem *item,
......@@ -232,7 +231,6 @@ void gimp_item_transform (GimpItem *item,
const GimpMatrix3 *matrix,
GimpTransformDirection direction,
GimpInterpolationType interpolation_type,
gint recursion_level,
GimpTransformResize clip_result,
GimpProgress *progress);
......
......@@ -143,7 +143,6 @@ static void gimp_layer_transform (GimpItem *item,
const GimpMatrix3 *matrix,
GimpTransformDirection direction,
GimpInterpolationType interpolation_type,
gint recursion_level,
GimpTransformResize clip_result,
GimpProgress *progress);
static void gimp_layer_to_selection (GimpItem *item,
......@@ -936,7 +935,6 @@ gimp_layer_transform (GimpItem *item,
const GimpMatrix3 *matrix,
GimpTransformDirection direction,
GimpInterpolationType interpolation_type,
gint recursion_level,
GimpTransformResize clip_result,
GimpProgress *progress)
{
......@@ -949,14 +947,13 @@ gimp_layer_transform (GimpItem *item,
GIMP_ITEM_CLASS (parent_class)->transform (item, context, matrix, direction,
interpolation_type,
recursion_level,
clip_result,
progress);
if (layer->mask)
gimp_item_transform (GIMP_ITEM (layer->mask), context,
matrix, direction,
interpolation_type, recursion_level,
interpolation_type,
clip_result, progress);
}
......
......@@ -1452,9 +1452,7 @@ context_get_transform_recursion_invoker (GimpProcedure *procedure,
GimpValueArray *return_vals;
gint32 transform_recursion = 0;
g_object_get (context,
"transform-recursion", &transform_recursion,
NULL);
transform_recursion = 3;
return_vals = gimp_procedure_get_return_values (procedure, TRUE, NULL);
g_value_set_int (gimp_value_array_index (return_vals, 1), transform_recursion);
......@@ -1471,17 +1469,9 @@ context_set_transform_recursion_invoker (GimpProcedure *procedure,
GError **error)
{
gboolean success = TRUE;
gint32 transform_recursion;
transform_recursion = g_value_get_int (gimp_value_array_index (args, 0));
if (success)
{
g_object_set (context,
"transform-recursion", transform_recursion,
NULL);
}
return gimp_procedure_get_return_values (procedure, success,
error ? *error : NULL);
}
......@@ -3326,16 +3316,16 @@ register_context_procs (GimpPDB *pdb)
"gimp-context-get-transform-recursion");
gimp_procedure_set_static_strings (procedure,
"gimp-context-get-transform-recursion",
"Get the transform supersampling recursion.",
"This procedure returns the transform supersampling recursion level.",
"Michael Natterer <mitch@gimp.org>",
"Michael Natterer",
"2010",
NULL);
"Deprecated: There is no replacement for this procedure.",
"Deprecated: There is no replacement for this procedure.",
"",
"",
"",
"NONE");
gimp_procedure_add_return_value (procedure,
gimp_param_spec_int32 ("transform-recursion",
"transform recursion",
"The transform recursion level",
"This returns always 3 and is meaningless",
1, G_MAXINT32, 1,
GIMP_PARAM_READWRITE));
gimp_pdb_register_procedure (pdb, procedure);
......@@ -3349,16 +3339,16 @@ register_context_procs (GimpPDB *pdb)
"gimp-context-set-transform-recursion");
gimp_procedure_set_static_strings (procedure,
"gimp-context-set-transform-recursion",
"Set the transform supersampling recursion.",
"This procedure modifies the transform supersampling recursion level setting. Whether or not a transformation does supersampling is determined by the interplolation type. The recursion level defaults to 3, which is a nice default value. This setting affects affects the following procedures: 'gimp-item-transform-flip', 'gimp-item-transform-perspective', 'gimp-item-transform-rotate', 'gimp-item-transform-scale', 'gimp-item-transform-shear', 'gimp-item-transform-2d', 'gimp-item-transform-matrix'.",
"Michael Natterer <mitch@gimp.org>",
"Michael Natterer",
"2010",
NULL);
"Deprecated: There is no replacement for this procedure.",
"Deprecated: There is no replacement for this procedure.",
"",
"",
"",
"NONE");
gimp_procedure_add_argument (procedure,
gimp_param_spec_int32 ("transform-recursion",
"transform recursion",
"The transform recursion level",
"This parameter is ignored",
1, G_MAXINT32, 1,
GIMP_PARAM_READWRITE));
gimp_pdb_register_procedure (pdb, procedure);
......
This diff is collapsed.
......@@ -52,8 +52,7 @@ enum
PROP_SAMPLE_TRANSPARENT,
PROP_INTERPOLATION,
PROP_TRANSFORM_DIRECTION,
PROP_TRANSFORM_RESIZE,
PROP_TRANSFORM_RECURSION
PROP_TRANSFORM_RESIZE
};
......@@ -143,11 +142,6 @@ gimp_pdb_context_class_init (GimpPDBContextClass *klass)
GIMP_TYPE_TRANSFORM_RESIZE,
GIMP_TRANSFORM_RESIZE_ADJUST,
GIMP_PARAM_STATIC_STRINGS);
GIMP_CONFIG_INSTALL_PROP_INT (object_class, PROP_TRANSFORM_RECURSION,
"transform-recursion", NULL,
1, G_MAXINT32, 3,
GIMP_PARAM_STATIC_STRINGS);
}
static void
......@@ -259,10 +253,6 @@ gimp_pdb_context_set_property (GObject *object,
options->transform_resize = g_value_get_enum (value);
break;
case PROP_TRANSFORM_RECURSION:
options->transform_recursion = g_value_get_int (value);
break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
break;
......@@ -323,10 +313,6 @@ gimp_pdb_context_get_property (GObject *object,
g_value_set_enum (value, options->transform_resize);
break;
case PROP_TRANSFORM_RECURSION:
g_value_set_int (value, options->transform_recursion);
break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
break;
......
......@@ -51,7 +51,6 @@ struct _GimpPDBContext
GimpInterpolationType interpolation;
GimpTransformDirection transform_direction;
GimpTransformResize transform_resize;
gint transform_recursion;
GimpContainer *paint_options_list;
};
......
This diff is collapsed.
......@@ -176,7 +176,7 @@ perspective_invoker (GimpProcedure *procedure,
if (! gimp_drawable_transform_affine (drawable, context,
&matrix,
GIMP_TRANSFORM_FORWARD,
interpolation_type, 3,
interpolation_type,
FALSE, progress))
{
success = FALSE;
......@@ -186,7 +186,7 @@ perspective_invoker (GimpProcedure *procedure,
{
gimp_item_transform (GIMP_ITEM (drawable), context, &matrix,
GIMP_TRANSFORM_FORWARD,
interpolation, 3,
interpolation,
FALSE, progress);
}
......@@ -260,7 +260,7 @@ rotate_invoker (GimpProcedure *procedure,
if (! gimp_drawable_transform_affine (drawable, context,
&matrix,
GIMP_TRANSFORM_FORWARD,
interpolation_type, 3,
interpolation_type,
FALSE, progress))
{
success = FALSE;
......@@ -270,7 +270,7 @@ rotate_invoker (GimpProcedure *procedure,
{
gimp_item_transform (GIMP_ITEM (drawable), context, &matrix,
GIMP_TRANSFORM_FORWARD,
interpolation, 3,
interpolation,
FALSE, progress);
}
......@@ -351,7 +351,7 @@ scale_invoker (GimpProcedure *procedure,
if (! gimp_drawable_transform_affine (drawable, context,
&matrix,
GIMP_TRANSFORM_FORWARD,
interpolation_type, 3,
interpolation_type,
FALSE, progress))
{
success = FALSE;
......@@ -361,7 +361,7 @@ scale_invoker (GimpProcedure *procedure,
{
gimp_item_transform (GIMP_ITEM (drawable), context, &matrix,
GIMP_TRANSFORM_FORWARD,
interpolation, 3,
interpolation,
FALSE, progress);
}
......@@ -437,7 +437,7 @@ shear_invoker (GimpProcedure *procedure,
if (! gimp_drawable_transform_affine (drawable, context,
&matrix,
GIMP_TRANSFORM_FORWARD,
interpolation_type, 3,
interpolation_type,
FALSE, progress))
{
success = FALSE;
......@@ -447,7 +447,7 @@ shear_invoker (GimpProcedure *procedure,
{
gimp_item_transform (GIMP_ITEM (drawable), context, &matrix,
GIMP_TRANSFORM_FORWARD,
interpolation, 3,
interpolation,
FALSE, progress);
}
......@@ -527,7 +527,7 @@ transform_2d_invoker (GimpProcedure *procedure,
{
if (! gimp_drawable_transform_affine (drawable, context,
&matrix, GIMP_TRANSFORM_FORWARD,
interpolation_type, 3,
interpolation_type,
FALSE, progress))
{
success = FALSE;
......@@ -537,7 +537,7 @@ transform_2d_invoker (GimpProcedure *procedure,
{
gimp_item_transform (GIMP_ITEM (drawable), context, &matrix,
GIMP_TRANSFORM_FORWARD,
interpolation, 3,
interpolation,
FALSE, progress);
}
......
......@@ -143,7 +143,6 @@ gimp_text_layer_transform (GimpItem *item,
GimpTransformDirection direction,
GimpInterpolationType interpolation_type,
gboolean supersample,
gint recursion_level,
GimpTransformResize clip_result,
GimpProgress *progress)
{
......
......@@ -46,7 +46,6 @@ void gimp_text_layer_transform (GimpItem *item,
GimpTransformDirection direction,
GimpInterpolationType interpolation_type,
gboolean supersample,
gint recursion_level,
GimpTransformResize clip_result,
GimpProgress *progress);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment