[gegl] gblur-1d: remove now unneeded rect scaling code
- From: Øyvind Kolås <ok src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gegl] gblur-1d: remove now unneeded rect scaling code
- Date: Fri, 24 Feb 2017 17:27:13 +0000 (UTC)
commit 7a495a9d99bb2341026f379f4c5062b2aeabe2a9
Author: Øyvind Kolås <pippin gimp org>
Date: Fri Feb 24 16:02:00 2017 +0100
gblur-1d: remove now unneeded rect scaling code
operations/common/gblur-1d.c | 33 ++++-----------------------------
1 files changed, 4 insertions(+), 29 deletions(-)
---
diff --git a/operations/common/gblur-1d.c b/operations/common/gblur-1d.c
index cd48283..b3c69a5 100644
--- a/operations/common/gblur-1d.c
+++ b/operations/common/gblur-1d.c
@@ -211,26 +211,20 @@ iir_young_hor_blur (GeglBuffer *src,
const gint nc = babl_format_get_n_components (format);
gfloat *row = g_new (gfloat, (3 + rect->width + 3) * nc);
gdouble *tmp = g_new (gdouble, (3 + rect->width + 3));
- GeglRectangle cur_row_scaled;
gint v;
cur_row.height = 1;
- cur_row_scaled.x = cur_row.x << level;
- cur_row_scaled.y = cur_row.y << level;
- cur_row_scaled.width = cur_row.width << level;
- cur_row_scaled.height = cur_row.height << level;
for (v = 0; v < rect->height; v++)
{
cur_row.y = rect->y + v;
- cur_row_scaled.y = cur_row.y << level;
gegl_buffer_get (src, &cur_row, 1.0/(1<<level), format, &row[3 * nc],
GEGL_AUTO_ROWSTRIDE, GEGL_ABYSS_NONE);
iir_young_blur_1D (row, tmp, b, m, rect->width, nc, policy);
- gegl_buffer_set (dst, &cur_row_scaled, level, format, &row[3 * nc],
+ gegl_buffer_set (dst, &cur_row, level, format, &row[3 * nc],
GEGL_AUTO_ROWSTRIDE);
}
@@ -252,26 +246,20 @@ iir_young_ver_blur (GeglBuffer *src,
const gint nc = babl_format_get_n_components (format);
gfloat *col = g_new (gfloat, (3 + rect->height + 3) * nc);
gdouble *tmp = g_new (gdouble, (3 + rect->height + 3));
- GeglRectangle cur_col_scaled;
gint i;
cur_col.width = 1;
- cur_col_scaled.x = cur_col.x << level;
- cur_col_scaled.y = cur_col.y << level;
- cur_col_scaled.width = cur_col.width << level;
- cur_col_scaled.height = cur_col.height << level;
for (i = 0; i < rect->width; i++)
{
cur_col.x = rect->x + i;
- cur_col_scaled.x = cur_col.x << level;
gegl_buffer_get (src, &cur_col, 1.0/(1<<level), format, &col[3 * nc],
GEGL_AUTO_ROWSTRIDE, GEGL_ABYSS_NONE);
iir_young_blur_1D (col, tmp, b, m, rect->height, nc, policy);
- gegl_buffer_set (dst, &cur_col_scaled, level, format, &col[3 * nc],
+ gegl_buffer_set (dst, &cur_col, level, format, &col[3 * nc],
GEGL_AUTO_ROWSTRIDE);
}
@@ -323,7 +311,6 @@ fir_hor_blur (GeglBuffer *src,
gint level)
{
GeglRectangle cur_row = *rect;
- GeglRectangle cur_row_scaled;
GeglRectangle in_row;
const gint nc = babl_format_get_n_components (format);
gfloat *row;
@@ -331,10 +318,6 @@ fir_hor_blur (GeglBuffer *src,
gint v;
cur_row.height = 1;
- cur_row_scaled.x = cur_row.x << level;
- cur_row_scaled.y = cur_row.y << level;
- cur_row_scaled.width = cur_row.width << level;
- cur_row_scaled.height = cur_row.height << level;
in_row = cur_row;
in_row.width += clen - 1;
@@ -346,13 +329,12 @@ fir_hor_blur (GeglBuffer *src,
for (v = 0; v < rect->height; v++)
{
cur_row.y = in_row.y = rect->y + v;
- cur_row_scaled.y = cur_row.y << level;
gegl_buffer_get (src, &in_row, 1.0/(1<<level), format, row, GEGL_AUTO_ROWSTRIDE, policy);
fir_blur_1D (row, out, cmatrix, clen, rect->width, nc);
- gegl_buffer_set (dst, &cur_row_scaled, level, format, out, GEGL_AUTO_ROWSTRIDE);
+ gegl_buffer_set (dst, &cur_row, level, format, out, GEGL_AUTO_ROWSTRIDE);
}
gegl_free (out);
@@ -371,7 +353,6 @@ fir_ver_blur (GeglBuffer *src,
{
GeglRectangle cur_col = *rect;
GeglRectangle in_col;
- GeglRectangle cur_col_scaled;
const gint nc = babl_format_get_n_components (format);
gfloat *col;
gfloat *out;
@@ -383,24 +364,18 @@ fir_ver_blur (GeglBuffer *src,
in_col.height += clen - 1;
in_col.y -= clen / 2;
- cur_col_scaled.x = cur_col.x << level;
- cur_col_scaled.y = cur_col.y << level;
- cur_col_scaled.width = cur_col.width << level;
- cur_col_scaled.height = cur_col.height << level;
-
col = gegl_malloc (sizeof (gfloat) * in_col.height * nc);
out = gegl_malloc (sizeof (gfloat) * cur_col.height * nc);
for (v = 0; v < rect->width; v++)
{
cur_col.x = in_col.x = rect->x + v;
- cur_col_scaled.x = cur_col.x << level;
gegl_buffer_get (src, &in_col, 1.0/(1<<level), format, col, GEGL_AUTO_ROWSTRIDE, policy);
fir_blur_1D (col, out, cmatrix, clen, rect->height, nc);
- gegl_buffer_set (dst, &cur_col_scaled, level, format, out, GEGL_AUTO_ROWSTRIDE);
+ gegl_buffer_set (dst, &cur_col, level, format, out, GEGL_AUTO_ROWSTRIDE);
}
gegl_free (out);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]