dnrops
/
gimp
mirror of https://github.com/GNOME/gimp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

plug-ins, pdb: remove the contrast-normalize plug-in 

and add a PDB compat procedure.
This commit is contained in:
Michael Natterer 2019-07-14 14:28:40 +02:00
parent 3d049f565a
commit 8fcccf3f88
9 changed files with 129 additions and 377 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/pdb/internal-procs.c
View File

@ -28,7 +28,7 @@
#include "internal-procs.h"
/* 738 procedures registered total */
/* 739 procedures registered total */
void
internal_procs_init (GimpPDB *pdb)

76
app/pdb/plug-in-compat-cmds.c
View File

@ -2549,6 +2549,46 @@ plug_in_neon_invoker (GimpProcedure *procedure,
error ? *error : NULL);
}
static GimpValueArray *
plug_in_normalize_invoker (GimpProcedure *procedure,
Gimp *gimp,
GimpContext *context,
GimpProgress *progress,
const GimpValueArray *args,
GError **error)
{
gboolean success = TRUE;
GimpDrawable *drawable;
drawable = gimp_value_get_drawable (gimp_value_array_index (args, 2), gimp);
if (success)
{
if (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;
node = gegl_node_new_child (NULL,
"operation", "gegl:stretch-contrast",
"keep-colors", TRUE,
"perceptual", TRUE,
NULL);
gimp_drawable_apply_operation (drawable, progress,
C_("undo-type", "Normalize"),
node);
g_object_unref (node);
}
else
success = FALSE;
}
return gimp_procedure_get_return_values (procedure, success,
error ? *error : NULL);
}
static GimpValueArray *
plug_in_nova_invoker (GimpProcedure *procedure,
Gimp *gimp,
@ -6785,6 +6825,42 @@ register_plug_in_compat_procs (GimpPDB *pdb)
gimp_pdb_register_procedure (pdb, procedure);
g_object_unref (procedure);
/*
* gimp-plug-in-normalize
*/
procedure = gimp_procedure_new (plug_in_normalize_invoker);
gimp_object_set_static_name (GIMP_OBJECT (procedure),
"plug-in-normalize");
gimp_procedure_set_static_strings (procedure,
"plug-in-normalize",
"Stretch brightness values to cover the full range",
"This plug-in performs almost the same operation as the 'contrast autostretch' plug-in, except that it won't allow the color channels to normalize independently. This is actually what most people probably want instead of contrast-autostretch; use c-a only if you wish to remove an undesirable color-tint from a source image which is supposed to contain pure-white and pure-black.",
"Compatibility procedure. Please see 'gegl:stretch-contrast' for credits.",
"Compatibility procedure. Please see 'gegl:stretch-contrast' for credits.",
"2019",
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_pdb_register_procedure (pdb, procedure);
g_object_unref (procedure);
/*
* gimp-plug-in-nova
*/

52
pdb/groups/plug_in_compat.pdb
View File

@ -2536,6 +2536,57 @@ CODE
);
}
sub plug_in_normalize {
$blurb = 'Stretch brightness values to cover the full range';
$help = <<'HELP';
This plug-in performs almost the same operation as the 'contrast
autostretch' plug-in, except that it won't allow the color channels to
normalize independently. This is actually what most people probably
want instead of contrast-autostretch; use c-a only if you wish to
remove an undesirable color-tint from a source image which is supposed
to contain pure-white and pure-black.
HELP
&std_pdb_compat('gegl:stretch-contrast');
$date = '2019';
@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' }
);
%invoke = (
code => <<'CODE'
{
if (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;
node = gegl_node_new_child (NULL,
"operation", "gegl:stretch-contrast",
"keep-colors", TRUE,
"perceptual", TRUE,
NULL);
gimp_drawable_apply_operation (drawable, progress,
C_("undo-type", "Normalize"),
node);
g_object_unref (node);
}
else
success = FALSE;
}
CODE
);
}
sub plug_in_nova {
$blurb = 'Add a starburst to the image';
@ -4950,6 +5001,7 @@ CODE
plug_in_mblur_inward
plug_in_mosaic
plug_in_neon
plug_in_normalize
plug_in_nova
plug_in_papertile
plug_in_photocopy

2
plug-ins/common/.gitignore vendored
View File

@ -26,8 +26,6 @@
/colormap-remap.exe
/compose
/compose.exe
/contrast-normalize
/contrast-normalize.exe
/contrast-retinex
/contrast-retinex.exe
/crop-zealous

17
plug-ins/common/Makefile.am
View File

@ -58,7 +58,6 @@ color_cube_analyze_libexecdir = $(gimpplugindir)/plug-ins/color-cube-analyze
colorify_libexecdir = $(gimpplugindir)/plug-ins/colorify
colormap_remap_libexecdir = $(gimpplugindir)/plug-ins/colormap-remap
compose_libexecdir = $(gimpplugindir)/plug-ins/compose
contrast_normalize_libexecdir = $(gimpplugindir)/plug-ins/contrast-normalize
contrast_retinex_libexecdir = $(gimpplugindir)/plug-ins/contrast-retinex
crop_zealous_libexecdir = $(gimpplugindir)/plug-ins/crop-zealous
curve_bend_libexecdir = $(gimpplugindir)/plug-ins/curve-bend
@ -147,7 +146,6 @@ color_cube_analyze_libexec_PROGRAMS = color-cube-analyze
colorify_libexec_PROGRAMS = colorify
colormap_remap_libexec_PROGRAMS = colormap-remap
compose_libexec_PROGRAMS = compose
contrast_normalize_libexec_PROGRAMS = contrast-normalize
contrast_retinex_libexec_PROGRAMS = contrast-retinex
crop_zealous_libexec_PROGRAMS = crop-zealous
curve_bend_libexec_PROGRAMS = curve-bend
@ -456,21 +454,6 @@ compose_LDADD = \
$(INTLLIBS) \
$(compose_RC)
contrast_normalize_SOURCES = \
contrast-normalize.c
contrast_normalize_LDADD = \
$(libgimp) \
$(libgimpmath) \
$(libgimpconfig) \
$(libgimpcolor) \
$(libgimpbase) \
$(CAIRO_LIBS) \
$(GDK_PIXBUF_LIBS) \
$(RT_LIBS) \
$(INTLLIBS) \
$(contrast_normalize_RC)
contrast_retinex_SOURCES = \
contrast-retinex.c

354
plug-ins/common/contrast-normalize.c
View File

@ -1,354 +0,0 @@
/* GIMP - The GNU Image Manipulation Program
* Copyright (C) 1995 Spencer Kimball and Peter Mattis
*
* Normalize 1.00 --- image filter plug-in
*
* Copyright (C) 1997 Adam D. Moss (adam@foxbox.org)
* Very largely based on Quartic's "Contrast Autostretch"
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
/* This plugin performs almost the same operation as the 'contrast
* autostretch' plugin, except that it won't allow the color channels
* to normalize independently. This is actually what most people probably
* want instead of contrast-autostretch; use c-a only if you wish to remove
* an undesirable color-tint from a source image which is supposed to
* contain pure-white and pure-black.
*/
#include "config.h"
#include <stdlib.h>
#include <libgimp/gimp.h>
#include "libgimp/stdplugins-intl.h"
#define PLUG_IN_PROC "plug-in-normalize"
/* Declare local functions.
*/
static void query (void);
static void run (const gchar *name,
gint nparams,
const GimpParam *param,
gint *nreturn_vals,
GimpParam **return_vals);
static void normalize (GimpDrawable *drawable);
static void indexed_normalize (gint32 image_ID);
const GimpPlugInInfo PLUG_IN_INFO =
{
NULL, /* init_proc */
NULL, /* quit_proc */
query, /* query_proc */
run, /* run_proc */
};
MAIN ()
static void
query (void)
{
static const GimpParamDef args[] =
{
{ GIMP_PDB_INT32, "run-mode", "The run mode { RUN-INTERACTIVE (0), RUN-NONINTERACTIVE (1) }" },
{ GIMP_PDB_IMAGE, "image", "Input image" },
{ GIMP_PDB_DRAWABLE, "drawable", "Input drawable" }
};
gimp_install_procedure (PLUG_IN_PROC,
N_("Stretch brightness values to cover the full range"),
"This plug-in performs almost the same operation as "
"the 'contrast autostretch' plug-in, except that it "
"won't allow the color channels to normalize "
"independently. This is actually what most people "
"probably want instead of contrast-autostretch; use "
"c-a only if you wish to remove an undesirable "
"color-tint from a source image which is supposed to "
"contain pure-white and pure-black.",
"Adam D. Moss, Federico Mena Quintero",
"Adam D. Moss, Federico Mena Quintero",
"1997",
N_("_Normalize"),
"RGB*, GRAY*, INDEXED*",
GIMP_PLUGIN,
G_N_ELEMENTS (args), 0,
args, NULL);
}
static void
run (const gchar *name,
gint nparams,
const GimpParam *param,
gint *nreturn_vals,
GimpParam **return_vals)
{
static GimpParam values[1];
GimpDrawable *drawable;
GimpPDBStatusType status = GIMP_PDB_SUCCESS;
GimpRunMode run_mode;
gint32 image_ID;
INIT_I18N ();
run_mode = param[0].data.d_int32;
/* Get the specified drawable */
drawable = gimp_drawable_get (param[2].data.d_drawable);
image_ID = param[1].data.d_image;
/* Make sure that the drawable is gray or RGB color */
if (gimp_drawable_is_rgb (drawable->drawable_id) ||
gimp_drawable_is_gray (drawable->drawable_id))
{
gimp_progress_init (_("Normalizing"));
gimp_tile_cache_ntiles (2 * (drawable->width / gimp_tile_width () + 1));
normalize (drawable);
if (run_mode != GIMP_RUN_NONINTERACTIVE)
gimp_displays_flush ();
}
else if (gimp_drawable_is_indexed (drawable->drawable_id))
{
indexed_normalize (image_ID);
if (run_mode != GIMP_RUN_NONINTERACTIVE)
gimp_displays_flush ();
}
else
{
status = GIMP_PDB_EXECUTION_ERROR;
}
*nreturn_vals = 1;
*return_vals = values;
values[0].type = GIMP_PDB_STATUS;
values[0].data.d_status = status;
gimp_drawable_detach (drawable);
}
static void
indexed_normalize (gint32 image_ID) /* a.d.m. */
{
guchar *cmap;
gint ncols,i;
gint hi=0,lo=255;
cmap = gimp_image_get_colormap (image_ID, &ncols);
if (cmap==NULL)
{
g_printerr ("normalize: cmap was NULL! Quitting...\n");
return;
}
for (i=0;i<ncols;i++)
{
if (cmap[i*3 +0] > hi) hi=cmap[i*3 +0];
if (cmap[i*3 +1] > hi) hi=cmap[i*3 +1];
if (cmap[i*3 +2] > hi) hi=cmap[i*3 +2];
if (cmap[i*3 +0] < lo) lo=cmap[i*3 +0];
if (cmap[i*3 +1] < lo) lo=cmap[i*3 +1];
if (cmap[i*3 +2] < lo) lo=cmap[i*3 +2];
}
if (hi!=lo)
for (i=0;i<ncols;i++)
{
cmap[i*3 +0] = (255 * (cmap[i*3 +0] - lo)) / (hi-lo);
cmap[i*3 +1] = (255 * (cmap[i*3 +1] - lo)) / (hi-lo);
cmap[i*3 +2] = (255 * (cmap[i*3 +2] - lo)) / (hi-lo);
}
gimp_image_set_colormap (image_ID, cmap, ncols);
}
typedef struct
{
guchar lut[256];
gdouble min;
gdouble max;
gint alpha;
gboolean has_alpha;
} NormalizeParam_t;
static void
find_min_max (const guchar *src,
gint bpp,
gpointer data)
{
NormalizeParam_t *param = (NormalizeParam_t*) data;
gint b;
for (b = 0; b < param->alpha; b++)
{
if (!param->has_alpha || src[param->alpha])
{
if (src[b] < param->min)
param->min = src[b];
if (src[b] > param->max)
param->max = src[b];
}
}
}
static void
normalize_func (const guchar *src,
guchar *dest,
gint bpp,
gpointer data)
{
NormalizeParam_t *param = (NormalizeParam_t*) data;
gint b;
for (b = 0; b < param->alpha; b++)
dest[b] = param->lut[src[b]];
if (param->has_alpha)
dest[param->alpha] = src[param->alpha];
}
static void
normalize (GimpDrawable *drawable)
{
NormalizeParam_t param;
gint x1, y1, x2, y2;
gint x;
guchar range;
gint total_area;
param.min = 255;
param.max = 0;
param.has_alpha = gimp_drawable_has_alpha (drawable->drawable_id);
param.alpha = (param.has_alpha) ? drawable->bpp - 1 : drawable->bpp;
gimp_drawable_mask_bounds (drawable->drawable_id, &x1, &y1, &x2, &y2);
total_area = (x2 - x1) * (y2 - y1);
if (total_area <= 0)
return;
{
GimpPixelRgn srcPR;
gpointer pr;
gint area_so_far;
gint count;
area_so_far = 0;
gimp_pixel_rgn_init (&srcPR, drawable,
x1, y1, (x2 - x1), (y2 - y1), FALSE, FALSE);
for (pr = gimp_pixel_rgns_register (1, &srcPR), count = 0;
pr != NULL;
pr = gimp_pixel_rgns_process (pr), count++)
{
const guchar *src = srcPR.data;
gint y;
for (y = 0; y < srcPR.h; y++)
{
const guchar *s = src;
gint x;
for (x = 0; x < srcPR.w; x++)
{
find_min_max (s, srcPR.bpp, &param);
s += srcPR.bpp;
}
src += srcPR.rowstride;
}
area_so_far += srcPR.w * srcPR.h;
if ((count % 16) == 0)
gimp_progress_update ((gdouble) area_so_far / (gdouble) total_area);
}
}
/* Calculate LUT */
range = param.max - param.min;
if (range != 0)
for (x = param.min; x <= param.max; x++)
param.lut[x] = 255 * (x - param.min) / range;
else
param.lut[(gint)param.min] = param.min;
{
GimpPixelRgn srcPR, destPR;
gpointer pr;
gint area_so_far;
gint count;
area_so_far = 0;
/* Initialize the pixel regions. */
gimp_pixel_rgn_init (&srcPR, drawable, x1, y1, (x2 - x1), (y2 - y1),
FALSE, FALSE);
gimp_pixel_rgn_init (&destPR, drawable, x1, y1, (x2 - x1), (y2 - y1),
TRUE, TRUE);
for (pr = gimp_pixel_rgns_register (2, &srcPR, &destPR), count = 0;
pr != NULL;
pr = gimp_pixel_rgns_process (pr), count++)
{
const guchar *src = srcPR.data;
guchar *dest = destPR.data;
gint row;
for (row = 0; row < srcPR.h; row++)
{
const guchar *s = src;
guchar *d = dest;
gint pixels = srcPR.w;
while (pixels--)
{
normalize_func (s, d, srcPR.bpp, &param);
s += srcPR.bpp;
d += destPR.bpp;
}
src += srcPR.rowstride;
dest += destPR.rowstride;
}
area_so_far += srcPR.w * srcPR.h;
if ((count % 16) == 0)
gimp_progress_update ((gdouble) area_so_far / (gdouble) total_area);
}
}
/* update the processed region */
gimp_drawable_flush (drawable);
gimp_drawable_merge_shadow (drawable->drawable_id, TRUE);
gimp_drawable_update (drawable->drawable_id, x1, y1, (x2 - x1), (y2 - y1));
}

1
plug-ins/common/gimprc.common
View File

@ -10,7 +10,6 @@ color_cube_analyze_RC = color-cube-analyze.rc.o
colorify_RC = colorify.rc.o
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
crop_zealous_RC = crop-zealous.rc.o
curve_bend_RC = curve-bend.rc.o

1
plug-ins/common/plugin-defs.pl
View File

@ -12,7 +12,6 @@
'colorify' => { ui => 1 },
'colormap-remap' => { ui => 1, gegl => 1 },
'compose' => { ui => 1, gegl => 1 },
'contrast-normalize' => {},
'contrast-retinex' => { ui => 1, gegl => 1 },
'crop-zealous' => { gegl => 1 },
'curve-bend' => { ui => 1, gegl => 1 },

1
po-plug-ins/POTFILES.in
View File

@ -16,7 +16,6 @@ plug-ins/common/color-cube-analyze.c
plug-ins/common/colorify.c
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/crop-zealous.c
plug-ins/common/curve-bend.c