Changeset 15706 for trunk/psModules/src/objects/pmSource.c

Timestamp:

Nov 27, 2007, 2:53:42 PM (18 years ago)

Author:

Paul Price

Message:

Cleaning up mask iteration for easier maintenance.

File:

• trunk/psModules/src/objects/pmSource.c (modified) (5 diffs)

trunk/psModules/src/objects/pmSource.c

@@ -6 +6 @@
  *  @author EAM, IfA: significant modifications.
  *
- *  @version $Revision: 1.44 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2007-11-27 23:51:26 $
+ *  @version $Revision: 1.45 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2007-11-28 00:53:42 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -700 +700 @@
 
         for (psS32 col = 0; col < source->pixels->numCols ; col++, vPix++, vWgt++) {
-            if ((vMsk != NULL) && *vMsk) {
+            if (vMsk) {
+                if (*vMsk) {
+                    vMsk++;
+                    continue;
+                }
                 vMsk++;
-                continue;
             }
 
@@ -710 +713 @@
             // radius is just a function of (xDiff, yDiff)
             if (!VALID_RADIUS(xDiff, yDiff, R2)) {
-                if (vMsk != NULL)
-                    vMsk++;
                 continue;
             }
@@ -721 +722 @@
             // XXX EAM : should this limit be user-defined?
             if (PS_SQR(pDiff) < wDiff) {
-                if (vMsk != NULL)
-                    vMsk++;
                 continue;
             }
@@ -741 +740 @@
             peakPixel = PS_MAX (*vPix, peakPixel);
             numPixels++;
-            if (vMsk != NULL)
-                vMsk++;
         }
     }