Changeset 23989 for trunk/psModules/src/imcombine/pmImageCombine.c

Timestamp:

Apr 28, 2009, 11:21:56 AM (17 years ago)

Author:

eugene

Message:

always handle psVectorStats false return status (is an error); check for NAN results and handle as possible

File:

• trunk/psModules/src/imcombine/pmImageCombine.c (modified) (3 diffs)

trunk/psModules/src/imcombine/pmImageCombine.c

@@ -132 +132 @@
         // Combine all the pixels, using the specified stat.
         if (!psVectorStats(stats, pixelData, pixelErrors, pixelMasks, 0xff)) {
+            psError(PS_ERR_UNKNOWN, false, "failure to measure stats");
+            return false;
+        }
+        if (isnan(stats->sampleMean)) {
             combine->data.F32[y][x] = NAN;
             psFree(buffer);
@@ -137 +141 @@
         }
         float combinedPixel = stats->sampleMean; // Value of the combination
-
+        
         if (iter == 0) {
             // Save the value produced with no rejection, since it may be useful later
@@ -364 +368 @@
     // Get the median
     psStats *stats = psStatsAlloc(PS_STAT_SAMPLE_MEDIAN);
-    psVectorStats(stats, pixels, NULL, mask, 1);
+    if (!psVectorStats(stats, pixels, NULL, mask, 1)) {
+        psError(PS_ERR_UNKNOWN, false, "failure to measure stats");
+    }
     float median = stats->sampleMedian;
     psFree(stats);