Changeset 10550 for trunk/psLib/src/imageops/psImageBackground.c

Timestamp:

Dec 8, 2006, 1:38:54 AM (19 years ago)

Author:

magnier

Message:

• moved psHistogram functions to psHistogram.c,h (pslib_strict.h, MAkefile.am, psMemory.c)
• changed psVectorStats return value to bool (psImageGeomManip.c, psImagePixelExtract.c, psImageStats.c, psMinPoly.c,
• added FITTED_MEAN,STDEV_V2 (quadratic fit to log-peak)
• added stats->results
• set stats->results when stats are measured
• return stats calculated even if not requested
• moved vectorFittedStats call out of vectorRobustStats to psVectorStats
• internal calls to private stats function XXX now tests stats->results for the corresponding flag, NOT if value of stats->XXX == NAN.
• dropped unused function NonEmpty (commented out)
• rolled up vectorSampleMedian with if tests in the loop
• rolled up vectorSampleStdev with if tests in the loop
• call psError on failure for any internal stats call (the user should call psErrorClear if they ignore errors from psVectorStats)

File:

• trunk/psLib/src/imageops/psImageBackground.c (modified) (2 diffs)

trunk/psLib/src/imageops/psImageBackground.c

@@ -73 +73 @@
         if (!psVectorSort(values, values)) {
             psError(PS_ERR_UNKNOWN, false, "Unable to sort values.\n");
-            psFree(stats);
             psFree(values);
-            return NULL;
+            return false;
         }
 
@@ -91 +90 @@
     } else {
         // XXX leave this as a psphot user option (passed in as part of stats?)
-        if (stats->options & PS_STAT_FITTED_MEAN) {
+        if ((stats->options & PS_STAT_FITTED_MEAN) || (stats->options & PS_STAT_FITTED_MEAN_V2)) {
             stats->clipSigma = 1.0;
         }
-        if (psVectorStats (stats, values, NULL, NULL, 0) == NULL) {
+        if (!psVectorStats (stats, values, NULL, NULL, 0)) {
             psError(PS_ERR_UNKNOWN, false, "Unable to measure statistics for image background "
                     "(%dx%d, (row0,col0) = (%d,%d)",
                     image->numRows, image->numCols, image->row0, image->col0);
-            psFree(stats);
             psFree(values);
-            return NULL;
+            return false;
         }
     }
 
     psFree(values);
-    return stats;
+    return true;
 }