Changeset 11759 for trunk/psLib/src/imageops

Timestamp:

Feb 12, 2007, 5:01:24 PM (20 years ago)

Author:

Paul Price

Message:

Fixing bug 843 by modifying functions that (unnecessarily) returned an input to return a bool.

Location:

trunk/psLib/src/imageops

Files:

• psImageStats.c (modified) (10 diffs)
• psImageStats.h (modified) (4 diffs)

trunk/psLib/src/imageops/psImageStats.c

@@ -9 +9 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.103 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2007-01-09 22:38:52 $
+ *  @version $Revision: 1.104 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2007-02-13 03:01:23 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -44 +44 @@
 order to do so, we create dummy psVectors and set their "data" pointer to that
 of the input psImages.
- 
+
 XXX: use static psVectors
- 
+
 XXX: optimize this.  2k vs 4k, sample mean, takes8 seconds on Gene's machine.
 Should take .2.
  *****************************************************************************/
-psStats* psImageStats(psStats* stats,
+bool psImageStats(psStats* stats,
                       const psImage* in,
                       const psImage* mask,
@@ -58 +58 @@
     psVector *junkMask = NULL;
 
-    PS_ASSERT_PTR_NON_NULL(stats, NULL);
-    PS_ASSERT_INT_NONZERO(stats->options, NULL);
-    PS_ASSERT_IMAGE_NON_NULL(in, NULL)
+    PS_ASSERT_PTR_NON_NULL(stats, false);
+    PS_ASSERT_INT_NONZERO(stats->options, false);
+    PS_ASSERT_IMAGE_NON_NULL(in, false)
     if (mask != NULL) {
-        PS_ASSERT_IMAGE_TYPE(mask, PS_TYPE_U8, NULL);
-        PS_ASSERT_IMAGES_SIZE_EQUAL(in, mask, NULL);
+        PS_ASSERT_IMAGE_TYPE(mask, PS_TYPE_U8, false);
+        PS_ASSERT_IMAGES_SIZE_EQUAL(in, mask, false);
     }
 
@@ -116 +116 @@
     psFree(junkMask);
     psFree(junkData);
-    return(stats);
+    return true;
 }
 
@@ -123 +123 @@
 and initialized.
  *****************************************************************************/
-psHistogram* psImageHistogram(psHistogram* out,
+bool psImageHistogram(psHistogram* out,
                               const psImage* in,
                               const psImage* mask,
                               psMaskType maskVal)
 {
-    PS_ASSERT_PTR_NON_NULL(out, NULL);
-    PS_ASSERT_PTR_NON_NULL(in, NULL);
+    PS_ASSERT_PTR_NON_NULL(out, false);
+    PS_ASSERT_PTR_NON_NULL(in, false);
     if (mask != NULL) {
-        PS_ASSERT_IMAGE_TYPE(mask, PS_TYPE_U8, NULL);
-        PS_ASSERT_IMAGES_SIZE_EQUAL(in, mask, NULL);
+        PS_ASSERT_IMAGE_TYPE(mask, PS_TYPE_U8, false);
+        PS_ASSERT_IMAGES_SIZE_EQUAL(in, mask, false);
     }
     psVector* junkData = NULL;
@@ -188 +188 @@
     psFree(junkData);
 
-    return (out);
+    return true;
 }
 
@@ -197 +197 @@
 0:512 to -1:1.  This routine takes as input an integer N and produces as
 output a vector of evenly spaced floating point values between -1.0:1.0.
- 
+
 XXX: Use the p_psNormalizeVector here?
  *****************************************************************************/
-double* calcScaleFactors(psS32 n)
+static double* calcScaleFactors(psS32 n)
 {
     PS_ASSERT_INT_NONNEGATIVE(n, NULL);
@@ -235 +235 @@
         over all pixels (x,y) in the image.
   *****************************************************************************/
-psPolynomial2D* psImageFitPolynomial(psPolynomial2D* coeffs,
+bool psImageFitPolynomial(psPolynomial2D* coeffs,
                                      const psImage* input)
 {
-    PS_ASSERT_IMAGE_NON_NULL(input, NULL);
-    PS_ASSERT_IMAGE_NON_EMPTY(input, NULL);
+    PS_ASSERT_IMAGE_NON_NULL(input, false);
+    PS_ASSERT_IMAGE_NON_EMPTY(input, false);
     if ((input->type.type != PS_TYPE_S8) &&
             (input->type.type != PS_TYPE_U16) &&
@@ -245 +245 @@
             (input->type.type != PS_TYPE_F64)) {
         psError(PS_ERR_BAD_PARAMETER_TYPE, true, "Unallowable image type.\n");
-    }
-    PS_ASSERT_POLY_NON_NULL(coeffs, NULL);
-    PS_ASSERT_POLY_TYPE(coeffs, PS_POLYNOMIAL_CHEB, NULL);
+        return false;
+    }
+    PS_ASSERT_POLY_NON_NULL(coeffs, false);
+    PS_ASSERT_POLY_TYPE(coeffs, PS_POLYNOMIAL_CHEB, false);
     psS32 x = 0;
     psS32 y = 0;
@@ -338 +339 @@
     psFree(rScalingFactors);
 
-    return (coeffs);
+    return true;
 }
 

trunk/psLib/src/imageops/psImageStats.h

@@ -9 +9 @@
  * @author GLG, MHPCC
  *
- * @version $Revision: 1.30 $ $Name: not supported by cvs2svn $
- * @date $Date: 2007-01-23 22:47:23 $
+ * @version $Revision: 1.31 $ $Name: not supported by cvs2svn $
+ * @date $Date: 2007-02-13 03:01:23 $
  * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
  */
@@ -36 +36 @@
  *  psF64.
  *
- *  @return psStats*    the resulting statistics result(s)
+ *  @return bool   Successful operation?
  */
-psStats* psImageStats(
+bool psImageStats(
     psStats* stats,                    ///< defines statistics to be calculated
     const psImage* in,                 ///< image (or subimage) to calculate stats
@@ -51 +51 @@
  *  psS8, psU16, psF32, psF64.
  *
- *  @return psHistogram*     the resulting histogram
+ *  @return bool   Successful operation?
  */
-psHistogram* psImageHistogram(
+bool psImageHistogram(
     psHistogram* out,                  ///< input histogram description & target
     const psImage* in,                 ///< Image data to be histogramed.
@@ -66 +66 @@
  *  psU16, psF32, psF64.
  *
- *  @return psPolynomial2D*     fitted polynomial result
+ *  @return bool   Successful operation?
  *
  */
-psPolynomial2D* psImageFitPolynomial(
+bool psImageFitPolynomial(
     psPolynomial2D* coeffs,            ///< coefficient structure carries in desired terms & target
     const psImage* input               ///< input image