Changeset 20211

Timestamp:

Oct 16, 2008, 3:32:49 PM (18 years ago)

Author:

Paul Price

Message:

Adding parameter to psImageSmoothMask to control acceptance of masked regions.

Location:

trunk/psLib/src/imageops

Files:

• psImageConvolve.c (modified) (5 diffs)
• psImageConvolve.h (modified) (2 diffs)

trunk/psLib/src/imageops/psImageConvolve.c

@@ -7 +7 @@
 /// @author Eugene Magnier, IfA
 ///
-/// @version $Revision: 1.77 $ $Name: not supported by cvs2svn $
-/// @date $Date: 2008-10-04 02:37:51 $
+/// @version $Revision: 1.78 $ $Name: not supported by cvs2svn $
+/// @date $Date: 2008-10-17 01:32:49 $
 ///
 /// Copyright 2004-2007 Institute for Astronomy, University of Hawaii
@@ -466 +466 @@
 }
 
-bool psImageSmooth (psImage *image,
-                    double  sigma,
-                    double  Nsigma)
+bool psImageSmooth(psImage *image,
+                   double  sigma,
+                   double  Nsigma)
 {
     PS_ASSERT_IMAGE_NON_NULL(image, NULL);
@@ -670 +670 @@
                 sumG += *gaussData; \
             } \
-            if (sumG > MIN_GAUSS_FRAC) { \
+            if (sumG > minGauss) { \
                 /* BW */ \
                 calculation->data.TYPE[i][j] = sumIG / sumG; \
@@ -700 +700 @@
                 sumG += *gaussData; \
             } \
-            output->data.TYPE[j][i] = (sumG > MIN_GAUSS_FRAC) ? sumIG / sumG : NAN; \
+            output->data.TYPE[j][i] = (sumG > minGauss) ? sumIG / sumG : NAN; \
         } \
     } \
@@ -717 +717 @@
                            const psImage *mask,
                            psMaskType maskVal,
-                           double sigma,
-                           double numSigma)
+                           float sigma,
+                           float numSigma,
+                           float minGauss)
 {
     PS_ASSERT_IMAGE_NON_NULL(image, NULL);

trunk/psLib/src/imageops/psImageConvolve.h

@@ -5 +5 @@
  * @author Robert DeSonia, MHPCC
  *
- * @version $Revision: 1.35 $ $Name: not supported by cvs2svn $
- * @date $Date: 2008-10-04 02:37:51 $
+ * @version $Revision: 1.36 $ $Name: not supported by cvs2svn $
+ * @date $Date: 2008-10-17 01:32:49 $
  * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
  */
@@ -202 +202 @@
     const psImage *mask,                ///< Mask image
     psMaskType maskVal,                 ///< Mask value
-    double sigma,                       ///< Width of the smoothing kernel (pixels)
-    double numSigma                     ///< Size of the smoothing box (sigma)
+    float sigma,                        ///< Width of the smoothing kernel (pixels)
+    float numSigma,                     ///< Size of the smoothing box (sigma)
+    float minGauss                      ///< Minimum fraction of Gaussian to accept
     );