[gimp] plug-ins, pdb: remove convolution-matrix and add a PDB compat procedure
- From: Michael Natterer <mitch src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gimp] plug-ins, pdb: remove convolution-matrix and add a PDB compat procedure
- Date: Thu, 29 May 2014 14:30:17 +0000 (UTC)
commit f15b48b3c8a7bcb126cb211df326b7ec1d3c299b
Author: Michael Natterer <mitch gimp org>
Date: Thu May 29 16:27:35 2014 +0200
plug-ins, pdb: remove convolution-matrix and add a PDB compat procedure
app/pdb/internal-procs.c | 2 +-
app/pdb/plug-in-compat-cmds.c | 209 +++++++
plug-ins/common/.gitignore | 2 -
plug-ins/common/Makefile.am | 18 -
plug-ins/common/convolution-matrix.c | 1140 ----------------------------------
plug-ins/common/gimprc.common | 1 -
plug-ins/common/plugin-defs.pl | 1 -
po-plug-ins/POTFILES.in | 1 -
tools/pdbgen/pdb/plug_in_compat.pdb | 134 ++++
9 files changed, 344 insertions(+), 1164 deletions(-)
---
diff --git a/app/pdb/internal-procs.c b/app/pdb/internal-procs.c
index 3ced608..1639970 100644
--- a/app/pdb/internal-procs.c
+++ b/app/pdb/internal-procs.c
@@ -28,7 +28,7 @@
#include "internal-procs.h"
-/* 731 procedures registered total */
+/* 732 procedures registered total */
void
internal_procs_init (GimpPDB *pdb)
diff --git a/app/pdb/plug-in-compat-cmds.c b/app/pdb/plug-in-compat-cmds.c
index 3eda5b2..89d29d5 100644
--- a/app/pdb/plug-in-compat-cmds.c
+++ b/app/pdb/plug-in-compat-cmds.c
@@ -48,6 +48,7 @@
#include "gegl/gimp-gegl-utils.h"
#include "gimppdb.h"
+#include "gimppdberror.h"
#include "gimppdb-utils.h"
#include "gimpprocedure.h"
#include "internal-procs.h"
@@ -693,6 +694,132 @@ plug_in_colortoalpha_invoker (GimpProcedure *procedure,
}
static GimpValueArray *
+plug_in_convmatrix_invoker (GimpProcedure *procedure,
+ Gimp *gimp,
+ GimpContext *context,
+ GimpProgress *progress,
+ const GimpValueArray *args,
+ GError **error)
+{
+ gboolean success = TRUE;
+ GimpDrawable *drawable;
+ gint32 argc_matrix;
+ const gdouble *matrix;
+ gboolean alpha_alg;
+ gdouble divisor;
+ gdouble offset;
+ gint32 argc_channels;
+ const gint32 *channels;
+ gint32 bmode;
+
+ drawable = gimp_value_get_drawable (gimp_value_array_index (args, 2), gimp);
+ argc_matrix = g_value_get_int (gimp_value_array_index (args, 3));
+ matrix = gimp_value_get_floatarray (gimp_value_array_index (args, 4));
+ alpha_alg = g_value_get_boolean (gimp_value_array_index (args, 5));
+ divisor = g_value_get_double (gimp_value_array_index (args, 6));
+ offset = g_value_get_double (gimp_value_array_index (args, 7));
+ argc_channels = g_value_get_int (gimp_value_array_index (args, 8));
+ channels = gimp_value_get_int32array (gimp_value_array_index (args, 9));
+ bmode = g_value_get_int (gimp_value_array_index (args, 10));
+
+ if (success)
+ {
+ if (argc_matrix != 25)
+ {
+ g_set_error (error, GIMP_PDB_ERROR, GIMP_PDB_ERROR_INVALID_ARGUMENT,
+ _("Array 'matrix' has only %d members, must have 25"),
+ argc_matrix);
+ success = FALSE;
+ }
+
+ if (success && argc_channels != 5)
+ {
+ g_set_error (error, GIMP_PDB_ERROR, GIMP_PDB_ERROR_INVALID_ARGUMENT,
+ _("Array 'channels' has only %d members, must have 5"),
+ argc_channels);
+ success = FALSE;
+ }
+
+ if (success &&
+ gimp_pdb_item_is_attached (GIMP_ITEM (drawable), NULL,
+ GIMP_PDB_ITEM_CONTENT, error) &&
+ gimp_pdb_item_is_not_group (GIMP_ITEM (drawable), error))
+ {
+ GeglNode *node;
+ GeglAbyssPolicy border;
+ gboolean r = channels[1];
+ gboolean g = channels[2];
+ gboolean b = channels[3];
+ gboolean a = channels[4];
+
+ if (gimp_drawable_is_gray (drawable))
+ {
+ r = channels[0];
+ g = channels[0];
+ b = channels[0];
+ }
+
+ switch (bmode)
+ {
+ case 0: border = GEGL_ABYSS_CLAMP;
+ case 1: border = GEGL_ABYSS_LOOP;
+ case 2: border = GEGL_ABYSS_NONE;
+ }
+
+ node = gegl_node_new_child (NULL,
+ "operation", "gegl:convolution-matrix",
+ "a1", matrix[0],
+ "a2", matrix[1],
+ "a3", matrix[2],
+ "a4", matrix[3],
+ "a5", matrix[4],
+ "b1", matrix[5],
+ "b2", matrix[6],
+ "b3", matrix[7],
+ "b4", matrix[8],
+ "b5", matrix[9],
+ "c1", matrix[10],
+ "c2", matrix[11],
+ "c3", matrix[12],
+ "c4", matrix[13],
+ "c5", matrix[14],
+ "d1", matrix[15],
+ "d2", matrix[16],
+ "d3", matrix[17],
+ "d4", matrix[18],
+ "d5", matrix[19],
+ "e1", matrix[20],
+ "e2", matrix[21],
+ "e3", matrix[22],
+ "e4", matrix[23],
+ "e5", matrix[24],
+ "divisor", divisor,
+ "offset", offset,
+ "red", r,
+ "green", g,
+ "blue", b,
+ "alpha", a,
+ "normalize", FALSE,
+ "alpha-weight", alpha_alg,
+ "border", border,
+ NULL);
+
+ node = wrap_in_gamma_cast (node, drawable);
+
+ gimp_drawable_apply_operation (drawable, progress,
+ C_("undo-type", "Convolution Matrix"),
+ node);
+ g_object_unref (node);
+ }
+ else
+ success = FALSE;
+ }
+
+ return gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
+}
+
+static GimpValueArray *
plug_in_cubism_invoker (GimpProcedure *procedure,
Gimp *gimp,
GimpContext *context,
@@ -2892,6 +3019,88 @@ register_plug_in_compat_procs (GimpPDB *pdb)
g_object_unref (procedure);
/*
+ * gimp-plug-in-convmatrix
+ */
+ procedure = gimp_procedure_new (plug_in_convmatrix_invoker);
+ gimp_object_set_static_name (GIMP_OBJECT (procedure),
+ "plug-in-convmatrix");
+ gimp_procedure_set_static_strings (procedure,
+ "plug-in-convmatrix",
+ "Apply a generic 5x5 convolution matrix",
+ "Apply a generic 5x5 convolution matrix.",
+ "Compatibility procedure. Please see 'gegl:convolution-matrix' for
credits.",
+ "Compatibility procedure. Please see 'gegl:convolution-matrix' for
credits.",
+ "2014",
+ NULL);
+ gimp_procedure_add_argument (procedure,
+ g_param_spec_enum ("run-mode",
+ "run mode",
+ "The run mode",
+ GIMP_TYPE_RUN_MODE,
+ GIMP_RUN_INTERACTIVE,
+ GIMP_PARAM_READWRITE));
+ gimp_procedure_add_argument (procedure,
+ gimp_param_spec_image_id ("image",
+ "image",
+ "Input image (unused)",
+ pdb->gimp, FALSE,
+ GIMP_PARAM_READWRITE));
+ gimp_procedure_add_argument (procedure,
+ gimp_param_spec_drawable_id ("drawable",
+ "drawable",
+ "Input drawable",
+ pdb->gimp, FALSE,
+ GIMP_PARAM_READWRITE));
+ gimp_procedure_add_argument (procedure,
+ gimp_param_spec_int32 ("argc-matrix",
+ "argc matrix",
+ "The number of elements in the following array, must
always be 25",
+ 0, G_MAXINT32, 0,
+ GIMP_PARAM_READWRITE));
+ gimp_procedure_add_argument (procedure,
+ gimp_param_spec_float_array ("matrix",
+ "matrix",
+ "The 5x5 convolution matrix",
+ GIMP_PARAM_READWRITE));
+ gimp_procedure_add_argument (procedure,
+ g_param_spec_boolean ("alpha-alg",
+ "alpha alg",
+ "Enable weighting by alpha channel",
+ FALSE,
+ GIMP_PARAM_READWRITE));
+ gimp_procedure_add_argument (procedure,
+ g_param_spec_double ("divisor",
+ "divisor",
+ "Divisor",
+ -G_MAXDOUBLE, G_MAXDOUBLE, 0,
+ GIMP_PARAM_READWRITE));
+ gimp_procedure_add_argument (procedure,
+ g_param_spec_double ("offset",
+ "offset",
+ "Offset",
+ -G_MAXDOUBLE, G_MAXDOUBLE, 0,
+ GIMP_PARAM_READWRITE));
+ gimp_procedure_add_argument (procedure,
+ gimp_param_spec_int32 ("argc-channels",
+ "argc channels",
+ "The number of elements in following array, must
always be 5",
+ 0, G_MAXINT32, 0,
+ GIMP_PARAM_READWRITE));
+ gimp_procedure_add_argument (procedure,
+ gimp_param_spec_int32_array ("channels",
+ "channels",
+ "Mask of the channels to be filtered",
+ GIMP_PARAM_READWRITE));
+ gimp_procedure_add_argument (procedure,
+ gimp_param_spec_int32 ("bmode",
+ "bmode",
+ "Mode for treating image borders { EXTEND (0), WRAP
(1), CLEAR (2) }",
+ 0, 2, 0,
+ GIMP_PARAM_READWRITE));
+ gimp_pdb_register_procedure (pdb, procedure);
+ g_object_unref (procedure);
+
+ /*
* gimp-plug-in-cubism
*/
procedure = gimp_procedure_new (plug_in_cubism_invoker);
diff --git a/plug-ins/common/.gitignore b/plug-ins/common/.gitignore
index 299fdbe..fe32b55 100644
--- a/plug-ins/common/.gitignore
+++ b/plug-ins/common/.gitignore
@@ -40,8 +40,6 @@
/contrast-normalize.exe
/contrast-retinex
/contrast-retinex.exe
-/convolution-matrix
-/convolution-matrix.exe
/crop-zealous
/crop-zealous.exe
/curve-bend
diff --git a/plug-ins/common/Makefile.am b/plug-ins/common/Makefile.am
index ce71c50..a6f76e2 100644
--- a/plug-ins/common/Makefile.am
+++ b/plug-ins/common/Makefile.am
@@ -63,7 +63,6 @@ libexec_PROGRAMS = \
compose \
contrast-normalize \
contrast-retinex \
- convolution-matrix \
crop-zealous \
curve-bend \
decompose \
@@ -512,23 +511,6 @@ contrast_retinex_LDADD = \
$(INTLLIBS) \
$(contrast_retinex_RC)
-convolution_matrix_SOURCES = \
- convolution-matrix.c
-
-convolution_matrix_LDADD = \
- $(libgimpui) \
- $(libgimpwidgets) \
- $(libgimpmodule) \
- $(libgimp) \
- $(libgimpmath) \
- $(libgimpconfig) \
- $(libgimpcolor) \
- $(libgimpbase) \
- $(GTK_LIBS) \
- $(RT_LIBS) \
- $(INTLLIBS) \
- $(convolution_matrix_RC)
-
crop_zealous_SOURCES = \
crop-zealous.c
diff --git a/plug-ins/common/gimprc.common b/plug-ins/common/gimprc.common
index 6b91d68..4ea72a0 100644
--- a/plug-ins/common/gimprc.common
+++ b/plug-ins/common/gimprc.common
@@ -17,7 +17,6 @@ colormap_remap_RC = colormap-remap.rc.o
compose_RC = compose.rc.o
contrast_normalize_RC = contrast-normalize.rc.o
contrast_retinex_RC = contrast-retinex.rc.o
-convolution_matrix_RC = convolution-matrix.rc.o
crop_zealous_RC = crop-zealous.rc.o
curve_bend_RC = curve-bend.rc.o
decompose_RC = decompose.rc.o
diff --git a/plug-ins/common/plugin-defs.pl b/plug-ins/common/plugin-defs.pl
index 61bdf68..8c39bfc 100644
--- a/plug-ins/common/plugin-defs.pl
+++ b/plug-ins/common/plugin-defs.pl
@@ -18,7 +18,6 @@
'compose' => { ui => 1, gegl => 1 },
'contrast-normalize' => {},
'contrast-retinex' => { ui => 1 },
- 'convolution-matrix' => { ui => 1 },
'crop-zealous' => {},
'curve-bend' => { ui => 1 },
'decompose' => { ui => 1, gegl => 1 },
diff --git a/po-plug-ins/POTFILES.in b/po-plug-ins/POTFILES.in
index b8939f8..2015d82 100644
--- a/po-plug-ins/POTFILES.in
+++ b/po-plug-ins/POTFILES.in
@@ -25,7 +25,6 @@ plug-ins/common/colormap-remap.c
plug-ins/common/compose.c
plug-ins/common/contrast-normalize.c
plug-ins/common/contrast-retinex.c
-plug-ins/common/convolution-matrix.c
plug-ins/common/crop-zealous.c
plug-ins/common/curve-bend.c
plug-ins/common/decompose.c
diff --git a/tools/pdbgen/pdb/plug_in_compat.pdb b/tools/pdbgen/pdb/plug_in_compat.pdb
index 8cbd1d6..7b5b6af 100644
--- a/tools/pdbgen/pdb/plug_in_compat.pdb
+++ b/tools/pdbgen/pdb/plug_in_compat.pdb
@@ -577,6 +577,138 @@ CODE
);
}
+sub plug_in_convmatrix {
+ $blurb = 'Apply a generic 5x5 convolution matrix';
+
+ $help = <<'HELP';
+Apply a generic 5x5 convolution matrix.
+HELP
+
+ &std_pdb_compat('gegl:convolution-matrix');
+ $date = '2014';
+
+ @inargs = (
+ { name => 'run_mode', type => 'enum GimpRunMode', dead => 1,
+ desc => 'The run mode' },
+ { name => 'image', type => 'image', dead => 1,
+ desc => 'Input image (unused)' },
+ { name => 'drawable', type => 'drawable',
+ desc => 'Input drawable' },
+ { name => 'matrix', type => 'floatarray',
+ desc => 'The 5x5 convolution matrix',
+ array => { name => 'argc_matrix',
+ desc => 'The number of elements in the following array, must always be 25' } },
+ { name => 'alpha_alg', type => 'boolean',
+ desc => 'Enable weighting by alpha channel' },
+ { name => 'divisor', type => 'float',
+ desc => 'Divisor' },
+ { name => 'offset', type => 'float',
+ desc => 'Offset' },
+ { name => 'channels', type => 'int32array',
+ desc => 'Mask of the channels to be filtered',
+ array => { name => 'argc_channels',
+ desc => 'The number of elements in following array, must always be 5' } },
+ { name => 'bmode', type => '0 <= int32 <= 2',
+ desc => 'Mode for treating image borders { EXTEND (0), WRAP (1), CLEAR (2) }' }
+ );
+
+ %invoke = (
+ code => <<'CODE'
+{
+ if (argc_matrix != 25)
+ {
+ g_set_error (error, GIMP_PDB_ERROR, GIMP_PDB_ERROR_INVALID_ARGUMENT,
+ _("Array 'matrix' has only %d members, must have 25"),
+ argc_matrix);
+ success = FALSE;
+ }
+
+ if (success && argc_channels != 5)
+ {
+ g_set_error (error, GIMP_PDB_ERROR, GIMP_PDB_ERROR_INVALID_ARGUMENT,
+ _("Array 'channels' has only %d members, must have 5"),
+ argc_channels);
+ success = FALSE;
+ }
+
+ if (success &&
+ gimp_pdb_item_is_attached (GIMP_ITEM (drawable), NULL,
+ GIMP_PDB_ITEM_CONTENT, error) &&
+ gimp_pdb_item_is_not_group (GIMP_ITEM (drawable), error))
+ {
+ GeglNode *node;
+ GeglAbyssPolicy border;
+ gboolean r = channels[1];
+ gboolean g = channels[2];
+ gboolean b = channels[3];
+ gboolean a = channels[4];
+
+ if (gimp_drawable_is_gray (drawable))
+ {
+ r = channels[0];
+ g = channels[0];
+ b = channels[0];
+ }
+
+ switch (bmode)
+ {
+ case 0: border = GEGL_ABYSS_CLAMP;
+ case 1: border = GEGL_ABYSS_LOOP;
+ case 2: border = GEGL_ABYSS_NONE;
+ }
+
+ node = gegl_node_new_child (NULL,
+ "operation", "gegl:convolution-matrix",
+ "a1", matrix[0],
+ "a2", matrix[1],
+ "a3", matrix[2],
+ "a4", matrix[3],
+ "a5", matrix[4],
+ "b1", matrix[5],
+ "b2", matrix[6],
+ "b3", matrix[7],
+ "b4", matrix[8],
+ "b5", matrix[9],
+ "c1", matrix[10],
+ "c2", matrix[11],
+ "c3", matrix[12],
+ "c4", matrix[13],
+ "c5", matrix[14],
+ "d1", matrix[15],
+ "d2", matrix[16],
+ "d3", matrix[17],
+ "d4", matrix[18],
+ "d5", matrix[19],
+ "e1", matrix[20],
+ "e2", matrix[21],
+ "e3", matrix[22],
+ "e4", matrix[23],
+ "e5", matrix[24],
+ "divisor", divisor,
+ "offset", offset,
+ "red", r,
+ "green", g,
+ "blue", b,
+ "alpha", a,
+ "normalize", FALSE,
+ "alpha-weight", alpha_alg,
+ "border", border,
+ NULL);
+
+ node = wrap_in_gamma_cast (node, drawable);
+
+ gimp_drawable_apply_operation (drawable, progress,
+ C_("undo-type", "Convolution Matrix"),
+ node);
+ g_object_unref (node);
+ }
+ else
+ success = FALSE;
+}
+CODE
+ );
+}
+
sub plug_in_cubism {
$blurb = 'Convert the image into randomly rotated square blobs';
@@ -2667,6 +2799,7 @@ CODE
"core/gimpimage-undo.h"
"core/gimppickable.h"
"core/gimppickable-auto-shrink.h"
+ "gimppdberror.h"
"gimppdb-utils.h"
"gimp-intl.h");
@@ -2680,6 +2813,7 @@ CODE
plug_in_c_astretch
plug_in_colors_channel_mixer
plug_in_colortoalpha
+ plug_in_convmatrix
plug_in_cubism
plug_in_deinterlace
plug_in_gauss
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
