Changeset 2100 for trunk/psLib/src/image/psImageStats.c

Timestamp:

Oct 13, 2004, 3:03:57 PM (22 years ago)

Author:

gusciora

Message:

Added some error-checking.

File:

• trunk/psLib/src/image/psImageStats.c (modified) (8 diffs)

trunk/psLib/src/image/psImageStats.c

@@ -10 +10 @@
 *  @author George Gusciora, MHPCC
 *
-*  @version $Revision: 1.40 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2004-10-05 01:46:02 $
+*  @version $Revision: 1.41 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2004-10-14 01:03:57 $
 *
 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -30 +30 @@
 #include "psFunctions.h"
 #include "psImageStats.h"
+#include "psConstants.h"
 
 #include "psImageErrors.h"
@@ -106 +107 @@
     NOTE: verify that image/mask have the, correct types and  sizes.
  *****************************************************************************/
-psHistogram* psImageHistogram(psHistogram* out, psImage* in, psImage* mask, unsigned int maskVal)
+psHistogram* psImageHistogram(psHistogram* out,
+                              psImage* in,
+                              psImage* mask,
+                              unsigned int maskVal)
 {
     psVector* junkData = NULL;
@@ -112 +116 @@
 
     // NOTE: Verify this action.
-    if ((out == NULL) || (in == NULL)) {
-        return (NULL);
-    }
+    PS_CHECK_NULL_PTR_RETURN_NULL(out);
+    PS_CHECK_NULL_PTR_RETURN_NULL(in);
 
     junkData = psAlloc(sizeof(psVector));
@@ -150 +153 @@
 }
 
+// XXX: Why do we have this function?
 float *p_psCalcScaleFactorsFit(int n)
 {
@@ -195 +199 @@
 }
 
+// XXX: Use a static array of CHebyshev polynomials.
 psPolynomial1D **p_psCreateChebyshevPolys(int maxChebyPoly)
 {
+    if (maxChebyPoly < 1) {
+        return(NULL);
+    }
     psPolynomial1D **chebPolys = NULL;
     int i = 0;
@@ -235 +243 @@
                 psPolynomial1DEval((float) y, chebPolys[j]);
         over all pixels (x,y) in the image.
+ 
+XXX: Currently we only support F32.
  *****************************************************************************/
-psPolynomial2D* psImageFitPolynomial(psPolynomial2D* coeffs, const psImage* input)
+psPolynomial2D* psImageFitPolynomial(psPolynomial2D* coeffs,
+                                     const psImage* input)
 {
     int x = 0;
@@ -352 +363 @@
 
 /*****************************************************************************
+XXX: Use static variables for chebyshev polynomials and scaling factors. 
  
+XXX: Currently we only support F32.
  *****************************************************************************/
 psImage* psImageEvalPolynomial(psImage* input, const psPolynomial2D* coeffs)