Index: trunk/psLib/src/image/psImageStats.c =================================================================== --- trunk/psLib/src/image/psImageStats.c (revision 2265) +++ trunk/psLib/src/image/psImageStats.c (revision 2273) @@ -1,17 +1,17 @@ /** @file psImageStats.c -* \brief Routines for calculating statistics on images. -* @ingroup ImageStats -* -* This file will hold the prototypes for procedures which calculate -* statistic on images, histograms on images, and fit/evaluate Chebyshev -* polynomials to images. -* -* @author GLG, MHPCC -* -* @version $Revision: 1.49 $ $Name: not supported by cvs2svn $ -* @date $Date: 2004-11-02 03:57:21 $ -* -* Copyright 2004 Maui High Performance Computing Center, University of Hawaii -*/ + * \brief Routines for calculating statistics on images. + * @ingroup ImageStats + * + * This file will hold the prototypes for procedures which calculate + * statistic on images, histograms on images, and fit/evaluate Chebyshev + * polynomials to images. + * + * @author GLG, MHPCC + * + * @version $Revision: 1.50 $ $Name: not supported by cvs2svn $ + * @date $Date: 2004-11-04 01:05:00 $ + * + * Copyright 2004 Maui High Performance Computing Center, University of Hawaii + */ #include @@ -46,21 +46,18 @@ if (stats == NULL) { - psErrorMsg(PS_ERRORNAME_DOMAIN "psImageStats", - PS_ERR_BAD_PARAMETER_NULL, true, - PS_ERRORTEXT_psImage_STAT_NULL); + psError(PS_ERR_BAD_PARAMETER_NULL, true, + PS_ERRORTEXT_psImage_STAT_NULL); return NULL; } if (in == NULL) { - psErrorMsg(PS_ERRORNAME_DOMAIN "psImageStats", - PS_ERR_BAD_PARAMETER_NULL, true, - PS_ERRORTEXT_psImage_IMAGE_NULL); + psError(PS_ERR_BAD_PARAMETER_NULL, true, + PS_ERRORTEXT_psImage_IMAGE_NULL); return NULL; } if (stats->options == 0) { - psErrorMsg(PS_ERRORNAME_DOMAIN "psImageStats", - PS_ERR_BAD_PARAMETER_VALUE, true, - PS_ERRORTEXT_psImage_NO_STAT_OPTIONS); + psError(PS_ERR_BAD_PARAMETER_VALUE, true, + PS_ERRORTEXT_psImage_NO_STAT_OPTIONS); return stats; } @@ -76,8 +73,7 @@ char* typeStr; PS_TYPE_NAME(typeStr,mask->type.type); - psErrorMsg(PS_ERRORNAME_DOMAIN "psImageStats", - PS_ERR_BAD_PARAMETER_TYPE, true, - PS_ERRORTEXT_psImage_IMAGE_MASK_TYPE, - typeStr, PS_TYPE_MASK_NAME); + psError(PS_ERR_BAD_PARAMETER_TYPE, true, + PS_ERRORTEXT_psImage_IMAGE_MASK_TYPE, + typeStr, PS_TYPE_MASK_NAME); psFree(junkData); return NULL; @@ -125,8 +121,7 @@ char* typeStr; PS_TYPE_NAME(typeStr,mask->type.type); - psErrorMsg(PS_ERRORNAME_DOMAIN "psImageHistogram", - PS_ERR_BAD_PARAMETER_TYPE, true, - PS_ERRORTEXT_psImage_IMAGE_MASK_TYPE, - typeStr, PS_TYPE_MASK_NAME); + psError(PS_ERR_BAD_PARAMETER_TYPE, true, + PS_ERRORTEXT_psImage_IMAGE_MASK_TYPE, + typeStr, PS_TYPE_MASK_NAME); psFree(out); psFree(junkData); @@ -150,5 +145,5 @@ /***************************************************************************** -CalcScaleFactorsEval(n): The Chebyshev polynomials are defined over the +calcScaleFactorsEval(n): The Chebyshev polynomials are defined over the interval [-1.0 : 1.0]. Images typically have sizes of 512x512 or more. In order to use Chebyshev polynomials, we must scale the coordinates from @@ -156,7 +151,7 @@ output a vector of evenly spaced floating point values between -1.0:1.0. *****************************************************************************/ -double *CalcScaleFactors(psS32 n) -{ - PS_INT_CHEC_NON_NEGATIVE(n, NULL); +double* calcScaleFactors(psS32 n) +{ + PS_INT_CHECK_NON_NEGATIVE(n, NULL); psS32 i = 0; double tmp = 0.0; @@ -172,9 +167,9 @@ } -psVector *VecCalcScaleFactors(psVector *scalingFactors, psS32 n) +psVector *VeccalcScaleFactors(psVector *scalingFactors, psS32 n) { PS_VECTOR_CHECK_NULL(scalingFactors, NULL); PS_VECTOR_CHECK_TYPE(scalingFactors, PS_TYPE_F64, NULL); - PS_INT_CHEC_NON_NEGATIVE(n, NULL); + PS_INT_CHECK_NON_NEGATIVE(n, NULL); psS32 i = 0; double tmp = 0.0; @@ -243,5 +238,6 @@ (input->type.type != PS_TYPE_F32) && (input->type.type != PS_TYPE_F64)) { - psError(__func__, "Unalowwable image type.\n"); + psError(PS_ERR_BAD_PARAMETER_TYPE, true, + "Unallowable image type.\n"); } PS_POLY_CHECK_NULL(coeffs, NULL); @@ -259,14 +255,12 @@ // Check for null inputs if (input == NULL) { - psErrorMsg(PS_ERRORNAME_DOMAIN "psImageFitPolynomial", - PS_ERR_BAD_PARAMETER_NULL, true, - PS_ERRORTEXT_psImage_IMAGE_NULL); + psError(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); + psError(PS_ERR_BAD_PARAMETER_NULL, true, + PS_ERRORTEXT_psImage_COEFF_NULL); return NULL; } @@ -283,6 +277,6 @@ // We scale the pixel positions to values // between -1.0 and 1.0 - rScalingFactors = CalcScaleFactors(input->numRows); - cScalingFactors = CalcScaleFactors(input->numCols); + rScalingFactors = calcScaleFactors(input->numRows); + cScalingFactors = calcScaleFactors(input->numCols); // Determine how many Chebyshev polynomials @@ -363,5 +357,6 @@ (input->type.type != PS_TYPE_F32) && (input->type.type != PS_TYPE_F64)) { - psError(__func__, "Unalowwable image type.\n"); + psError(PS_ERR_BAD_PARAMETER_TYPE, true, + "Unallowable image type.\n"); } PS_POLY_CHECK_NULL(coeffs, NULL); @@ -376,11 +371,23 @@ double *cScalingFactors = NULL; double *rScalingFactors = NULL; - double polySum = 0.0; - + float polySum = 0.0; + + // Check for null inputs + if (input == NULL) { + psError(PS_ERR_BAD_PARAMETER_NULL, true, + PS_ERRORTEXT_psImage_IMAGE_NULL); + return NULL; + } + + if (coeffs == NULL) { + psError(PS_ERR_BAD_PARAMETER_NULL, true, + PS_ERRORTEXT_psImage_COEFF_NULL); + return NULL; + } // We scale the pixel positions to values between -1.0 and 1.0 // Use static data structures here. - rScalingFactors = CalcScaleFactors(input->numRows); - cScalingFactors = CalcScaleFactors(input->numCols); + rScalingFactors = calcScaleFactors(input->numRows); + cScalingFactors = calcScaleFactors(input->numCols); // Determine how many Chebyshev polynomials