Changeset 1951

Timestamp:

Oct 4, 2004, 3:03:11 PM (22 years ago)

Author:

evanalst

Message:

Fix psImageFitPolynomial to check input argument validity.

Location:

trunk/psLib/src

Files:

• image/psImageErrors.dat (modified) (1 diff)
• image/psImageStats.c (modified) (3 diffs)
• image/psImageStats.h (modified) (2 diffs)
• imageops/psImageStats.c (modified) (3 diffs)
• imageops/psImageStats.h (modified) (2 diffs)

trunk/psLib/src/image/psImageErrors.dat

@@ -73 +73 @@
 psImageConvolve_FFT_FAILED             Failed to perform a fourier transform of input image.
 psImageConvolve_KERNEL_FFT_FAILED      Failed to perform a fourier transform of kernel.
-psImageConvolve_KERNEL_TOO_LARGE       Specified psKernel size, %dx%d, can not be larger than input psImage size, %dx%d.  
+psImageConvolve_KERNEL_TOO_LARGE       Specified psKernel size, %dx%d, can not be larger than input psImage size, %dx%d. 
+psImage_COEFF_NULL                     Polynomial coefficients cannot be NULL. 

trunk/psLib/src/image/psImageStats.c

@@ -10 +10 @@
 *  @author George Gusciora, MHPCC
 *
-*  @version $Revision: 1.38 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2004-09-30 23:06:36 $
+*  @version $Revision: 1.39 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2004-10-05 01:03:11 $
 *
 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -236 +236 @@
         over all pixels (x,y) in the image.
  *****************************************************************************/
-psPolynomial2D* psImageFitPolynomial(const psImage* input, psPolynomial2D* coeffs)
+psPolynomial2D* psImageFitPolynomial(psPolynomial2D* coeffs, const psImage* input)
 {
     int x = 0;
@@ -247 +247 @@
     float *cScalingFactors = NULL;
     float *rScalingFactors = NULL;
+
+    // Check for null inputs
+    if (input == NULL) {
+        psErrorMsg(PS_ERRORNAME_DOMAIN "psImageFitPolynomial",
+                   PS_ERR_BAD_PARAMETER_NULL, true,
+                   PS_ERRORTEXT_psImage_IMAGE_NULL);
+        return NULL;
+    }
+
+    if (coeffs == NULL) {
+        psErrorMsg(PS_ERRORNAME_DOMAIN "psImageFitPolynomial",
+                   PS_ERR_BAD_PARAMETER_NULL, true,
+                   PS_ERRORTEXT_psImage_COEFF_NULL);
+        return NULL;
+    }
 
     // Create the sums[][] data structure.  This

trunk/psLib/src/image/psImageStats.h

@@ -9 +9 @@
 *  @author George Gusciora, MHPCC
 *
-*  @version $Revision: 1.16 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2004-08-10 01:55:34 $
+*  @version $Revision: 1.17 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2004-10-05 01:03:11 $
 *
 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -68 +68 @@
  */
 psPolynomial2D* psImageFitPolynomial(
-    const psImage* input,              ///< image to fit
-    psPolynomial2D* coeffs             ///< coefficient structure carries in desired terms & target
+    psPolynomial2D* coeffs,            ///< coefficient structure carries in desired terms & target
+    const psImage* input
 );
 

trunk/psLib/src/imageops/psImageStats.c

@@ -10 +10 @@
 *  @author George Gusciora, MHPCC
 *
-*  @version $Revision: 1.38 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2004-09-30 23:06:36 $
+*  @version $Revision: 1.39 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2004-10-05 01:03:11 $
 *
 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -236 +236 @@
         over all pixels (x,y) in the image.
  *****************************************************************************/
-psPolynomial2D* psImageFitPolynomial(const psImage* input, psPolynomial2D* coeffs)
+psPolynomial2D* psImageFitPolynomial(psPolynomial2D* coeffs, const psImage* input)
 {
     int x = 0;
@@ -247 +247 @@
     float *cScalingFactors = NULL;
     float *rScalingFactors = NULL;
+
+    // Check for null inputs
+    if (input == NULL) {
+        psErrorMsg(PS_ERRORNAME_DOMAIN "psImageFitPolynomial",
+                   PS_ERR_BAD_PARAMETER_NULL, true,
+                   PS_ERRORTEXT_psImage_IMAGE_NULL);
+        return NULL;
+    }
+
+    if (coeffs == NULL) {
+        psErrorMsg(PS_ERRORNAME_DOMAIN "psImageFitPolynomial",
+                   PS_ERR_BAD_PARAMETER_NULL, true,
+                   PS_ERRORTEXT_psImage_COEFF_NULL);
+        return NULL;
+    }
 
     // Create the sums[][] data structure.  This

trunk/psLib/src/imageops/psImageStats.h

@@ -9 +9 @@
 *  @author George Gusciora, MHPCC
 *
-*  @version $Revision: 1.16 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2004-08-10 01:55:34 $
+*  @version $Revision: 1.17 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2004-10-05 01:03:11 $
 *
 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -68 +68 @@
  */
 psPolynomial2D* psImageFitPolynomial(
-    const psImage* input,              ///< image to fit
-    psPolynomial2D* coeffs             ///< coefficient structure carries in desired terms & target
+    psPolynomial2D* coeffs,            ///< coefficient structure carries in desired terms & target
+    const psImage* input
 );