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

Timestamp:

Nov 29, 2006, 7:51:05 AM (19 years ago)

Author:

rhl

Message:

1/ Make psImageBackground interpret nMax == 0 as "all pixels"
2/ Make psImageBackground propagate errors in psVectorStats

File:

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

trunk/psLib/src/imageops/psImageBackground.c

@@ -26 +26 @@
     PS_ASSERT_FLOAT_LESS_THAN_OR_EQUAL(fmin, 1.0, NULL);
     PS_ASSERT_FLOAT_LESS_THAN_OR_EQUAL(fmax, 1.0, NULL);
-    PS_ASSERT_INT_POSITIVE(nMax, NULL);
+    PS_ASSERT_INT_NONNEGATIVE(nMax, NULL);
     PS_ASSERT_PTR_NON_NULL(rng, NULL);
 
@@ -33 +33 @@
     long ny = image->numRows;
 
-    int Nsubset = PS_MIN(nMax, nx*ny);  // Number of pixels in nubset
-    int Npixels = nx*ny;                // Total number of pixels
+    const int Npixels = nx*ny;                // Total number of pixels
+    const int Nsubset = (nMax == 0) ? Npixels : PS_MIN(nMax, Npixels); // Number of pixels in subset
 
     psVector *values = psVectorAllocEmpty(Nsubset, PS_TYPE_F32); // Vector containing subsample
@@ -95 +95 @@
             stats->clipSigma = 1.0;
         }
-        psVectorStats (stats, values, NULL, NULL, 0);
+        if (psVectorStats (stats, values, NULL, NULL, 0) == NULL) {
+            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;
+        }
     }