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

app: always use GEGL to invert drawables 

and remove the now useless gimpdrawable-invert.[ch].
This commit is contained in:
Michael Natterer 2012-03-14 10:26:33 +01:00
parent 6d3a8fe73d
commit 63bd108afb
7 changed files with 24 additions and 110 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/actions/drawable-commands.c
View File

@ -26,8 +26,8 @@
#include "core/gimp.h"
#include "core/gimpdrawable-equalize.h"
#include "core/gimpdrawable-invert.h"
#include "core/gimpdrawable-levels.h"
#include "core/gimpdrawable-operation.h"
#include "core/gimpimage.h"
#include "core/gimpimage-undo.h"
#include "core/gimpitem-linked.h"
@ -87,7 +87,9 @@ drawable_invert_cmd_callback (GtkAction *action,
return;
}
gimp_drawable_invert (drawable, GIMP_PROGRESS (display));
gimp_drawable_apply_operation_by_name (drawable, GIMP_PROGRESS (display),
_("Invert"), "gegl:invert",
NULL, TRUE);
gimp_image_flush (image);
}

2
app/core/Makefile.am
View File

@ -140,8 +140,6 @@ libappcore_a_sources = \
gimpdrawable-histogram.h \
gimpdrawable-hue-saturation.c \
gimpdrawable-hue-saturation.h \
gimpdrawable-invert.c \
gimpdrawable-invert.h \
gimpdrawable-levels.c \
gimpdrawable-levels.h \
gimpdrawable-offset.c \

65
app/core/gimpdrawable-invert.c
View File

@ -1,65 +0,0 @@
/* GIMP - The GNU Image Manipulation Program
* Copyright (C) 1995 Spencer Kimball and Peter Mattis
*
* 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 <http://www.gnu.org/licenses/>.
*/
#include "config.h"
#include <gegl.h>
#include "core-types.h"
#include "base/gimplut.h"
#include "base/lut-funcs.h"
/* temp */
#include "gimp.h"
#include "gimpimage.h"
#include "gimpdrawable.h"
#include "gimpdrawable-invert.h"
#include "gimpdrawable-operation.h"
#include "gimpdrawable-process.h"
#include "gimpprogress.h"
#include "gimp-intl.h"
void
gimp_drawable_invert (GimpDrawable *drawable,
GimpProgress *progress)
{
g_return_if_fail (GIMP_IS_DRAWABLE (drawable));
g_return_if_fail (gimp_item_is_attached (GIMP_ITEM (drawable)));
g_return_if_fail (progress == NULL || GIMP_IS_PROGRESS (progress));
if (gimp_use_gegl (gimp_item_get_image (GIMP_ITEM (drawable))->gimp))
{
GeglNode *invert;
invert = g_object_new (GEGL_TYPE_NODE, "operation", "gegl:invert", NULL);
gimp_drawable_apply_operation (drawable, progress, _("Invert"),
invert, TRUE);
g_object_unref (invert);
}
else
{
GimpLut *lut = invert_lut_new (gimp_drawable_bytes (drawable));
gimp_drawable_process_lut (drawable, progress, _("Invert"), lut);
gimp_lut_free (lut);
}
}

26
app/core/gimpdrawable-invert.h
View File

@ -1,26 +0,0 @@
/* GIMP - The GNU Image Manipulation Program
* Copyright (C) 1995 Spencer Kimball and Peter Mattis
*
* 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 <http://www.gnu.org/licenses/>.
*/
#ifndef __GIMP_DRAWABLE_INVERT_H__
#define __GIMP_DRAWABLE_INVERT_H__
void gimp_drawable_invert (GimpDrawable *drawable,
GimpProgress *progress);
#endif /* __GIMP_DRAWABLE_INVERT_H__ */

1
app/core/gimplayer.c
View File

@ -40,7 +40,6 @@
#include "gimpcontext.h"
#include "gimpcontainer.h"
#include "gimpdrawable-convert.h"
#include "gimpdrawable-invert.h"
#include "gimperror.h"
#include "gimpimage-undo-push.h"
#include "gimpimage-undo.h"

17
app/pdb/color-cmds.c
View File

@ -30,7 +30,6 @@
#include "core/gimpdrawable-equalize.h"
#include "core/gimpdrawable-histogram.h"
#include "core/gimpdrawable-hue-saturation.h"
#include "core/gimpdrawable-invert.h"
#include "core/gimpdrawable-levels.h"
#include "core/gimpdrawable-operation.h"
#include "core/gimpdrawable.h"
@ -348,13 +347,17 @@ invert_invoker (GimpProcedure *procedure,
if (success)
{
if (! gimp_pdb_item_is_attached (GIMP_ITEM (drawable), NULL, TRUE, error) ||
! gimp_pdb_item_is_not_group (GIMP_ITEM (drawable), error) ||
gimp_drawable_is_indexed (drawable))
if (gimp_pdb_item_is_attached (GIMP_ITEM (drawable), NULL, TRUE, error) &&
gimp_pdb_item_is_not_group (GIMP_ITEM (drawable), error) &&
! gimp_drawable_is_indexed (drawable))
{
gimp_drawable_apply_operation_by_name (drawable, progress,
_("Invert"),
"gegl:invert",
NULL, TRUE);
}
else
success = FALSE;
if (success)
gimp_drawable_invert (drawable, progress);
}
return gimp_procedure_get_return_values (procedure, success,

17
tools/pdbgen/pdb/color.pdb
View File

@ -361,16 +361,19 @@ HELP
);
%invoke = (
headers => [ qw("core/gimpdrawable-invert.h") ],
code => <<'CODE'
{
if (! gimp_pdb_item_is_attached (GIMP_ITEM (drawable), NULL, TRUE, error) ||
! gimp_pdb_item_is_not_group (GIMP_ITEM (drawable), error) ||
gimp_drawable_is_indexed (drawable))
if (gimp_pdb_item_is_attached (GIMP_ITEM (drawable), NULL, TRUE, error) &&
gimp_pdb_item_is_not_group (GIMP_ITEM (drawable), error) &&
! gimp_drawable_is_indexed (drawable))
{
gimp_drawable_apply_operation_by_name (drawable, progress,
_("Invert"),
"gegl:invert",
NULL, TRUE);
}
else
success = FALSE;
if (success)
gimp_drawable_invert (drawable, progress);
}
CODE
);