From 42756159b5d26672b2f600b94b5db562fda3fd61 Mon Sep 17 00:00:00 2001 From: Mukund Sivaraman Date: Sat, 8 Oct 2011 19:25:10 +0530 Subject: [PATCH] pdb: Mark more pdb args as dead, and regen code --- app/pdb/drawable-transform-cmds.c | 4 ---- app/pdb/floating-sel-cmds.c | 7 ------- app/pdb/image-cmds.c | 5 ----- app/pdb/paths-cmds.c | 2 -- app/pdb/text-layer-cmds.c | 2 -- app/pdb/text-tool-cmds.c | 18 ------------------ tools/pdbgen/pdb/drawable_transform.pdb | 4 ++-- tools/pdbgen/pdb/floating_sel.pdb | 4 ++-- tools/pdbgen/pdb/image.pdb | 2 +- tools/pdbgen/pdb/paths.pdb | 2 +- tools/pdbgen/pdb/text_layer.pdb | 2 +- tools/pdbgen/pdb/text_tool.pdb | 18 +++++++++--------- 12 files changed, 16 insertions(+), 54 deletions(-) diff --git a/app/pdb/drawable-transform-cmds.c b/app/pdb/drawable-transform-cmds.c index 9491bab28c..1de9258d5f 100644 --- a/app/pdb/drawable-transform-cmds.c +++ b/app/pdb/drawable-transform-cmds.c @@ -919,7 +919,6 @@ drawable_transform_shear_invoker (GimpProcedure *procedure, gdouble magnitude; gint32 transform_direction; gint32 interpolation; - gboolean supersample; gint32 recursion_level; gint32 clip_result; @@ -928,7 +927,6 @@ drawable_transform_shear_invoker (GimpProcedure *procedure, magnitude = g_value_get_double (&args->values[2]); transform_direction = g_value_get_enum (&args->values[3]); interpolation = g_value_get_enum (&args->values[4]); - supersample = g_value_get_boolean (&args->values[5]); recursion_level = g_value_get_int (&args->values[6]); clip_result = g_value_get_enum (&args->values[7]); @@ -1096,7 +1094,6 @@ drawable_transform_2d_invoker (GimpProcedure *procedure, gdouble dest_y; gint32 transform_direction; gint32 interpolation; - gboolean supersample; gint32 recursion_level; gint32 clip_result; @@ -1110,7 +1107,6 @@ drawable_transform_2d_invoker (GimpProcedure *procedure, dest_y = g_value_get_double (&args->values[7]); transform_direction = g_value_get_enum (&args->values[8]); interpolation = g_value_get_enum (&args->values[9]); - supersample = g_value_get_boolean (&args->values[10]); recursion_level = g_value_get_int (&args->values[11]); clip_result = g_value_get_enum (&args->values[12]); diff --git a/app/pdb/floating-sel-cmds.c b/app/pdb/floating-sel-cmds.c index 9887742db6..4ddebaa1f3 100644 --- a/app/pdb/floating-sel-cmds.c +++ b/app/pdb/floating-sel-cmds.c @@ -188,16 +188,9 @@ floating_sel_relax_invoker (GimpProcedure *procedure, GError **error) { gboolean success = TRUE; - GimpLayer *floating_sel; - gboolean undo; - - floating_sel = gimp_value_get_layer (&args->values[0], gimp); - undo = g_value_get_boolean (&args->values[1]); - if (success) { } - return gimp_procedure_get_return_values (procedure, success, error ? *error : NULL); } diff --git a/app/pdb/image-cmds.c b/app/pdb/image-cmds.c index 78ba3b2a82..60ca5aaf80 100644 --- a/app/pdb/image-cmds.c +++ b/app/pdb/image-cmds.c @@ -320,14 +320,9 @@ image_free_shadow_invoker (GimpProcedure *procedure, GError **error) { gboolean success = TRUE; - GimpImage *image; - - image = gimp_value_get_image (&args->values[0], gimp); - if (success) { } - return gimp_procedure_get_return_values (procedure, success, error ? *error : NULL); } diff --git a/app/pdb/paths-cmds.c b/app/pdb/paths-cmds.c index 3a5d84f08f..56292abb4d 100644 --- a/app/pdb/paths-cmds.c +++ b/app/pdb/paths-cmds.c @@ -257,13 +257,11 @@ path_set_points_invoker (GimpProcedure *procedure, gboolean success = TRUE; GimpImage *image; const gchar *name; - gint32 ptype; gint32 num_path_points; const gdouble *points_pairs; image = gimp_value_get_image (&args->values[0], gimp); name = g_value_get_string (&args->values[1]); - ptype = g_value_get_int (&args->values[2]); num_path_points = g_value_get_int (&args->values[3]); points_pairs = gimp_value_get_floatarray (&args->values[4]); diff --git a/app/pdb/text-layer-cmds.c b/app/pdb/text-layer-cmds.c index bfea61040f..38e595d753 100644 --- a/app/pdb/text-layer-cmds.c +++ b/app/pdb/text-layer-cmds.c @@ -1184,11 +1184,9 @@ text_layer_set_hinting_invoker (GimpProcedure *procedure, gboolean success = TRUE; GimpLayer *layer; gboolean hinting; - gboolean autohint; layer = gimp_value_get_layer (&args->values[0], gimp); hinting = g_value_get_boolean (&args->values[1]); - autohint = g_value_get_boolean (&args->values[2]); if (success) { diff --git a/app/pdb/text-tool-cmds.c b/app/pdb/text-tool-cmds.c index 81d85b352d..8b2333fef9 100644 --- a/app/pdb/text-tool-cmds.c +++ b/app/pdb/text-tool-cmds.c @@ -55,7 +55,6 @@ text_fontname_invoker (GimpProcedure *procedure, gint32 border; gboolean antialias; gdouble size; - gint32 size_type; const gchar *fontname; GimpLayer *text_layer = NULL; @@ -67,7 +66,6 @@ text_fontname_invoker (GimpProcedure *procedure, border = g_value_get_int (&args->values[5]); antialias = g_value_get_boolean (&args->values[6]); size = g_value_get_double (&args->values[7]); - size_type = g_value_get_enum (&args->values[8]); fontname = g_value_get_string (&args->values[9]); if (success) @@ -164,8 +162,6 @@ text_invoker (GimpProcedure *procedure, gboolean antialias; gdouble size; const gchar *family; - const gchar *registry; - const gchar *encoding; GimpLayer *text_layer = NULL; image = gimp_value_get_image (&args->values[0], gimp); @@ -177,8 +173,6 @@ text_invoker (GimpProcedure *procedure, antialias = g_value_get_boolean (&args->values[6]); size = g_value_get_double (&args->values[7]); family = g_value_get_string (&args->values[10]); - registry = g_value_get_string (&args->values[15]); - encoding = g_value_get_string (&args->values[16]); if (success) { @@ -220,13 +214,7 @@ text_get_extents_invoker (GimpProcedure *procedure, GValueArray *return_vals; const gchar *text; gdouble size; - gint32 size_type; - const gchar *foundry; const gchar *family; - const gchar *slant; - const gchar *set_width; - const gchar *registry; - const gchar *encoding; gint32 width = 0; gint32 height = 0; gint32 ascent = 0; @@ -234,13 +222,7 @@ text_get_extents_invoker (GimpProcedure *procedure, text = g_value_get_string (&args->values[0]); size = g_value_get_double (&args->values[1]); - size_type = g_value_get_enum (&args->values[2]); - foundry = g_value_get_string (&args->values[3]); family = g_value_get_string (&args->values[4]); - slant = g_value_get_string (&args->values[6]); - set_width = g_value_get_string (&args->values[7]); - registry = g_value_get_string (&args->values[9]); - encoding = g_value_get_string (&args->values[10]); if (success) { diff --git a/tools/pdbgen/pdb/drawable_transform.pdb b/tools/pdbgen/pdb/drawable_transform.pdb index 9ef95c1d39..e642ff13c0 100644 --- a/tools/pdbgen/pdb/drawable_transform.pdb +++ b/tools/pdbgen/pdb/drawable_transform.pdb @@ -632,7 +632,7 @@ sub drawable_transform_shear { desc => 'Direction of transformation' }, { name => 'interpolation', type => 'enum GimpInterpolationType', desc => 'Type of interpolation' }, - { name => 'supersample', type => 'boolean', + { name => 'supersample', type => 'boolean', dead => 1, desc => 'This parameter is ignored, supersampling is performed based on the interpolation type' }, { name => 'recursion_level', type => '1 <= int32', desc => 'Maximum recursion level used for supersampling (3 is a nice value)' }, @@ -711,7 +711,7 @@ sub drawable_transform_2d { desc => 'Direction of transformation' }, { name => 'interpolation', type => 'enum GimpInterpolationType', desc => 'Type of interpolation' }, - { name => 'supersample', type => 'boolean', + { name => 'supersample', type => 'boolean', dead => 1, desc => 'This parameter is ignored, supersampling is performed based on the interpolation type' }, { name => 'recursion_level', type => '1 <= int32', desc => 'Maximum recursion level used for supersampling (3 is a nice value)' }, diff --git a/tools/pdbgen/pdb/floating_sel.pdb b/tools/pdbgen/pdb/floating_sel.pdb index e9dd4a85f6..efa0c927f5 100644 --- a/tools/pdbgen/pdb/floating_sel.pdb +++ b/tools/pdbgen/pdb/floating_sel.pdb @@ -181,9 +181,9 @@ sub floating_sel_relax { &std_pdb_deprecated (); @inargs = ( - { name => 'floating_sel', type => 'layer', + { name => 'floating_sel', type => 'layer', dead => 1, desc => 'The floating selection' }, - { name => 'undo', type => 'boolean' } + { name => 'undo', type => 'boolean', dead => 1 } ); %invoke = ( diff --git a/tools/pdbgen/pdb/image.pdb b/tools/pdbgen/pdb/image.pdb index df8426b437..cc57c3675f 100644 --- a/tools/pdbgen/pdb/image.pdb +++ b/tools/pdbgen/pdb/image.pdb @@ -432,7 +432,7 @@ sub image_free_shadow { &std_pdb_deprecated ('gimp-drawable-free-shadow'); @inargs = ( - { name => 'image', type => 'image', + { name => 'image', type => 'image', dead => 1, desc => 'The image' } ); diff --git a/tools/pdbgen/pdb/paths.pdb b/tools/pdbgen/pdb/paths.pdb index 93f00de2ae..f8e08d65c8 100644 --- a/tools/pdbgen/pdb/paths.pdb +++ b/tools/pdbgen/pdb/paths.pdb @@ -177,7 +177,7 @@ sub path_set_points { name will be created - query the list of paths if you want to make sure that the name of the path you create is unique. This will be set as the current path.' }, - { name => 'ptype', type => 'int32', + { name => 'ptype', type => 'int32', dead => 1, desc => 'The type of the path. Currently only one type (1 = Bezier) is supported.' }, { name => 'points_pairs', type => 'floatarray', diff --git a/tools/pdbgen/pdb/text_layer.pdb b/tools/pdbgen/pdb/text_layer.pdb index 8140b321e3..d5e0989bc4 100644 --- a/tools/pdbgen/pdb/text_layer.pdb +++ b/tools/pdbgen/pdb/text_layer.pdb @@ -397,7 +397,7 @@ HELP desc => 'The text layer' }, { name => 'hinting', type => 'boolean', desc => 'Enable/disable the use of hinting on the text' }, - { name => 'autohint', type => 'boolean', + { name => 'autohint', type => 'boolean', dead => 1, desc => 'Force the use of the autohinter provided through FreeType' } ); diff --git a/tools/pdbgen/pdb/text_tool.pdb b/tools/pdbgen/pdb/text_tool.pdb index 94eea42af0..c7f47ff5c3 100644 --- a/tools/pdbgen/pdb/text_tool.pdb +++ b/tools/pdbgen/pdb/text_tool.pdb @@ -58,7 +58,7 @@ HELP desc => 'Antialiasing' }, { name => 'size', type => '0 < float', desc => 'The size of text in either pixels or points' }, - { name => 'size_type', type => 'enum GimpSizeType', + { name => 'size_type', type => 'enum GimpSizeType', dead => 1, desc => 'The units of specified size' }, { name => 'fontname', type => 'string', desc => 'The name of the font' } @@ -180,9 +180,9 @@ sub text { desc => 'The font set-width' }, { name => 'spacing', type => 'string', allow_non_utf8 => 1, dead => 1, desc => 'The font spacing' }, - { name => 'registry', type => 'string', allow_non_utf8 => 1, + { name => 'registry', type => 'string', allow_non_utf8 => 1, dead => 1, desc => 'The font registry' }, - { name => 'encoding', type => 'string', allow_non_utf8 => 1, + { name => 'encoding', type => 'string', allow_non_utf8 => 1, dead => 1, desc => 'The font encoding' } ); @@ -222,23 +222,23 @@ sub text_get_extents { desc => 'The text to generate (in UTF-8 encoding)' }, { name => 'size', type => '0 < float', desc => 'The size of text in either pixels or points' }, - { name => 'size_type', type => 'enum GimpSizeType', + { name => 'size_type', type => 'enum GimpSizeType', dead => 1, desc => 'The units of specified size' }, - { name => 'foundry', type => 'string', allow_non_utf8 => 1, + { name => 'foundry', type => 'string', allow_non_utf8 => 1, dead => 1, desc => 'The font foundry' }, { name => 'family', type => 'string', allow_non_utf8 => 1, desc => 'The font family' }, { name => 'weight', type => 'string', allow_non_utf8 => 1, dead => 1, desc => 'The font weight' }, - { name => 'slant', type => 'string', allow_non_utf8 => 1, + { name => 'slant', type => 'string', allow_non_utf8 => 1, dead => 1, desc => 'The font slant' }, - { name => 'set_width', type => 'string', allow_non_utf8 => 1, + { name => 'set_width', type => 'string', allow_non_utf8 => 1, dead => 1, desc => 'The font set-width' }, { name => 'spacing', type => 'string', allow_non_utf8 => 1, dead => 1, desc => 'The font spacing' }, - { name => 'registry', type => 'string', allow_non_utf8 => 1, + { name => 'registry', type => 'string', allow_non_utf8 => 1, dead => 1, desc => 'The font registry' }, - { name => 'encoding', type => 'string', allow_non_utf8 => 1, + { name => 'encoding', type => 'string', allow_non_utf8 => 1, dead => 1, desc => 'The font encoding' } );