From 1b780cd8e05eb0ecd268becfde7f17eb72b22610 Mon Sep 17 00:00:00 2001 From: Jehan Date: Tue, 14 Feb 2023 17:12:31 +0100 Subject: [PATCH] app, libgimp, pdb: minor fixes. - fix a typo s/Commponent/Component/. - Add &std_pdb_compat() to the new PDB procedures (I realize that's probably what the contributor was asking about, back in !446). Not sure if it's right as there were none in this file, but these are clearly just wrappers around GEGL ops, so it seems fitting. - Some alignment fixes. - More accurate "$since" variables. (cherry picked from commit 66ef1ef1efacc1a9e5b5a5efefd16ba247e7fe64) --- app/pdb/drawable-color-cmds.c | 14 +++++++------- libgimp/gimpdrawablecolor_pdb.c | 6 ++++-- pdb/groups/drawable_color.pdb | 12 +++++++----- 3 files changed, 18 insertions(+), 14 deletions(-) diff --git a/app/pdb/drawable-color-cmds.c b/app/pdb/drawable-color-cmds.c index 7eb1e5265c..cf29413440 100644 --- a/app/pdb/drawable-color-cmds.c +++ b/app/pdb/drawable-color-cmds.c @@ -323,8 +323,8 @@ drawable_extract_component_invoker (GimpProcedure *procedure, gegl_node_new_child (NULL, "operation", "gegl:component-extract", "component", component, - "invert", invert, - "linear", linear, + "invert", invert, + "linear", linear, NULL); gimp_drawable_apply_operation (drawable, progress, @@ -1060,8 +1060,8 @@ register_drawable_color_procs (GimpPDB *pdb) "Extract a color model component.", NULL); gimp_procedure_set_static_attribution (procedure, - "", - "", + "Compatibility procedure. Please see 'gegl:component-extract' for credits.", + "Compatibility procedure. Please see 'gegl:component-extract' for credits.", "2021"); gimp_procedure_add_argument (procedure, gimp_param_spec_drawable ("drawable", @@ -1072,7 +1072,7 @@ register_drawable_color_procs (GimpPDB *pdb) gimp_procedure_add_argument (procedure, g_param_spec_int ("component", "component", - "Commponent (RGB Red (0), RGB Green (1), RGB Blue (2), Hue (3), HSV Saturation (4), HSV Value (5), HSL Saturation (6), HSL Lightness (7), CMYK Cyan (8), CMYK Magenta (9), CMYK Yellow (10), CMYK Key (11), Y'CbCr Y' (12), Y'CbCr Cb (13), Y'CbCr Cr (14), LAB L (15), LAB A (16), LAB B (17), LCH C(ab) (18), LCH H(ab) (19), Alpha (20))", + "Component (RGB Red (0), RGB Green (1), RGB Blue (2), Hue (3), HSV Saturation (4), HSV Value (5), HSL Saturation (6), HSL Lightness (7), CMYK Cyan (8), CMYK Magenta (9), CMYK Yellow (10), CMYK Key (11), Y'CbCr Y' (12), Y'CbCr Cb (13), Y'CbCr Cr (14), LAB L (15), LAB A (16), LAB B (17), LCH C(ab) (18), LCH H(ab) (19), Alpha (20))", 0, 20, 0, GIMP_PARAM_READWRITE)); gimp_procedure_add_argument (procedure, @@ -1416,8 +1416,8 @@ register_drawable_color_procs (GimpPDB *pdb) "This filter allows adjusting shadows and highlights in the image separately. The implementation closely follow its counterpart in the Darktable photography software.", NULL); gimp_procedure_set_static_attribution (procedure, - "", - "", + "Compatibility procedure. Please see 'gegl:shadows-highlights' for credits.", + "Compatibility procedure. Please see 'gegl:shadows-highlights' for credits.", "2021"); gimp_procedure_add_argument (procedure, gimp_param_spec_drawable ("drawable", diff --git a/libgimp/gimpdrawablecolor_pdb.c b/libgimp/gimpdrawablecolor_pdb.c index 71a26d460a..29c49fb737 100644 --- a/libgimp/gimpdrawablecolor_pdb.c +++ b/libgimp/gimpdrawablecolor_pdb.c @@ -288,7 +288,7 @@ gimp_drawable_curves_spline (GimpDrawable *drawable, /** * gimp_drawable_extract_component: * @drawable: The drawable. - * @component: Commponent (RGB Red (0), RGB Green (1), RGB Blue (2), Hue (3), HSV Saturation (4), HSV Value (5), HSL Saturation (6), HSL Lightness (7), CMYK Cyan (8), CMYK Magenta (9), CMYK Yellow (10), CMYK Key (11), Y'CbCr Y' (12), Y'CbCr Cb (13), Y'CbCr Cr (14), LAB L (15), LAB A (16), LAB B (17), LCH C(ab) (18), LCH H(ab) (19), Alpha (20)). + * @component: Component (RGB Red (0), RGB Green (1), RGB Blue (2), Hue (3), HSV Saturation (4), HSV Value (5), HSL Saturation (6), HSL Lightness (7), CMYK Cyan (8), CMYK Magenta (9), CMYK Yellow (10), CMYK Key (11), Y'CbCr Y' (12), Y'CbCr Cb (13), Y'CbCr Cr (14), LAB L (15), LAB A (16), LAB B (17), LCH C(ab) (18), LCH H(ab) (19), Alpha (20)). * @invert: Invert the extracted component. * @linear: Use linear output instead of gamma corrected. * @@ -297,6 +297,8 @@ gimp_drawable_curves_spline (GimpDrawable *drawable, * Extract a color model component. * * Returns: TRUE on success. + * + * Since: 2.10.34 **/ gboolean gimp_drawable_extract_component (GimpDrawable *drawable, @@ -721,7 +723,7 @@ gimp_drawable_levels_stretch (GimpDrawable *drawable) * * Returns: TRUE on success. * - * Since: 2.10 + * Since: 2.10.34 **/ gboolean gimp_drawable_shadows_highlights (GimpDrawable *drawable, diff --git a/pdb/groups/drawable_color.pdb b/pdb/groups/drawable_color.pdb index 312bbdccdb..9b73e792f9 100644 --- a/pdb/groups/drawable_color.pdb +++ b/pdb/groups/drawable_color.pdb @@ -294,16 +294,17 @@ CODE sub drawable_extract_component { $blurb = 'Extract a color model component.'; - $help = 'Extract a color model component.'; + &std_pdb_compat('gegl:component-extract'); $date = '2021'; + $since = '2.10.34'; @inargs = ( { name => 'drawable', type => 'drawable', desc => 'The drawable' }, { name => 'component', type => '0 <= int32 <= 20', - desc => 'Commponent (RGB Red (0), RGB Green (1), RGB Blue (2), Hue (3), HSV Saturation (4), HSV Value (5),' . + desc => 'Component (RGB Red (0), RGB Green (1), RGB Blue (2), Hue (3), HSV Saturation (4), HSV Value (5),' . ' HSL Saturation (6), HSL Lightness (7), CMYK Cyan (8), CMYK Magenta (9), CMYK Yellow (10), CMYK Key (11),' . ' Y\'CbCr Y\' (12), Y\'CbCr Cb (13), Y\'CbCr Cr (14), LAB L (15), LAB A (16), LAB B (17), LCH C(ab) (18),' . ' LCH H(ab) (19), Alpha (20))' }, @@ -325,8 +326,8 @@ sub drawable_extract_component { gegl_node_new_child (NULL, "operation", "gegl:component-extract", "component", component, - "invert", invert, - "linear", linear, + "invert", invert, + "linear", linear, NULL); gimp_drawable_apply_operation (drawable, progress, @@ -763,8 +764,9 @@ separately. The implementation closely follow its counterpart in the Darktable photography software. HELP + &std_pdb_compat('gegl:shadows-highlights'); $date = '2021'; - $since = '2.10'; + $since = '2.10.34'; @inargs = ( { name => 'drawable', type => 'drawable',