mirror of
https://gitlab.gnome.org/GNOME/gimp
synced 2024-10-20 19:43:01 +00:00
app: factor our more lowlevel GimpChannel code to GeglBuffer utils
This commit is contained in:
Michael Natterer
parent
75c9a0dc27
commit
ddc4a057e4
|
|
@ -31,6 +31,7 @@
|
|||
#include "paint/gimppaintoptions.h"
|
||||
|
||||
#include "gegl/gimp-gegl-apply-operation.h"
|
||||
#include "gegl/gimp-gegl-mask.h"
|
||||
#include "gegl/gimp-gegl-utils.h"
|
||||
|
||||
#include "gimp.h"
|
||||
|
|
@ -1094,10 +1095,7 @@ gimp_channel_real_bounds (GimpChannel *channel,
|
|||
gint *x2,
|
||||
gint *y2)
|
||||
{
|
||||
GeglBuffer *buffer;
|
||||
GeglBufferIterator *iter;
|
||||
GeglRectangle *roi;
|
||||
gint tx1, tx2, ty1, ty2;
|
||||
GeglBuffer *buffer;
|
||||
|
||||
/* if the channel's bounds have already been reliably calculated... */
|
||||
if (channel->bounds_known)
|
||||
|
|
@ -1110,130 +1108,32 @@ gimp_channel_real_bounds (GimpChannel *channel,
|
|||
return ! channel->empty;
|
||||
}
|
||||
|
||||
/* go through and calculate the bounds */
|
||||
tx1 = gimp_item_get_width (GIMP_ITEM (channel));
|
||||
ty1 = gimp_item_get_height (GIMP_ITEM (channel));
|
||||
tx2 = 0;
|
||||
ty2 = 0;
|
||||
|
||||
buffer = gimp_drawable_get_buffer (GIMP_DRAWABLE (channel));
|
||||
|
||||
iter = gegl_buffer_iterator_new (buffer, NULL, 0, babl_format ("Y float"),
|
||||
GEGL_BUFFER_READ, GEGL_ABYSS_NONE);
|
||||
roi = &iter->roi[0];
|
||||
channel->empty = ! gimp_gegl_mask_bounds (buffer, x1, y1, x2, y2);
|
||||
|
||||
while (gegl_buffer_iterator_next (iter))
|
||||
{
|
||||
gfloat *data = iter->data[0];
|
||||
gfloat *data1 = data;
|
||||
gint ex = roi->x + roi->width;
|
||||
gint ey = roi->y + roi->height;
|
||||
gint x, y;
|
||||
|
||||
/* only check the pixels if this tile is not fully within the
|
||||
* currently computed bounds
|
||||
*/
|
||||
if (roi->x < tx1 || ex > tx2 ||
|
||||
roi->y < ty1 || ey > ty2)
|
||||
{
|
||||
/* Check upper left and lower right corners to see if we can
|
||||
* avoid checking the rest of the pixels in this tile
|
||||
*/
|
||||
if (data[0] && data[iter->length - 1])
|
||||
{
|
||||
if (roi->x < tx1) tx1 = roi->x;
|
||||
if (ex > tx2) tx2 = ex;
|
||||
|
||||
if (roi->y < ty1) ty1 = roi->y;
|
||||
if (ey > ty2) ty2 = ey;
|
||||
}
|
||||
else
|
||||
{
|
||||
for (y = roi->y; y < ey; y++, data1 += roi->width)
|
||||
{
|
||||
for (x = roi->x, data = data1; x < ex; x++, data++)
|
||||
{
|
||||
if (*data)
|
||||
{
|
||||
gint minx = x;
|
||||
gint maxx = x;
|
||||
|
||||
for (; x < ex; x++, data++)
|
||||
if (*data)
|
||||
maxx = x;
|
||||
|
||||
if (minx < tx1) tx1 = minx;
|
||||
if (maxx > tx2) tx2 = maxx;
|
||||
|
||||
if (y < ty1) ty1 = y;
|
||||
if (y > ty2) ty2 = y;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
tx2 = CLAMP (tx2 + 1, 0, gimp_item_get_width (GIMP_ITEM (channel)));
|
||||
ty2 = CLAMP (ty2 + 1, 0, gimp_item_get_height (GIMP_ITEM (channel)));
|
||||
|
||||
if (tx1 == gimp_item_get_width (GIMP_ITEM (channel)) &&
|
||||
ty1 == gimp_item_get_height (GIMP_ITEM (channel)))
|
||||
{
|
||||
channel->empty = TRUE;
|
||||
channel->x1 = 0;
|
||||
channel->y1 = 0;
|
||||
channel->x2 = gimp_item_get_width (GIMP_ITEM (channel));
|
||||
channel->y2 = gimp_item_get_height (GIMP_ITEM (channel));
|
||||
}
|
||||
else
|
||||
{
|
||||
channel->empty = FALSE;
|
||||
channel->x1 = tx1;
|
||||
channel->y1 = ty1;
|
||||
channel->x2 = tx2;
|
||||
channel->y2 = ty2;
|
||||
}
|
||||
channel->x1 = *x1;
|
||||
channel->y1 = *y1;
|
||||
channel->x2 = *x2;
|
||||
channel->y2 = *y2;
|
||||
|
||||
channel->bounds_known = TRUE;
|
||||
|
||||
*x1 = channel->x1;
|
||||
*x2 = channel->x2;
|
||||
*y1 = channel->y1;
|
||||
*y2 = channel->y2;
|
||||
|
||||
return ! channel->empty;
|
||||
}
|
||||
|
||||
static gboolean
|
||||
gimp_channel_real_is_empty (GimpChannel *channel)
|
||||
{
|
||||
GeglBuffer *buffer;
|
||||
GeglBufferIterator *iter;
|
||||
GeglBuffer *buffer;
|
||||
|
||||
if (channel->bounds_known)
|
||||
return channel->empty;
|
||||
|
||||
buffer = gimp_drawable_get_buffer (GIMP_DRAWABLE (channel));
|
||||
|
||||
iter = gegl_buffer_iterator_new (buffer, NULL, 0, babl_format ("Y float"),
|
||||
GEGL_BUFFER_READ, GEGL_ABYSS_NONE);
|
||||
|
||||
while (gegl_buffer_iterator_next (iter))
|
||||
{
|
||||
gfloat *data = iter->data[0];
|
||||
gint i;
|
||||
|
||||
for (i = 0; i < iter->length; i++)
|
||||
{
|
||||
if (data[i])
|
||||
{
|
||||
gegl_buffer_iterator_stop (iter);
|
||||
|
||||
return FALSE;
|
||||
}
|
||||
}
|
||||
}
|
||||
if (! gimp_gegl_mask_is_empty (buffer))
|
||||
return FALSE;
|
||||
|
||||
/* The mask is empty, meaning we can set the bounds as known */
|
||||
if (channel->segs_in)
|
||||
|
|
|
|||
|
|
@ -30,6 +30,8 @@ libappgegl_a_sources = \
|
|||
gimp-gegl-config-proxy.h \
|
||||
gimp-gegl-loops.c \
|
||||
gimp-gegl-loops.h \
|
||||
gimp-gegl-mask.c \
|
||||
gimp-gegl-mask.h \
|
||||
gimp-gegl-mask-combine.c \
|
||||
gimp-gegl-mask-combine.h \
|
||||
gimp-gegl-nodes.c \
|
||||
|
|
|
|||
155
app/gegl/gimp-gegl-mask.c
Normal file
155
app/gegl/gimp-gegl-mask.c
Normal file
|
|
@ -0,0 +1,155 @@
|
|||
/* 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 "gimp-gegl-types.h"
|
||||
|
||||
#include "gegl/gimp-gegl-mask.h"
|
||||
|
||||
|
||||
gboolean
|
||||
gimp_gegl_mask_bounds (GeglBuffer *buffer,
|
||||
gint *x1,
|
||||
gint *y1,
|
||||
gint *x2,
|
||||
gint *y2)
|
||||
{
|
||||
GeglBufferIterator *iter;
|
||||
GeglRectangle *roi;
|
||||
gint tx1, tx2, ty1, ty2;
|
||||
|
||||
g_return_val_if_fail (GEGL_IS_BUFFER (buffer), FALSE);
|
||||
g_return_val_if_fail (x1 != NULL, FALSE);
|
||||
g_return_val_if_fail (y1 != NULL, FALSE);
|
||||
g_return_val_if_fail (x2 != NULL, FALSE);
|
||||
g_return_val_if_fail (y2 != NULL, FALSE);
|
||||
|
||||
/* go through and calculate the bounds */
|
||||
tx1 = gegl_buffer_get_width (buffer);
|
||||
ty1 = gegl_buffer_get_height (buffer);
|
||||
tx2 = 0;
|
||||
ty2 = 0;
|
||||
|
||||
iter = gegl_buffer_iterator_new (buffer, NULL, 0, babl_format ("Y float"),
|
||||
GEGL_BUFFER_READ, GEGL_ABYSS_NONE);
|
||||
roi = &iter->roi[0];
|
||||
|
||||
while (gegl_buffer_iterator_next (iter))
|
||||
{
|
||||
gfloat *data = iter->data[0];
|
||||
gfloat *data1 = data;
|
||||
gint ex = roi->x + roi->width;
|
||||
gint ey = roi->y + roi->height;
|
||||
gint x, y;
|
||||
|
||||
/* only check the pixels if this tile is not fully within the
|
||||
* currently computed bounds
|
||||
*/
|
||||
if (roi->x < tx1 || ex > tx2 ||
|
||||
roi->y < ty1 || ey > ty2)
|
||||
{
|
||||
/* Check upper left and lower right corners to see if we can
|
||||
* avoid checking the rest of the pixels in this tile
|
||||
*/
|
||||
if (data[0] && data[iter->length - 1])
|
||||
{
|
||||
if (roi->x < tx1) tx1 = roi->x;
|
||||
if (ex > tx2) tx2 = ex;
|
||||
|
||||
if (roi->y < ty1) ty1 = roi->y;
|
||||
if (ey > ty2) ty2 = ey;
|
||||
}
|
||||
else
|
||||
{
|
||||
for (y = roi->y; y < ey; y++, data1 += roi->width)
|
||||
{
|
||||
for (x = roi->x, data = data1; x < ex; x++, data++)
|
||||
{
|
||||
if (*data)
|
||||
{
|
||||
gint minx = x;
|
||||
gint maxx = x;
|
||||
|
||||
for (; x < ex; x++, data++)
|
||||
if (*data)
|
||||
maxx = x;
|
||||
|
||||
if (minx < tx1) tx1 = minx;
|
||||
if (maxx > tx2) tx2 = maxx;
|
||||
|
||||
if (y < ty1) ty1 = y;
|
||||
if (y > ty2) ty2 = y;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
tx2 = CLAMP (tx2 + 1, 0, gegl_buffer_get_width (buffer));
|
||||
ty2 = CLAMP (ty2 + 1, 0, gegl_buffer_get_height (buffer));
|
||||
|
||||
if (tx1 == gegl_buffer_get_width (buffer) &&
|
||||
ty1 == gegl_buffer_get_height (buffer))
|
||||
{
|
||||
*x1 = 0;
|
||||
*y1 = 0;
|
||||
*x2 = gegl_buffer_get_width (buffer);
|
||||
*y2 = gegl_buffer_get_height (buffer);
|
||||
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
*x1 = tx1;
|
||||
*y1 = ty1;
|
||||
*x2 = tx2;
|
||||
*y2 = ty2;
|
||||
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
gboolean
|
||||
gimp_gegl_mask_is_empty (GeglBuffer *buffer)
|
||||
{
|
||||
GeglBufferIterator *iter;
|
||||
|
||||
g_return_val_if_fail (GEGL_IS_BUFFER (buffer), FALSE);
|
||||
|
||||
iter = gegl_buffer_iterator_new (buffer, NULL, 0, babl_format ("Y float"),
|
||||
GEGL_BUFFER_READ, GEGL_ABYSS_NONE);
|
||||
|
||||
while (gegl_buffer_iterator_next (iter))
|
||||
{
|
||||
gfloat *data = iter->data[0];
|
||||
gint i;
|
||||
|
||||
for (i = 0; i < iter->length; i++)
|
||||
{
|
||||
if (data[i])
|
||||
{
|
||||
gegl_buffer_iterator_stop (iter);
|
||||
|
||||
return FALSE;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return TRUE;
|
||||
}
|
||||
30
app/gegl/gimp-gegl-mask.h
Normal file
30
app/gegl/gimp-gegl-mask.h
Normal file
|
|
@ -0,0 +1,30 @@
|
|||
/* 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_GEGL_MASK_H__
|
||||
#define __GIMP_GEGL_MASK_H__
|
||||
|
||||
|
||||
gboolean gimp_gegl_mask_bounds (GeglBuffer *buffer,
|
||||
gint *x1,
|
||||
gint *y1,
|
||||
gint *x2,
|
||||
gint *y2);
|
||||
gboolean gimp_gegl_mask_is_empty (GeglBuffer *buffer);
|
||||
|
||||
|
||||
#endif /* __GIMP_GEGL_MASK_H__ */
|
||||
Loading…
Reference in a new issue