Changeset 2802

Timestamp:

08/29/08 02:03:50 (5 years ago)

Author:

sam

Message:

• blur.c: support wrap around images in box blur (it's actually support for non-wrap-around images; wrap around was the default behaviour).

File:

• libpipi/trunk/pipi/filter/blur.c (modified) (7 diffs)

libpipi/trunk/pipi/filter/blur.c

@@ -29 +29 @@
 
 #if !defined TEMPLATE_FILE /* This file uses the template system */
-#define TEMPLATE_FLAGS SET_FLAG_GRAY
+#define TEMPLATE_FLAGS SET_FLAG_GRAY | SET_FLAG_WRAP
 #define TEMPLATE_FILE "filter/blur.c"
 #include "pipi_template.h"
@@ -132 +132 @@
 pipi_image_t *pipi_box_blur_ext(pipi_image_t *src, int m, int n)
 {
-    if(src->last_modified == PIPI_PIXELS_Y_F)
-        return boxblur_gray(src, m, n);
-
-    return boxblur(src, m, n);
+    if(src->wrap)
+    {
+        if(src->last_modified == PIPI_PIXELS_Y_F)
+            return boxblur_gray_wrap(src, m, n);
+
+        return boxblur_wrap(src, m, n);
+    }
+    else
+    {
+        if(src->last_modified == PIPI_PIXELS_Y_F)
+            return boxblur_gray(src, m, n);
+
+        return boxblur(src, m, n);
+    }
 }
 
 #else /* XXX: the following functions use the template system */
 
-/* FIXME: FLAG_WRAP */
 static pipi_image_t *SUFFIX(boxblur)(pipi_image_t *src, int m, int n)
 {
@@ -147 +156 @@
     float *srcdata, *dstdata;
     double *acc;
-    int x, y, w, h, i, j, size;
+    int x, y, w, h, i, j, i2, j2, size;
 
     w = src->w;
@@ -172 +181 @@
         for(j = -n; j <= n; j++)
         {
-            int j2 = (j < 0) ? h - 1 - ((-j - 1) % h) : j % h;
+            if(FLAG_WRAP)
+                j2 = (j < 0) ? h - 1 - ((-j - 1) % h) : j % h;
+            else
+                j2 = (j < 0) ? 0 : (j >= h) ? h - 1 : j;
+
             if(FLAG_GRAY)
                 t += srcdata[j2 * w + x];
@@ -204 +217 @@
         for(i = -m; i <= m; i++)
         {
-            int i2 = (i < 0) ? w - 1 - ((-i - 1) % w) : i % w;
+            if(FLAG_WRAP)
+                i2 = (i < 0) ? w - 1 - ((-i - 1) % w) : i % w;
+            else
+                i2 = (i < 0) ? 0 : (i >= w) ? w - 1 : i;
 
             if(FLAG_GRAY)
@@ -235 +251 @@
 
             u = x - m;
-            u2 = (u < 0) ? w - 1 - ((-u - 1) % w) : u % w;
+            if(FLAG_WRAP)
+                u2 = (u < 0) ? w - 1 - ((-u - 1) % w) : u % w;
+            else
+                u2 = (u < 0) ? 0 : (u >= w) ? w - 1 : u;
             v = x + m + 1;
-            v2 = (v < 0) ? w - 1 - ((-v - 1) % w) : v % w;
+            if(FLAG_WRAP)
+                v2 = (v < 0) ? w - 1 - ((-v - 1) % w) : v % w;
+            else
+                v2 = (v < 0) ? 0 : (v >= w) ? w - 1 : v;
             if(FLAG_GRAY)
             {
@@ -257 +279 @@
 
             u = y - n;
-            u2 = (u < 0) ? w - 1 - ((-u - 1) % w) : u % w;
+            if(FLAG_WRAP)
+                u2 = (u < 0) ? w - 1 - ((-u - 1) % w) : u % w;
+            else
+                u2 = (u < 0) ? 0 : (u >= w) ? w - 1 : u;
             v = y + n + 1;
-            v2 = (v < 0) ? w - 1 - ((-v - 1) % w) : v % w;
+            if(FLAG_WRAP)
+                v2 = (v < 0) ? w - 1 - ((-v - 1) % w) : v % w;
+            else
+                v2 = (v < 0) ? 0 : (v >= w) ? w - 1 : v;
             if(FLAG_GRAY)
             {