cb48cef8be
2004-10-20 Michael Natterer <mitch@gimp.org> * app/core/gimpdrawable.[ch]: added gimp_drawable_mask_intersect() which returns the same bounding box as gimp_drawable_mask_bounds(), but returns TRUE only if there is a non-empty intersection between the drawable and the selection, or no selection at all. It also returns the intersection as x,y,width,height instead of the eeky x1,y1,x2,y2. * app/core/gimp-edit.c * app/core/gimpdrawable-blend.c * app/core/gimpdrawable-bucket-fill.c * app/core/gimpdrawable-desaturate.c * app/core/gimpdrawable-equalize.c * app/core/gimpdrawable-histogram.c * app/core/gimpdrawable-invert.c * app/core/gimpdrawable-stroke.c * app/core/gimpimagemap.c * app/core/gimpselection.c * tools/pdbgen/pdb/color.pdb * tools/pdbgen/pdb/transform_tools.pdb: either switch from gimp_drawable_mask_bounds() to _intersect() or check the return values of _mask_bounds() manually to avoid operations on empty areas. Return successfully because it's a nop, not a failure. Fixes bug #155733 for the core. * app/pdb/color_cmds.c * app/pdb/transform_tools_cmds.c: regenerated.
72 lines
2.1 KiB
C
72 lines
2.1 KiB
C
/* The GIMP -- an image manipulation program
|
|
* Copyright (C) 1995 Spencer Kimball and Peter Mattis
|
|
*
|
|
* gimphistogram module Copyright (C) 1999 Jay Cox <jaycox@earthlink.net>
|
|
*
|
|
* 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 2 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, write to the Free Software
|
|
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
|
*/
|
|
|
|
#include "config.h"
|
|
|
|
#include <glib-object.h>
|
|
|
|
#include "core-types.h"
|
|
|
|
#include "base/gimphistogram.h"
|
|
#include "base/pixel-region.h"
|
|
|
|
#include "gimpdrawable.h"
|
|
#include "gimpimage.h"
|
|
|
|
|
|
void
|
|
gimp_drawable_calculate_histogram (GimpDrawable *drawable,
|
|
GimpHistogram *histogram)
|
|
{
|
|
PixelRegion region;
|
|
PixelRegion mask;
|
|
gint x1, y1, x2, y2;
|
|
gboolean have_mask;
|
|
|
|
g_return_if_fail (GIMP_IS_DRAWABLE (drawable));
|
|
g_return_if_fail (histogram != NULL);
|
|
|
|
have_mask = gimp_drawable_mask_bounds (drawable, &x1, &y1, &x2, &y2);
|
|
|
|
if ((x1 == x2) || (y1 == y2))
|
|
return;
|
|
|
|
pixel_region_init (®ion, gimp_drawable_data (drawable),
|
|
x1, y1, (x2 - x1), (y2 - y1), FALSE);
|
|
|
|
if (have_mask)
|
|
{
|
|
GimpChannel *sel_mask;
|
|
GimpImage *gimage;
|
|
gint off_x, off_y;
|
|
|
|
gimage = gimp_item_get_image (GIMP_ITEM (drawable));
|
|
sel_mask = gimp_image_get_mask (gimage);
|
|
|
|
gimp_item_offsets (GIMP_ITEM (drawable), &off_x, &off_y);
|
|
pixel_region_init (&mask, gimp_drawable_data (GIMP_DRAWABLE (sel_mask)),
|
|
x1 + off_x, y1 + off_y, (x2 - x1), (y2 - y1), FALSE);
|
|
gimp_histogram_calculate (histogram, ®ion, &mask);
|
|
}
|
|
else
|
|
{
|
|
gimp_histogram_calculate (histogram, ®ion, NULL);
|
|
}
|
|
}
|