Changeset 15958

Timestamp:

Dec 30, 2007, 5:02:08 PM (18 years ago)

Author:

eugene

Message:

need to exclude mostly-masked pixels, use nan as a sentinel

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.60 $ $Name: not supported by cvs2svn $
-/// @date $Date: 2007-11-02 03:23:46 $
+/// @version $Revision: 1.61 $ $Name: not supported by cvs2svn $
+/// @date $Date: 2007-12-31 03:02:08 $
 ///
 /// Copyright 2004-2007 Institute for Astronomy, University of Hawaii
@@ -826 +826 @@
                 g += *sg;
             }
-            *vo = (g > 0) ? s / g : 0.0;
+            *vo = (g > 0.25) ? s / g : NAN;
         }
         memcpy(image->data.F32[j], calculation->data.F32, Nx*sizeof(psF32));
     }
     psFree(calculation);
+
+    // XXX test
+    if (0) {
+        psFree(gaussnorm);
+        return true;
+    }
 
     /** Smooth in Y direction  **/
@@ -855 +861 @@
             double g = gauss[n - j];
             for (int i = 0; i < Nx; i++, vi++, vo++, vm++, vs++) {
-                if (*vm & maskVal)
-                    continue;
+                if (*vm & maskVal) continue;
+                if (!isfinite(*vi)) continue;
                 *vo += *vi * g;
                 *vs += g;
@@ -865 +871 @@
         psF32 *vs = outsum->data.F32;
         for (int i = 0; i < Nx; i++, vo++, vs++) {
-            *vo = (*vs > 0) ? *vo / *vs : 0.0;
+            *vo = (*vs > 0.25) ? *vo / *vs : NAN;
         }