[gimp] plug-ins: port gradient-map
- From: Michael Natterer <mitch src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gimp] plug-ins: port gradient-map
- Date: Fri, 30 Aug 2019 09:11:39 +0000 (UTC)
commit e095af2ee43c6b0fa50e5bed64075a9fa03e367d
Author: Michael Natterer <mitch gimp org>
Date: Fri Aug 30 11:11:16 2019 +0200
plug-ins: port gradient-map
plug-ins/common/Makefile.am | 2 -
plug-ins/common/gradient-map.c | 296 +++++++++++++++++++++++------------------
plug-ins/common/plugin-defs.pl | 2 +-
3 files changed, 171 insertions(+), 129 deletions(-)
---
diff --git a/plug-ins/common/Makefile.am b/plug-ins/common/Makefile.am
index 845d2bcf3d..4a11e17077 100644
--- a/plug-ins/common/Makefile.am
+++ b/plug-ins/common/Makefile.am
@@ -1211,8 +1211,6 @@ film_LDADD = \
$(INTLLIBS) \
$(film_RC)
-gradient_map_CPPFLAGS = $(AM_CPPFLAGS) -DGIMP_DEPRECATED_REPLACE_NEW_API
-
gradient_map_SOURCES = \
gradient-map.c
diff --git a/plug-ins/common/gradient-map.c b/plug-ins/common/gradient-map.c
index 94c3f009da..0335d00304 100644
--- a/plug-ins/common/gradient-map.c
+++ b/plug-ins/common/gradient-map.c
@@ -39,166 +39,209 @@ typedef enum
PALETTE_MODE
} MapMode;
-static void query (void);
-static void run (const gchar *name,
- gint nparams,
- const GimpParam *param,
- gint *nreturn_vals,
- GimpParam **return_vals);
-static void map (GeglBuffer *buffer,
- GeglBuffer *shadow_buffer,
- gint32 drawable_id,
- MapMode mode);
-static gdouble * get_samples_gradient (gint32 drawable_id);
-static gdouble * get_samples_palette (gint32 drawable_id);
-
-
-const GimpPlugInInfo PLUG_IN_INFO =
+
+typedef struct _Map Map;
+typedef struct _MapClass MapClass;
+
+struct _Map
+{
+ GimpPlugIn parent_instance;
+};
+
+struct _MapClass
{
- NULL, /* init_proc */
- NULL, /* quit_proc */
- query, /* query_proc */
- run, /* run_proc */
+ GimpPlugInClass parent_class;
};
-MAIN ()
+
+#define MAP_TYPE (map_get_type ())
+#define MAP (obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), MAP_TYPE, Map))
+
+GType map_get_type (void) G_GNUC_CONST;
+
+static GList * map_query_procedures (GimpPlugIn *plug_in);
+static GimpProcedure * map_create_procedure (GimpPlugIn *plug_in,
+ const gchar *name);
+
+static GimpValueArray * map_run (GimpProcedure *procedure,
+ GimpRunMode run_mode,
+ GimpImage *image,
+ GimpDrawable *drawable,
+ const GimpValueArray *args,
+ gpointer run_data);
+
+static void map (GeglBuffer *buffer,
+ GeglBuffer *shadow_buffer,
+ GimpDrawable *drawable,
+ MapMode mode);
+static gdouble * get_samples_gradient (GimpDrawable *drawable);
+static gdouble * get_samples_palette (GimpDrawable *drawable);
+
+
+G_DEFINE_TYPE (Map, map, GIMP_TYPE_PLUG_IN)
+
+GIMP_MAIN (MAP_TYPE)
+
static void
-query (void)
+map_class_init (MapClass *klass)
{
- static const GimpParamDef args[]=
- {
- { GIMP_PDB_INT32, "run-mode", "The run mode { RUN-INTERACTIVE (0), RUN-NONINTERACTIVE (1) }" },
- { GIMP_PDB_IMAGE, "image", "Input image (unused)" },
- { GIMP_PDB_DRAWABLE, "drawable", "Input drawable" }
- };
-
- gimp_install_procedure (GRADMAP_PROC,
- N_("Recolor the image using colors from the active gradient"),
- "This plug-in maps the contents of the specified "
- "drawable with active gradient. It calculates "
- "luminosity of each pixel and replaces the pixel "
- "by the sample of active gradient at the position "
- "proportional to that luminosity. Complete black "
- "pixel becomes the leftmost color of the gradient, "
- "and complete white becomes the rightmost. Works on "
- "both Grayscale and RGB image with/without alpha "
- "channel.",
- "Eiichi Takamori",
- "Eiichi Takamori",
- "1997",
- N_("_Gradient Map"),
- "RGB*, GRAY*",
- GIMP_PLUGIN,
- G_N_ELEMENTS (args), 0,
- args, NULL);
-
- gimp_plugin_menu_register (GRADMAP_PROC, "<Image>/Colors/Map");
-
- gimp_install_procedure (PALETTEMAP_PROC,
- N_("Recolor the image using colors from the active palette"),
- "This plug-in maps the contents of the specified "
- "drawable with the active palette. It calculates "
- "luminosity of each pixel and replaces the pixel "
- "by the palette sample at the corresponding "
- "index. A complete black "
- "pixel becomes the lowest palette entry, "
- "and complete white becomes the highest. Works on "
- "both Grayscale and RGB image with/without alpha "
- "channel.",
- "Bill Skaggs",
- "Bill Skaggs",
- "2004",
- N_("_Palette Map"),
- "RGB*, GRAY*",
- GIMP_PLUGIN,
- G_N_ELEMENTS (args), 0,
- args, NULL);
-
- gimp_plugin_menu_register (PALETTEMAP_PROC, "<Image>/Colors/Map");
+ GimpPlugInClass *plug_in_class = GIMP_PLUG_IN_CLASS (klass);
+
+ plug_in_class->query_procedures = map_query_procedures;
+ plug_in_class->create_procedure = map_create_procedure;
}
static void
-run (const gchar *name,
- gint nparams,
- const GimpParam *param,
- gint *nreturn_vals,
- GimpParam **return_vals)
+map_init (Map *map)
{
- static GimpParam values[1];
- GimpPDBStatusType status = GIMP_PDB_SUCCESS;
- GimpRunMode run_mode;
- gint32 drawable_id;
- GeglBuffer *shadow_buffer;
- GeglBuffer *buffer;
+}
- run_mode = param[0].data.d_int32;
- drawable_id = param[2].data.d_drawable;
+static GList *
+map_query_procedures (GimpPlugIn *plug_in)
+{
+ GList *list = NULL;
- INIT_I18N ();
- gegl_init (NULL, NULL);
+ list = g_list_append (list, g_strdup (GRADMAP_PROC));
+ list = g_list_append (list, g_strdup (PALETTEMAP_PROC));
+
+ return list;
+}
- *nreturn_vals = 1;
- *return_vals = values;
+static GimpProcedure *
+map_create_procedure (GimpPlugIn *plug_in,
+ const gchar *name)
+{
+ GimpProcedure *procedure = NULL;
+
+ if (! strcmp (name, GRADMAP_PROC))
+ {
+ procedure = gimp_image_procedure_new (plug_in, name, GIMP_PLUGIN,
+ map_run,
+ GINT_TO_POINTER (GRADIENT_MODE),
+ NULL);
+
+ gimp_procedure_set_image_types (procedure, "RGB*, GRAY*");
+
+ gimp_procedure_set_menu_label (procedure, N_("_Gradient Map"));
+ gimp_procedure_add_menu_path (procedure, "<Image>/Colors/Map");
+
+ gimp_procedure_set_documentation (procedure,
+ N_("Recolor the image using colors "
+ "from the active gradient"),
+ "This plug-in maps the contents of "
+ "the specified drawable with active "
+ "gradient. It calculates luminosity "
+ "of each pixel and replaces the pixel "
+ "by the sample of active gradient at "
+ "the position proportional to that "
+ "luminosity. Complete black pixel "
+ "becomes the leftmost color of the "
+ "gradient, and complete white becomes "
+ "the rightmost. Works on both "
+ "Grayscale and RGB image "
+ "with/without alpha channel.",
+ name);
+ gimp_procedure_set_attribution (procedure,
+ "Eiichi Takamori",
+ "Eiichi Takamori",
+ "1997");
+ }
+ else if (! strcmp (name, PALETTEMAP_PROC))
+ {
+ procedure = gimp_image_procedure_new (plug_in, name, GIMP_PLUGIN,
+ map_run,
+ GINT_TO_POINTER (PALETTE_MODE),
+ NULL);
+
+ gimp_procedure_set_image_types (procedure, "RGB*, GRAY*");
+
+ gimp_procedure_set_menu_label (procedure, N_("_Palette Map"));
+ gimp_procedure_add_menu_path (procedure, "<Image>/Colors/Map");
+
+ gimp_procedure_set_documentation (procedure,
+ N_("Recolor the image using colors "
+ "from the active palette"),
+ "This plug-in maps the contents of "
+ "the specified drawable with the "
+ "active palette. It calculates "
+ "luminosity of each pixel and "
+ "replaces the pixel by the palette "
+ "sample at the corresponding index. "
+ "A complete black pixel becomes the "
+ "lowest palette entry, and complete "
+ "white becomes the highest. Works on "
+ "both Grayscale and RGB image "
+ "with/without alpha channel.",
+ name);
+ gimp_procedure_set_attribution (procedure,
+ "Bill Skaggs",
+ "Bill Skaggs",
+ "2004");
+ }
- values[0].type = GIMP_PDB_STATUS;
- values[0].data.d_status = status;
+ return procedure;
+}
+
+static GimpValueArray *
+map_run (GimpProcedure *procedure,
+ GimpRunMode run_mode,
+ GimpImage *image,
+ GimpDrawable *drawable,
+ const GimpValueArray *args,
+ gpointer run_data)
+{
+ MapMode mode = GPOINTER_TO_INT (run_data);
+ GeglBuffer *shadow_buffer;
+ GeglBuffer *buffer;
+
+ INIT_I18N ();
+ gegl_init (NULL, NULL);
- /* Get the specified drawable */
- shadow_buffer = gimp_drawable_get_shadow_buffer (drawable_id);
- buffer = gimp_drawable_get_buffer (drawable_id);
+ shadow_buffer = gimp_drawable_get_shadow_buffer (drawable);
+ buffer = gimp_drawable_get_buffer (drawable);
/* Make sure that the drawable is gray or RGB color */
- if (gimp_drawable_is_rgb (drawable_id) ||
- gimp_drawable_is_gray (drawable_id))
+ if (gimp_drawable_is_rgb (drawable) ||
+ gimp_drawable_is_gray (drawable))
{
- MapMode mode = 0;
-
- if ( !strcmp (name, GRADMAP_PROC))
+ if (mode == GRADIENT_MODE)
{
- mode = GRADIENT_MODE;
gimp_progress_init (_("Gradient Map"));
}
- else if ( !strcmp (name, PALETTEMAP_PROC))
- {
- mode = PALETTE_MODE;
- gimp_progress_init (_("Palette Map"));
- }
else
{
- status = GIMP_PDB_CALLING_ERROR;
+ gimp_progress_init (_("Palette Map"));
}
- if (status == GIMP_PDB_SUCCESS)
- {
- if (mode)
- map (buffer, shadow_buffer, drawable_id, mode);
- }
+ map (buffer, shadow_buffer, drawable, mode);
}
else
{
- status = GIMP_PDB_EXECUTION_ERROR;
+ return gimp_procedure_new_return_values (procedure,
+ GIMP_PDB_EXECUTION_ERROR,
+ NULL);
}
g_object_unref (buffer);
g_object_unref (shadow_buffer);
- gimp_drawable_merge_shadow (drawable_id, TRUE);
-
- gimp_drawable_update (drawable_id, 0, 0,
- gimp_drawable_width (drawable_id),
- gimp_drawable_height (drawable_id));
+ gimp_drawable_merge_shadow (drawable, TRUE);
- values[0].data.d_status = status;
+ gimp_drawable_update (drawable, 0, 0,
+ gimp_drawable_width (drawable),
+ gimp_drawable_height (drawable));
if (run_mode != GIMP_RUN_NONINTERACTIVE)
gimp_displays_flush ();
+
+ return gimp_procedure_new_return_values (procedure, GIMP_PDB_SUCCESS, NULL);
}
static void
map (GeglBuffer *buffer,
GeglBuffer *shadow_buffer,
- gint32 drawable_id,
+ GimpDrawable *drawable,
MapMode mode)
{
GeglBufferIterator *gi;
@@ -214,17 +257,17 @@ map (GeglBuffer *buffer,
const Babl *format_shadow;
const Babl *format_buffer;
- is_rgb = gimp_drawable_is_rgb (drawable_id);
- has_alpha = gimp_drawable_has_alpha (drawable_id);
+ is_rgb = gimp_drawable_is_rgb (drawable);
+ has_alpha = gimp_drawable_has_alpha (drawable);
switch (mode)
{
case GRADIENT_MODE:
- samples = get_samples_gradient (drawable_id);
+ samples = get_samples_gradient (drawable);
interpolate = TRUE;
break;
case PALETTE_MODE:
- samples = get_samples_palette (drawable_id);
+ samples = get_samples_palette (drawable);
interpolate = FALSE;
break;
default:
@@ -344,7 +387,7 @@ map (GeglBuffer *buffer,
Each sample is (R'G'B'A float) or (Y'A float), depending on the drawable
*/
static gdouble *
-get_samples_gradient (gint32 drawable_id)
+get_samples_gradient (GimpDrawable *drawable)
{
gchar *gradient_name;
gint n_d_samples;
@@ -357,11 +400,12 @@ get_samples_gradient (gint32 drawable_id)
&n_d_samples, &d_samples);
g_free (gradient_name);
- if (!gimp_drawable_is_rgb (drawable_id))
+ if (! gimp_drawable_is_rgb (drawable))
{
const Babl *format_src = babl_format ("R'G'B'A double");
const Babl *format_dst = babl_format ("Y'A double");
const Babl *fish = babl_fish (format_src, format_dst);
+
babl_process (fish, d_samples, d_samples, NSAMPLES);
}
@@ -373,7 +417,7 @@ get_samples_gradient (gint32 drawable_id)
Each sample is (R'G'B'A float) or (Y'A float), depending on the drawable
*/
static gdouble *
-get_samples_palette (gint32 drawable_id)
+get_samples_palette (GimpDrawable *drawable)
{
gchar *palette_name;
GimpRGB color_sample;
@@ -387,7 +431,7 @@ get_samples_palette (gint32 drawable_id)
palette_name = gimp_context_get_palette ();
gimp_palette_get_info (palette_name, &num_colors);
- is_rgb = gimp_drawable_is_rgb (drawable_id);
+ is_rgb = gimp_drawable_is_rgb (drawable);
factor = ((double) num_colors) / NSAMPLES;
format = is_rgb ? babl_format ("R'G'B'A double") : babl_format ("Y'A double");
diff --git a/plug-ins/common/plugin-defs.pl b/plug-ins/common/plugin-defs.pl
index 51487ae5ed..e64f7931e4 100644
--- a/plug-ins/common/plugin-defs.pl
+++ b/plug-ins/common/plugin-defs.pl
@@ -52,7 +52,7 @@
'file-xpm' => { ui => 1, gegl => 1, optional => 1, libs => 'XPM_LIBS' },
'file-xwd' => { ui => 1, gegl => 1 },
'film' => { ui => 1, gegl => 1 },
- 'gradient-map' => { gegl => 1, old_api => 1 },
+ 'gradient-map' => { gegl => 1 },
'grid' => { ui => 1, gegl => 1 },
'guillotine' => { },
'hot' => { ui => 1, gegl => 1, old_api => 1 },
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
