Changeset 14772

Timestamp:

Sep 7, 2007, 10:18:03 AM (19 years ago)

Author:

magnier

Message:

adjusted api to optionally return a vector containing the subset pixel values

Location:

branches/eam_branch_20070830/psLib/src/imageops

Files:

• psImageBackground.c (modified) (2 diffs)
• psImageBackground.h (modified) (3 diffs)

branches/eam_branch_20070830/psLib/src/imageops/psImageBackground.c

@@ -18 +18 @@
 // XXX allow the user to choose the stats method?
 // (SAMPLE_MEAN, CLIPPED_MEAN, ROBUST_MEDIAN, FITTED_MEAN)
-bool psImageBackground(psStats *stats, const psImage *image, const psImage *mask, psMaskType maskValue, psRandom *rng)
+bool psImageBackground(psStats *stats, psVector **sample, const psImage *image, const psImage *mask, psMaskType maskValue, psRandom *rng)
 {
     PS_ASSERT_IMAGE_NON_NULL(image, NULL);
@@ -115 +115 @@
     }
 
-    psFree(values);
+    if (sample != NULL) {
+        *sample = values;
+    } else {
+        psFree(values);
+    }
     return true;
 }

branches/eam_branch_20070830/psLib/src/imageops/psImageBackground.h

@@ -5 +5 @@
  *  @author EAM, IfA
  *
- *  $Revision: 1.4 $ $Name: not supported by cvs2svn $
- *  $Date: 2007-01-23 22:47:23 $
+ *  $Revision: 1.4.12.1 $ $Name: not supported by cvs2svn $
+ *  $Date: 2007-09-07 20:18:03 $
  *  Copyright 2004-2005 IfA, University of Hawaii
  */
@@ -22 +22 @@
 // Get the background for an image
 bool psImageBackground(psStats *stats, // desired measurement and options
+                       psVector **sample, // vector of data used for analysis
                        const psImage *image, // Image for which to get the background
                        const psImage *mask, // Mask image
@@ -30 +31 @@
 /// @}
 #endif // #ifndef PS_IMAGE_BACKGROUND_H
+
+/* the user may supply a psVector ** or NULL to sample.  if a vector is supplied,
+   the user must free the resulting vector */