Changeset 10551

Timestamp:

Dec 8, 2006, 1:39:56 AM (20 years ago)

Author:

magnier

Message:

changed psVectorStats return to bool

Location:

trunk/psModules/src

Files:

• imcombine/pmImageCombine.c (modified) (5 diffs)
• objects/pmSource.c (modified) (3 diffs)

trunk/psModules/src/imcombine/pmImageCombine.c

@@ -8 +8 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.9 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-10-24 22:55:05 $
+ *  @version $Revision: 1.10 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-12-08 11:39:30 $
  *
  *  XXX: pmRejectPixels() has a known bug with the pmImageTransform() call.
@@ -189 +189 @@
                 // Combine all the pixels, using the specified stat.
 
-                stats = psVectorStats(stats, pixelData, pixelErrors, pixelMask, maskVal);
+                psVectorStats(stats, pixelData, pixelErrors, pixelMask, maskVal);
                 psF64 combinedPixel = psStatsGetValue(stats, statistic);
 
@@ -202 +202 @@
                 psS32 numRejects = 0;
                 for (psS32 im = 0 ; im < numImages ; im++) {
-                    stdevStats = psVectorStats(stdevStats, pixelData, pixelErrors, pixelMask, maskVal);
+                    psVectorStats(stdevStats, pixelData, pixelErrors, pixelMask, maskVal);
                     psF64 stdev = stdevStats->sampleStdev;
 
@@ -285 +285 @@
                 }
                 // Combine all the pixels, using the specified stat.
-                stats = psVectorStats(stats, pixelData, pixelErrors, pixelMask, maskVal);
+                psVectorStats(stats, pixelData, pixelErrors, pixelMask, maskVal);
                 combine->data.F32[row][col] = psStatsGetValue(stats, statistic);
             }
@@ -356 +356 @@
     // Get the median
     psStats *stats = psStatsAlloc(PS_STAT_SAMPLE_MEDIAN);
-    (void)psVectorStats(stats, pixels, NULL, mask, 1);
+    psVectorStats(stats, pixels, NULL, mask, 1);
     float median = stats->sampleMedian;
     psFree(stats);

trunk/psModules/src/objects/pmSource.c

@@ -6 +6 @@
  *  @author EAM, IfA: significant modifications.
  *
- *  @version $Revision: 1.20 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-12-01 22:05:51 $
+ *  @version $Revision: 1.21 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-12-08 11:39:56 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -367 +367 @@
         stats = psStatsAlloc (PS_STAT_CLIPPED_MEAN | PS_STAT_CLIPPED_STDEV);
 
-        stats = psVectorStats (stats, tmpSx, NULL, NULL, 0);
+        psVectorStats (stats, tmpSx, NULL, NULL, 0);
         psfClump.X  = stats->clippedMean;
         psfClump.dX = stats->clippedStdev;
 
-        stats = psVectorStats (stats, tmpSy, NULL, NULL, 0);
+        psVectorStats (stats, tmpSy, NULL, NULL, 0);
         psfClump.Y  = stats->clippedMean;
         psfClump.dY = stats->clippedStdev;
@@ -499 +499 @@
     psStats *stats  = NULL;
     stats = psStatsAlloc (PS_STAT_MIN | PS_STAT_MAX);
-    stats = psVectorStats (stats, starsn, NULL, NULL, 0);
+    psVectorStats (stats, starsn, NULL, NULL, 0);
+
     psLogMsg ("pmObjects", 3, "SN range: %f - %f\n", stats[0].min, stats[0].max);
     psFree (stats);