Changeset 17302 for trunk/psLib/src/imageops/psImageConvolve.c

Timestamp:

Apr 2, 2008, 5:00:25 PM (18 years ago)

Author:

Paul Price

Message:

Optimisation: using memcpy instead of copying each pixel.

File:

• trunk/psLib/src/imageops/psImageConvolve.c (modified) (4 diffs)

trunk/psLib/src/imageops/psImageConvolve.c

@@ -7 +7 @@
 /// @author Eugene Magnier, IfA
 ///
-/// @version $Revision: 1.61 $ $Name: not supported by cvs2svn $
-/// @date $Date: 2007-12-31 03:02:08 $
+/// @version $Revision: 1.62 $ $Name: not supported by cvs2svn $
+/// @date $Date: 2008-04-03 03:00:25 $
 ///
 /// Copyright 2004-2007 Institute for Astronomy, University of Hawaii
@@ -420 +420 @@
     psImage *paddedImage = psImageAlloc(paddedCols,paddedRows,in->type.type); // Padded input image
     if (mask && maskVal) {
+        // Need to replace non-finite (assumed masked) pixels, since they propagate everywhere during FFT
         for (int y = 0; y < numRows; y++) {
             for (int x = 0; x < numCols; x++) {
@@ -454 +455 @@
     for (int y = PS_MIN(-1, yMin); y <= PS_MIN(-1, yMax); y++) {
         // y is negative
-        for (int x = PS_MIN(-1, xMin); x <= PS_MIN(-1, xMax); x++) {
+        if (xMin < 0) {
             // x is negative
-            paddedKernel->data.F32[paddedRows + y][paddedCols + x] = kernel->kernel[y][x];
-        }
-        for (int x = PS_MAX(0, xMin); x <= PS_MAX(0, xMax); x++) {
+            memcpy(&paddedKernel->data.F32[paddedRows + y][paddedCols + xMin], &kernel->kernel[y][xMin],
+                   (PS_MIN(0, xMax) - xMin) * PSELEMTYPE_SIZEOF(PS_TYPE_F32));
+        }
+        if (xMax >= 0) {
             // x is positive
-            paddedKernel->data.F32[paddedRows + y][x] = kernel->kernel[y][x];
+            int min = PS_MAX(0, xMin);  // Minimum value of x when positive
+            memcpy(&paddedKernel->data.F32[paddedRows + y][min], &kernel->kernel[y][min],
+                   (xMax - min + 1) * PSELEMTYPE_SIZEOF(PS_TYPE_F32));
         }
     }
     for (int y = PS_MAX(0, yMin); y <= PS_MAX(0, yMax); y++) {
         // y is positive
-        for (int x = PS_MIN(-1, xMin); x <= PS_MIN(-1, xMax); x++) {
+        if (xMin < 0) {
             // x is negative
-            paddedKernel->data.F32[y][paddedCols + x] = kernel->kernel[y][x];
-        }
-        for (int x = PS_MAX(0, xMin); x <= PS_MAX(0, xMax); x++) {
+            memcpy(&paddedKernel->data.F32[y][paddedCols + xMin], &kernel->kernel[y][xMin],
+                   (PS_MIN(0, xMax) - xMin) * PSELEMTYPE_SIZEOF(PS_TYPE_F32));
+        }
+        if (xMax >= 0) {
             // x is positive
-            paddedKernel->data.F32[y][x] = kernel->kernel[y][x];
+            int min = PS_MAX(0, xMin);  // Minimum value of x when positive
+            memcpy(&paddedKernel->data.F32[y][min], &kernel->kernel[y][min],
+                   (xMax - min + 1) * PSELEMTYPE_SIZEOF(PS_TYPE_F32));
         }
     }
@@ -834 +841 @@
     // XXX test
     if (0) {
-        psFree(gaussnorm);
-        return true;
+        psFree(gaussnorm);
+        return true;
     }