Index: trunk/psLib/src/image/psImage.c =================================================================== --- trunk/psLib/src/image/psImage.c (revision 2265) +++ trunk/psLib/src/image/psImage.c (revision 2273) @@ -10,6 +10,6 @@ * @author Ross Harman, MHPCC * - * @version $Revision: 1.51 $ $Name: not supported by cvs2svn $ - * @date $Date: 2004-10-27 00:57:31 $ + * @version $Revision: 1.52 $ $Name: not supported by cvs2svn $ + * @date $Date: 2004-11-04 01:05:00 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -40,8 +40,7 @@ if (area < 1) { - psErrorMsg(PS_ERRORNAME_DOMAIN "psImageAlloc", - PS_ERR_BAD_PARAMETER_VALUE, true, - PS_ERRORTEXT_psImage_AREA_NEGATIVE, - numRows, numCols); + psError(PS_ERR_BAD_PARAMETER_VALUE, true, + PS_ERRORTEXT_psImage_AREA_NEGATIVE, + numRows, numCols); return NULL; } @@ -119,7 +118,6 @@ if (old->type.dimen != PS_DIMEN_IMAGE) { psFree(old); - psErrorMsg(PS_ERRORNAME_DOMAIN "psImageRecycle", - PS_ERR_BAD_PARAMETER_TYPE, true, - PS_ERRORTEXT_psImage_NOT_AN_IMAGE); + psError(PS_ERR_BAD_PARAMETER_TYPE, true, + PS_ERRORTEXT_psImage_NOT_AN_IMAGE); return NULL; } @@ -175,7 +173,6 @@ if (input == NULL || input->data.V == NULL) { - psErrorMsg(PS_ERRORNAME_DOMAIN "psImageCopy", - PS_ERR_BAD_PARAMETER_NULL, true, - PS_ERRORTEXT_psImage_IMAGE_NULL); + psError(PS_ERR_BAD_PARAMETER_NULL, true, + PS_ERRORTEXT_psImage_IMAGE_NULL); psFree(output); return NULL; @@ -183,7 +180,6 @@ if (input == output) { - psErrorMsg(PS_ERRORNAME_DOMAIN "psImageCopy", - PS_ERR_BAD_PARAMETER_NULL, true, - PS_ERRORTEXT_psImage_INPLACE_NOTSUPPORTED); + psError(PS_ERR_BAD_PARAMETER_NULL, true, + PS_ERRORTEXT_psImage_INPLACE_NOTSUPPORTED); psFree(output); return NULL; @@ -191,7 +187,6 @@ if (input->type.dimen != PS_DIMEN_IMAGE) { - psErrorMsg(PS_ERRORNAME_DOMAIN "psImageCopy", - PS_ERR_BAD_PARAMETER_TYPE, true, - PS_ERRORTEXT_psImage_NOT_AN_IMAGE); + psError(PS_ERR_BAD_PARAMETER_TYPE, true, + PS_ERRORTEXT_psImage_NOT_AN_IMAGE); psFree(output); return NULL; @@ -205,8 +200,7 @@ if (inDatatype == PS_TYPE_PTR || type == PS_TYPE_PTR) { - psErrorMsg(PS_ERRORNAME_DOMAIN "psImageCopy", - PS_ERR_BAD_PARAMETER_TYPE, true, - PS_ERRORTEXT_psImage_IMAGE_TYPE_UNSUPPORTED, - PS_TYPE_PTR_NAME); + psError(PS_ERR_BAD_PARAMETER_TYPE, true, + PS_ERRORTEXT_psImage_IMAGE_TYPE_UNSUPPORTED, + PS_TYPE_PTR_NAME); psFree(output); return NULL; @@ -319,8 +313,7 @@ char* typeStr; PS_TYPE_NAME(typeStr,type); - psErrorMsg(PS_ERRORNAME_DOMAIN "psImageCopy", - PS_ERR_BAD_PARAMETER_TYPE, true, - PS_ERRORTEXT_psImage_IMAGE_TYPE_UNSUPPORTED, - typeStr); + psError(PS_ERR_BAD_PARAMETER_TYPE, true, + PS_ERRORTEXT_psImage_IMAGE_TYPE_UNSUPPORTED, + typeStr); psFree(output); @@ -372,7 +365,6 @@ if (input == NULL) { - psErrorMsg(PS_ERRORNAME_DOMAIN "psImagePixelInterpolate", - PS_ERR_BAD_PARAMETER_NULL,true, - PS_ERRORTEXT_psImage_IMAGE_NULL); + psError(PS_ERR_BAD_PARAMETER_NULL,true, + PS_ERRORTEXT_psImage_IMAGE_NULL); return unexposedValue; } @@ -400,8 +392,7 @@ break; \ default: \ - psErrorMsg(PS_ERRORNAME_DOMAIN "psImagePixelInterpolate", \ - PS_ERR_BAD_PARAMETER_VALUE,true, \ - PS_ERRORTEXT_psImage_INTERPOLATE_METHOD_INVALID, \ - mode); \ + psError(PS_ERR_BAD_PARAMETER_VALUE,true, \ + PS_ERRORTEXT_psImage_INTERPOLATE_METHOD_INVALID, \ + mode); \ } \ break @@ -423,8 +414,7 @@ char* typeStr; PS_TYPE_NAME(typeStr,input->type.type); - psErrorMsg(PS_ERRORNAME_DOMAIN "psImagePixelInterpolate", - PS_ERR_BAD_PARAMETER_TYPE,true, - PS_ERRORTEXT_psImage_IMAGE_TYPE_UNSUPPORTED, - typeStr); + psError(PS_ERR_BAD_PARAMETER_TYPE,true, + PS_ERRORTEXT_psImage_IMAGE_TYPE_UNSUPPORTED, + typeStr); } } Index: trunk/psLib/src/image/psImageConvolve.c =================================================================== --- trunk/psLib/src/image/psImageConvolve.c (revision 2265) +++ trunk/psLib/src/image/psImageConvolve.c (revision 2273) @@ -5,6 +5,6 @@ * @author Robert DeSonia, MHPCC * - * @version $Revision: 1.7 $ $Name: not supported by cvs2svn $ - * @date $Date: 2004-10-27 00:57:31 $ + * @version $Revision: 1.8 $ $Name: not supported by cvs2svn $ + * @date $Date: 2004-11-04 01:05:00 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -110,7 +110,6 @@ // got non-NULL vectors? if (tShifts == NULL || xShifts == NULL || yShifts == NULL) { - psErrorMsg(PS_ERRORNAME_DOMAIN "psKernelGenerate", - PS_ERR_BAD_PARAMETER_NULL, true, - PS_ERRORTEXT_psImageConvolve_SHIFT_NULL); + psError(PS_ERR_BAD_PARAMETER_NULL, true, + PS_ERRORTEXT_psImageConvolve_SHIFT_NULL); return NULL; } @@ -125,8 +124,7 @@ PS_TYPE_NAME(typeYStr,yShifts->type.type); PS_TYPE_NAME(typeTStr,tShifts->type.type); - psErrorMsg(PS_ERRORNAME_DOMAIN "psKernelGenerate", - PS_ERR_BAD_PARAMETER_TYPE, true, - PS_ERRORTEXT_psImageConvolve_SHIFT_TYPE_MISMATCH, - typeTStr, typeXStr, typeYStr); + psError(PS_ERR_BAD_PARAMETER_TYPE, true, + PS_ERRORTEXT_psImageConvolve_SHIFT_TYPE_MISMATCH, + typeTStr, typeXStr, typeYStr); return NULL; } @@ -218,8 +216,7 @@ char* typeStr; PS_TYPE_NAME(typeStr,xShifts->type.type); - psErrorMsg(PS_ERRORNAME_DOMAIN "psKernelGenerate", - PS_ERR_BAD_PARAMETER_TYPE, true, - PS_ERRORTEXT_psImage_IMAGE_TYPE_UNSUPPORTED, - typeStr); + psError(PS_ERR_BAD_PARAMETER_TYPE, true, + PS_ERRORTEXT_psImage_IMAGE_TYPE_UNSUPPORTED, + typeStr); } } @@ -236,7 +233,6 @@ if (kernel == NULL) { - psErrorMsg(PS_ERRORNAME_DOMAIN "psImageConvolve", - PS_ERR_BAD_PARAMETER_NULL, true, - PS_ERRORTEXT_psImageConvolve_KERNEL_NULL); + psError(PS_ERR_BAD_PARAMETER_NULL, true, + PS_ERRORTEXT_psImageConvolve_KERNEL_NULL); psFree(out); return NULL; @@ -297,8 +293,7 @@ char* typeStr; PS_TYPE_NAME(typeStr,in->type.type); - psErrorMsg(PS_ERRORNAME_DOMAIN "psImageConvolve", - PS_ERR_BAD_PARAMETER_TYPE, true, - PS_ERRORTEXT_psImage_IMAGE_TYPE_UNSUPPORTED, - typeStr); + psError(PS_ERR_BAD_PARAMETER_TYPE, true, + PS_ERRORTEXT_psImage_IMAGE_TYPE_UNSUPPORTED, + typeStr); psFree(out); return NULL; @@ -317,9 +312,8 @@ psS32 kCols = kernel->image->numCols; if (kRows >= numRows || kCols >= numCols) { - psErrorMsg(PS_ERRORNAME_DOMAIN "psImageConvolve", - PS_ERR_BAD_PARAMETER_SIZE, true, - PS_ERRORTEXT_psImageConvolve_KERNEL_TOO_LARGE, - kCols,kRows, - numCols, numRows); + psError(PS_ERR_BAD_PARAMETER_SIZE, true, + PS_ERRORTEXT_psImageConvolve_KERNEL_TOO_LARGE, + kCols,kRows, + numCols, numRows); psFree(out); return NULL; @@ -376,7 +370,6 @@ psImage* kernelFourier = psImageFFT(NULL, paddedKernel, PS_FFT_FORWARD); if (kernelFourier == NULL) { - psErrorMsg(PS_ERRORNAME_DOMAIN "psImageConvolve", - PS_ERR_UNKNOWN, false, - PS_ERRORTEXT_psImageConvolve_KERNEL_FFT_FAILED); + psError(PS_ERR_UNKNOWN, false, + PS_ERRORTEXT_psImageConvolve_KERNEL_FFT_FAILED); psFree(out); return NULL; @@ -385,7 +378,6 @@ psImage* inFourier = psImageFFT(NULL, paddedImage, PS_FFT_FORWARD); if (inFourier == NULL) { - psErrorMsg(PS_ERRORNAME_DOMAIN "psImageConvolve", - PS_ERR_UNKNOWN, false, - PS_ERRORTEXT_psImageConvolve_FFT_FAILED); + psError(PS_ERR_UNKNOWN, false, + PS_ERRORTEXT_psImageConvolve_FFT_FAILED); psFree(out); return NULL; @@ -398,7 +390,6 @@ PS_FFT_REVERSE); if (complexOut == NULL) { - psErrorMsg(PS_ERRORNAME_DOMAIN "psImageConvolve", - PS_ERR_UNKNOWN, false, - PS_ERRORTEXT_psImageConvolve_FFT_FAILED); + psError(PS_ERR_UNKNOWN, false, + PS_ERRORTEXT_psImageConvolve_FFT_FAILED); psFree(out); return NULL; Index: trunk/psLib/src/image/psImageExtraction.c =================================================================== --- trunk/psLib/src/image/psImageExtraction.c (revision 2265) +++ trunk/psLib/src/image/psImageExtraction.c (revision 2273) @@ -9,6 +9,6 @@ * @author Robert DeSonia, MHPCC * - * @version $Revision: 1.27 $ $Name: not supported by cvs2svn $ - * @date $Date: 2004-10-27 00:57:31 $ + * @version $Revision: 1.28 $ $Name: not supported by cvs2svn $ + * @date $Date: 2004-11-04 01:05:00 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -35,14 +35,12 @@ if (image == NULL || image->data.V == NULL) { - psErrorMsg(PS_ERRORNAME_DOMAIN "psImageSubset", - 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 (image->type.dimen != PS_DIMEN_IMAGE) { - psErrorMsg(PS_ERRORNAME_DOMAIN "psImageSubset", - PS_ERR_BAD_PARAMETER_TYPE, true, - PS_ERRORTEXT_psImage_NOT_AN_IMAGE); + psError(PS_ERR_BAD_PARAMETER_TYPE, true, + PS_ERRORTEXT_psImage_NOT_AN_IMAGE); return NULL; } @@ -61,9 +59,8 @@ col1 > image->numCols || row1 > image->numRows ) { - psErrorMsg(PS_ERRORNAME_DOMAIN "psImageSubset", - PS_ERR_BAD_PARAMETER_VALUE, true, - PS_ERRORTEXT_psImage_SUBSET_RANGE_INVALID, - col0, col1-1, row0, row1-1, - image->numCols-1, image->numRows-1); + psError(PS_ERR_BAD_PARAMETER_VALUE, true, + PS_ERRORTEXT_psImage_SUBSET_RANGE_INVALID, + col0, col1-1, row0, row1-1, + image->numCols-1, image->numRows-1); return NULL; } @@ -152,23 +149,20 @@ // section should be of the form '[col0:col1,row0:row1]' if (section == NULL) { - psErrorMsg(PS_ERRORNAME_DOMAIN "psImageSubsection", - PS_ERR_BAD_PARAMETER_NULL, true, - PS_ERRORTEXT_psImage_SUBSECTION_NULL); + psError(PS_ERR_BAD_PARAMETER_NULL, true, + PS_ERRORTEXT_psImage_SUBSECTION_NULL); return NULL; } if (sscanf(section,"[%d:%d,%d:%d]",&col0,&col1,&row0,&row1) < 4) { - psErrorMsg(PS_ERRORNAME_DOMAIN "psImageSubsection", - PS_ERR_BAD_PARAMETER_NULL, true, - PS_ERRORTEXT_psImage_SUBSECTION_INVALID, - section); + psError(PS_ERR_BAD_PARAMETER_NULL, true, + PS_ERRORTEXT_psImage_SUBSECTION_INVALID, + section); return NULL; } if (col0 > col1 || row0 > row1) { - psErrorMsg(PS_ERRORNAME_DOMAIN "psImageSubsection", - PS_ERR_BAD_PARAMETER_VALUE, true, - PS_ERRORTEXT_psImage_SUBSET_RANGE_MALFORMED, - col0,col1,row0,row1); + psError(PS_ERR_BAD_PARAMETER_VALUE, true, + PS_ERRORTEXT_psImage_SUBSET_RANGE_MALFORMED, + col0,col1,row0,row1); return NULL; } @@ -180,7 +174,6 @@ { if (image == NULL || image->data.V == NULL) { - psErrorMsg(PS_ERRORNAME_DOMAIN "psImageTrim", - 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; } @@ -209,9 +202,8 @@ col0 >= col1 || row0 >= row1 ) { - psErrorMsg(PS_ERRORNAME_DOMAIN "psImageTrim", - PS_ERR_BAD_PARAMETER_VALUE, true, - PS_ERRORTEXT_psImage_SUBSET_RANGE_INVALID, - col0, col1-1, row0, row1-1, - image->numCols-1, image->numRows-1); + psError(PS_ERR_BAD_PARAMETER_VALUE, true, + PS_ERRORTEXT_psImage_SUBSET_RANGE_INVALID, + col0, col1-1, row0, row1-1, + image->numCols-1, image->numRows-1); psFree(image); return NULL; @@ -267,7 +259,6 @@ if (in == NULL || in->data.V == NULL) { - psErrorMsg(PS_ERRORNAME_DOMAIN "psImageSlice", - PS_ERR_BAD_PARAMETER_NULL, true, - PS_ERRORTEXT_psImage_IMAGE_NULL); + psError(PS_ERR_BAD_PARAMETER_NULL, true, + PS_ERRORTEXT_psImage_IMAGE_NULL); psFree(out); return NULL; @@ -288,9 +279,8 @@ col0 >= col1 || row0 >= row1) { - psErrorMsg(PS_ERRORNAME_DOMAIN "psImageSlice", - PS_ERR_BAD_PARAMETER_VALUE, true, - PS_ERRORTEXT_psImage_SUBSET_RANGE_INVALID, - col0, col1, row0, row1, - in->numCols, in->numRows); + psError(PS_ERR_BAD_PARAMETER_VALUE, true, + PS_ERRORTEXT_psImage_SUBSET_RANGE_INVALID, + col0, col1, row0, row1, + in->numCols, in->numRows); psFree(out); return NULL; @@ -307,9 +297,8 @@ if (mask != NULL) { if (inRows != mask->numRows || inCols != mask->numCols) { - psErrorMsg(PS_ERRORNAME_DOMAIN "psImageSlice", - PS_ERR_BAD_PARAMETER_VALUE, true, - PS_ERRORTEXT_psImage_IMAGE_MASK_SIZE, - mask->numCols,mask->numRows, - inCols, inRows); + psError(PS_ERR_BAD_PARAMETER_VALUE, true, + PS_ERRORTEXT_psImage_IMAGE_MASK_SIZE, + mask->numCols,mask->numRows, + inCols, inRows); psFree(out); return NULL; @@ -318,8 +307,7 @@ char* typeStr; PS_TYPE_NAME(typeStr,mask->type.type); - psErrorMsg(PS_ERRORNAME_DOMAIN "psImageSlice", - 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); return NULL; @@ -328,7 +316,6 @@ if (stats == NULL) { - psErrorMsg(PS_ERRORNAME_DOMAIN "psImageSlice", - PS_ERR_BAD_PARAMETER_NULL, true, - PS_ERRORTEXT_psImage_STAT_NULL); + psError(PS_ERR_BAD_PARAMETER_NULL, true, + PS_ERRORTEXT_psImage_STAT_NULL); psFree(out); return NULL; @@ -338,7 +325,6 @@ // single stats operation if (p_psGetStatValue(stats, &statVal) == false) { - psErrorMsg(PS_ERRORNAME_DOMAIN "psImageSlice", - PS_ERR_BAD_PARAMETER_VALUE, false, - PS_ERRORTEXT_psImage_BAD_STAT,stats->options); + psError(PS_ERR_BAD_PARAMETER_VALUE, false, + PS_ERRORTEXT_psImage_BAD_STAT,stats->options); psFree(out); return NULL; @@ -423,8 +409,7 @@ char* typeStr; PS_TYPE_NAME(typeStr,type); - psErrorMsg(PS_ERRORNAME_DOMAIN "psImageSlice", - PS_ERR_BAD_PARAMETER_TYPE, true, - PS_ERRORTEXT_psImage_IMAGE_TYPE_UNSUPPORTED, - typeStr); + psError(PS_ERR_BAD_PARAMETER_TYPE, true, + PS_ERRORTEXT_psImage_IMAGE_TYPE_UNSUPPORTED, + typeStr); psFree(out); out = NULL; @@ -485,8 +470,7 @@ psFree(maskVec); } else { // don't know what the direction flag is - psErrorMsg(PS_ERRORNAME_DOMAIN "psImageSlice", - PS_ERR_BAD_PARAMETER_VALUE, true, - PS_ERRORTEXT_psImage_SLICE_DIRECTION_INVALID, - direction); + psError(PS_ERR_BAD_PARAMETER_VALUE, true, + PS_ERRORTEXT_psImage_SLICE_DIRECTION_INVALID, + direction); psFree(out); out = NULL; @@ -512,7 +496,6 @@ { if (in == NULL || in->data.V == NULL) { - psErrorMsg(PS_ERRORNAME_DOMAIN "psImageCut", - PS_ERR_BAD_PARAMETER_NULL, true, - PS_ERRORTEXT_psImage_IMAGE_NULL); + psError(PS_ERR_BAD_PARAMETER_NULL, true, + PS_ERRORTEXT_psImage_IMAGE_NULL); psFree(out); return NULL; @@ -522,8 +505,7 @@ if (nSamples < 2) { - psErrorMsg(PS_ERRORNAME_DOMAIN "psImageCut", - PS_ERR_BAD_PARAMETER_VALUE, true, - PS_ERRORTEXT_psImage_nSamples_TOOSMALL, - nSamples); + psError(PS_ERR_BAD_PARAMETER_VALUE, true, + PS_ERRORTEXT_psImage_nSamples_TOOSMALL, + nSamples); psFree(out); return NULL; @@ -534,9 +516,8 @@ endCol < 0 || endCol >= numCols || endRow < 0 || endRow >= numRows) { - psErrorMsg(PS_ERRORNAME_DOMAIN "psImageCut", - PS_ERR_BAD_PARAMETER_VALUE, true, - PS_ERRORTEXT_psImage_LINE_NOT_IN_IMAGE, - startCol,startRow,endCol,endRow, - numCols-1,numRows-1); + psError(PS_ERR_BAD_PARAMETER_VALUE, true, + PS_ERRORTEXT_psImage_LINE_NOT_IN_IMAGE, + startCol,startRow,endCol,endRow, + numCols-1,numRows-1); psFree(out); return NULL; @@ -544,8 +525,7 @@ if (mode < PS_INTERPOLATE_FLAT || mode >= PS_INTERPOLATE_NUM_MODES) { - psErrorMsg(PS_ERRORNAME_DOMAIN "psImageResample", - PS_ERR_BAD_PARAMETER_VALUE, true, - PS_ERRORTEXT_psImageManip_INTERPOLATION_MODE_UNSUPPORTED, - mode); + psError(PS_ERR_BAD_PARAMETER_VALUE, true, + PS_ERRORTEXT_psImageManip_INTERPOLATION_MODE_UNSUPPORTED, + mode); psFree(out); return NULL; @@ -554,9 +534,8 @@ if (mask != NULL) { if (numRows != mask->numRows || numCols != mask->numCols) { - psErrorMsg(PS_ERRORNAME_DOMAIN "psImageCut", - PS_ERR_BAD_PARAMETER_VALUE, true, - PS_ERRORTEXT_psImage_IMAGE_MASK_SIZE, - mask->numCols,mask->numRows, - numCols-1, numRows); + psError(PS_ERR_BAD_PARAMETER_VALUE, true, + PS_ERRORTEXT_psImage_IMAGE_MASK_SIZE, + mask->numCols,mask->numRows, + numCols-1, numRows); psFree(out); return NULL; @@ -565,8 +544,7 @@ char* typeStr; PS_TYPE_NAME(typeStr,mask->type.type); - psErrorMsg(PS_ERRORNAME_DOMAIN "psImageCut", - 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); return NULL; @@ -627,8 +605,7 @@ char* typeStr; PS_TYPE_NAME(typeStr,in->type.type); - psErrorMsg(PS_ERRORNAME_DOMAIN "psImageCut", - PS_ERR_BAD_PARAMETER_TYPE, true, - PS_ERRORTEXT_psImage_IMAGE_TYPE_UNSUPPORTED, - typeStr); + psError(PS_ERR_BAD_PARAMETER_TYPE, true, + PS_ERRORTEXT_psImage_IMAGE_TYPE_UNSUPPORTED, + typeStr); psFree(out); out = NULL; @@ -653,7 +630,6 @@ if (in == NULL || in->data.V == NULL) { - psErrorMsg(PS_ERRORNAME_DOMAIN "psImageRadialCut", - PS_ERR_BAD_PARAMETER_NULL, true, - PS_ERRORTEXT_psImage_IMAGE_NULL); + psError(PS_ERR_BAD_PARAMETER_NULL, true, + PS_ERRORTEXT_psImage_IMAGE_NULL); psFree(out); return NULL; @@ -664,9 +640,8 @@ if (mask != NULL) { if (numRows != mask->numRows || numCols != mask->numCols) { - psErrorMsg(PS_ERRORNAME_DOMAIN "psImageRadialCut", - PS_ERR_BAD_PARAMETER_SIZE, true, - PS_ERRORTEXT_psImage_IMAGE_MASK_SIZE, - mask->numCols,mask->numRows, - numCols, numRows); + psError(PS_ERR_BAD_PARAMETER_SIZE, true, + PS_ERRORTEXT_psImage_IMAGE_MASK_SIZE, + mask->numCols,mask->numRows, + numCols, numRows); psFree(out); return NULL; @@ -675,8 +650,7 @@ char* typeStr; PS_TYPE_NAME(typeStr,mask->type.type); - psErrorMsg(PS_ERRORNAME_DOMAIN "psImageRadialCut", - 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); return NULL; @@ -686,9 +660,8 @@ if (centerCol < 0 || centerCol >= numCols || centerRow < 0 || centerRow >= numRows) { - psErrorMsg(PS_ERRORNAME_DOMAIN "psImageRadialCut", - PS_ERR_BAD_PARAMETER_VALUE, true, - PS_ERRORTEXT_psImage_CENTER_NOT_IN_IMAGE, - centerCol, centerRow, - numCols-1, numRows-1); + psError(PS_ERR_BAD_PARAMETER_VALUE, true, + PS_ERRORTEXT_psImage_CENTER_NOT_IN_IMAGE, + centerCol, centerRow, + numCols-1, numRows-1); psFree(out); return NULL; @@ -696,7 +669,6 @@ if (radii == NULL) { - psErrorMsg(PS_ERRORNAME_DOMAIN "psImageRadialCut", - PS_ERR_BAD_PARAMETER_NULL, true, - PS_ERRORTEXT_psImage_RADII_VECTOR_NULL); + psError(PS_ERR_BAD_PARAMETER_NULL, true, + PS_ERRORTEXT_psImage_RADII_VECTOR_NULL); psFree(out); return NULL; @@ -704,8 +676,7 @@ if (radii->n < 2) { - psErrorMsg(PS_ERRORNAME_DOMAIN "psImageRadialCut", - PS_ERR_BAD_PARAMETER_SIZE, true, - PS_ERRORTEXT_psImage_RADII_VECTOR_TOOSMALL, - radii->n); + psError(PS_ERR_BAD_PARAMETER_SIZE, true, + PS_ERRORTEXT_psImage_RADII_VECTOR_TOOSMALL, + radii->n); psFree(out); return NULL; @@ -713,7 +684,6 @@ if (stats == NULL) { - psErrorMsg(PS_ERRORNAME_DOMAIN "psImageRadialCut", - PS_ERR_BAD_PARAMETER_NULL, true, - PS_ERRORTEXT_psImage_STAT_NULL); + psError(PS_ERR_BAD_PARAMETER_NULL, true, + PS_ERRORTEXT_psImage_STAT_NULL); psFree(out); return NULL; @@ -723,8 +693,7 @@ // single stats operation if (p_psGetStatValue(stats, &statVal) == false) { - psErrorMsg(PS_ERRORNAME_DOMAIN "psImageRadialCut", - PS_ERR_BAD_PARAMETER_VALUE, false, - PS_ERRORTEXT_psImage_BAD_STAT, - stats->options); + psError(PS_ERR_BAD_PARAMETER_VALUE, false, + PS_ERRORTEXT_psImage_BAD_STAT, + stats->options); psFree(out); return NULL; Index: trunk/psLib/src/image/psImageFFT.c =================================================================== --- trunk/psLib/src/image/psImageFFT.c (revision 2265) +++ trunk/psLib/src/image/psImageFFT.c (revision 2273) @@ -5,6 +5,6 @@ * @author Robert DeSonia, MHPCC * - * @version $Revision: 1.5 $ $Name: not supported by cvs2svn $ - * @date $Date: 2004-10-27 00:57:31 $ + * @version $Revision: 1.6 $ $Name: not supported by cvs2svn $ + * @date $Date: 2004-11-04 01:05:00 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -43,21 +43,18 @@ if ( ((direction & PS_FFT_FORWARD) != 0) ) { if ((direction & PS_FFT_REVERSE) != 0) { - psErrorMsg(PS_ERRORNAME_DOMAIN "psImageFFT", - PS_ERR_BAD_PARAMETER_VALUE, true, - PS_ERRORTEXT_psImageFFT_FORWARD_REVERSE); + psError(PS_ERR_BAD_PARAMETER_VALUE, true, + PS_ERRORTEXT_psImageFFT_FORWARD_REVERSE); psFree(out); return NULL; } if ((direction & PS_FFT_REAL_RESULT) != 0) { - psErrorMsg(PS_ERRORNAME_DOMAIN "psImageFFT", - PS_ERR_BAD_PARAMETER_VALUE, true, - PS_ERRORTEXT_psImageFFT_REAL_FORWARD_NOTSUPPORTED); + psError(PS_ERR_BAD_PARAMETER_VALUE, true, + PS_ERRORTEXT_psImageFFT_REAL_FORWARD_NOTSUPPORTED); psFree(out); return NULL; } } else if ((direction & PS_FFT_REVERSE) == 0) { - psErrorMsg(PS_ERRORNAME_DOMAIN "psImageFFT", - PS_ERR_BAD_PARAMETER_VALUE, true, - PS_ERRORTEXT_psImageFFT_NO_DIRECTION_OPTION); + psError(PS_ERR_BAD_PARAMETER_VALUE, true, + PS_ERRORTEXT_psImageFFT_NO_DIRECTION_OPTION); psFree(out); return NULL; @@ -86,7 +83,6 @@ /* check if a plan exists now -- if not, it is a real problem at this point */ if (plan == NULL) { - psErrorMsg(PS_ERRORNAME_DOMAIN "psImageFFT", - PS_ERR_BAD_PARAMETER_TYPE, true, - PS_ERRORTEXT_psImageFFT_FFTW_PLAN_NULL); + psError(PS_ERR_BAD_PARAMETER_TYPE, true, + PS_ERRORTEXT_psImageFFT_FFTW_PLAN_NULL); psFree(out); return NULL; @@ -163,8 +159,7 @@ char* typeStr; PS_TYPE_NAME(typeStr,type); - psErrorMsg(PS_ERRORNAME_DOMAIN "psImageReal", - PS_ERR_BAD_PARAMETER_TYPE, true, - PS_ERRORTEXT_psImage_IMAGE_TYPE_UNSUPPORTED, - typeStr); + psError(PS_ERR_BAD_PARAMETER_TYPE, true, + PS_ERRORTEXT_psImage_IMAGE_TYPE_UNSUPPORTED, + typeStr); psFree(out); @@ -226,8 +221,7 @@ char* typeStr; PS_TYPE_NAME(typeStr,type); - psErrorMsg(PS_ERRORNAME_DOMAIN "psImageImaginary", - PS_ERR_BAD_PARAMETER_TYPE, true, - PS_ERRORTEXT_psImage_IMAGE_TYPE_UNSUPPORTED, - typeStr); + psError(PS_ERR_BAD_PARAMETER_TYPE, true, + PS_ERRORTEXT_psImage_IMAGE_TYPE_UNSUPPORTED, + typeStr); psFree(out); return NULL; @@ -257,8 +251,7 @@ PS_TYPE_NAME(typeStrReal,type); PS_TYPE_NAME(typeStrImag,imag->type.type); - psErrorMsg(PS_ERRORNAME_DOMAIN "psImageComplex", - PS_ERR_BAD_PARAMETER_TYPE, true, - PS_ERRORTEXT_psImageFFT_REAL_IMAG_TYPE_MISMATCH, - typeStrReal,typeStrImag); + psError(PS_ERR_BAD_PARAMETER_TYPE, true, + PS_ERRORTEXT_psImageFFT_REAL_IMAG_TYPE_MISMATCH, + typeStrReal,typeStrImag); psFree(out); return NULL; @@ -266,8 +259,7 @@ if (imag->numCols != numCols || imag->numRows != numRows) { - psErrorMsg(PS_ERRORNAME_DOMAIN "psImageComplex", - PS_ERR_BAD_PARAMETER_VALUE, true, - PS_ERRORTEXT_psImageFFT_REAL_IMAG_SIZE_MISMATCH, - numCols, numRows, imag->numCols, imag->numRows); + psError(PS_ERR_BAD_PARAMETER_VALUE, true, + PS_ERRORTEXT_psImageFFT_REAL_IMAG_SIZE_MISMATCH, + numCols, numRows, imag->numCols, imag->numRows); psFree(out); return NULL; @@ -308,8 +300,7 @@ char* typeStr; PS_TYPE_NAME(typeStr,type); - psErrorMsg(PS_ERRORNAME_DOMAIN "psImageComplex", - PS_ERR_BAD_PARAMETER_TYPE, true, - PS_ERRORTEXT_psImageFFT_NONREAL_NOTSUPPORTED, - typeStr); + psError(PS_ERR_BAD_PARAMETER_TYPE, true, + PS_ERRORTEXT_psImageFFT_NONREAL_NOTSUPPORTED, + typeStr); psFree(out); return NULL; @@ -369,8 +360,7 @@ char* typeStr; PS_TYPE_NAME(typeStr,type); - psErrorMsg(PS_ERRORNAME_DOMAIN "psImageConjugate", - PS_ERR_BAD_PARAMETER_TYPE, true, - PS_ERRORTEXT_psImageFFT_NONCOMPLEX_NOTSUPPORTED, - typeStr); + psError(PS_ERR_BAD_PARAMETER_TYPE, true, + PS_ERRORTEXT_psImageFFT_NONCOMPLEX_NOTSUPPORTED, + typeStr); psFree(out); return NULL; @@ -434,13 +424,12 @@ char* typeStr; PS_TYPE_NAME(typeStr,type); - psErrorMsg(PS_ERRORNAME_DOMAIN "psImagePowerSpectrum", - PS_ERR_BAD_PARAMETER_TYPE, true, - PS_ERRORTEXT_psImageFFT_NONCOMPLEX_NOTSUPPORTED, - typeStr); - psFree(out); - return NULL; - } - - return out; - -} + psError(PS_ERR_BAD_PARAMETER_TYPE, true, + PS_ERRORTEXT_psImageFFT_NONCOMPLEX_NOTSUPPORTED, + typeStr); + psFree(out); + return NULL; + } + + return out; + +} Index: trunk/psLib/src/image/psImageIO.c =================================================================== --- trunk/psLib/src/image/psImageIO.c (revision 2265) +++ trunk/psLib/src/image/psImageIO.c (revision 2273) @@ -7,6 +7,6 @@ * @author Robert DeSonia, MHPCC * - * @version $Revision: 1.14 $ $Name: not supported by cvs2svn $ - * @date $Date: 2004-10-27 19:35:58 $ + * @version $Revision: 1.15 $ $Name: not supported by cvs2svn $ + * @date $Date: 2004-11-04 01:05:00 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -47,7 +47,6 @@ if (filename == NULL) { - psErrorMsg(PS_ERRORNAME_DOMAIN "psImageReadSection", - PS_ERR_BAD_PARAMETER_NULL, true, - PS_ERRORTEXT_psImageIO_FILENAME_NULL); + psError(PS_ERR_BAD_PARAMETER_NULL, true, + PS_ERRORTEXT_psImageIO_FILENAME_NULL); psFree(output); return NULL; @@ -58,8 +57,7 @@ if (fptr == NULL || status != 0) { fits_get_errstatus(status, fitsErr); - psErrorMsg(PS_ERRORNAME_DOMAIN "psImageReadSection", - PS_ERR_BAD_PARAMETER_VALUE, true, - PS_ERRORTEXT_psImageIO_FILENAME_INVALID, - filename, fitsErr); + psError(PS_ERR_BAD_PARAMETER_VALUE, true, + PS_ERRORTEXT_psImageIO_FILENAME_INVALID, + filename, fitsErr); psFree(output); return NULL; @@ -72,8 +70,7 @@ status = 0; (void)fits_close_file(fptr, &status); - psErrorMsg(PS_ERRORNAME_DOMAIN "psImageReadSection", - PS_ERR_LOCATION_INVALID, true, - PS_ERRORTEXT_psImageIO_EXTNAME_INVALID, - extname, filename, fitsErr); + psError(PS_ERR_LOCATION_INVALID, true, + PS_ERRORTEXT_psImageIO_EXTNAME_INVALID, + extname, filename, fitsErr); psFree(output); return NULL; @@ -84,8 +81,7 @@ status = 0; (void)fits_close_file(fptr, &status); - psErrorMsg(PS_ERRORNAME_DOMAIN "psImageReadSection", - PS_ERR_LOCATION_INVALID, true, - PS_ERRORTEXT_psImageIO_EXTNUM_INVALID, - extnum, filename, fitsErr); + psError(PS_ERR_LOCATION_INVALID, true, + PS_ERRORTEXT_psImageIO_EXTNUM_INVALID, + extnum, filename, fitsErr); psFree(output); return NULL; @@ -98,8 +94,7 @@ status = 0; (void)fits_close_file(fptr, &status); - psErrorMsg(PS_ERRORNAME_DOMAIN "psImageReadSection", - PS_ERR_IO, true, - PS_ERRORTEXT_psImageIO_DATATYPE_UNKNOWN, - filename, fitsErr); + psError(PS_ERR_IO, true, + PS_ERRORTEXT_psImageIO_DATATYPE_UNKNOWN, + filename, fitsErr); psFree(output); return NULL; @@ -111,8 +106,7 @@ status = 0; (void)fits_close_file(fptr, &status); - psErrorMsg(PS_ERRORNAME_DOMAIN "psImageReadSection", - PS_ERR_IO, true, - PS_ERRORTEXT_psImageIO_IMAGE_DIM_UNKNOWN, - filename, fitsErr); + psError(PS_ERR_IO, true, + PS_ERRORTEXT_psImageIO_IMAGE_DIM_UNKNOWN, + filename, fitsErr); psFree(output); return NULL; @@ -123,8 +117,7 @@ status = 0; (void)fits_close_file(fptr, &status); - psErrorMsg(PS_ERRORNAME_DOMAIN "psImageReadSection", - PS_ERR_IO, true, - PS_ERRORTEXT_psImageIO_IMAGE_DIMENSION_UNSUPPORTED, - nAxis); + psError(PS_ERR_IO, true, + PS_ERRORTEXT_psImageIO_IMAGE_DIMENSION_UNSUPPORTED, + nAxis); psFree(output); return NULL; @@ -136,8 +129,7 @@ status = 0; (void)fits_close_file(fptr, &status); - psErrorMsg(PS_ERRORNAME_DOMAIN "psImageReadSection", - PS_ERR_IO, true, - PS_ERRORTEXT_psImageIO_IMAGE_SIZE_UNKNOWN, - filename, fitsErr); + psError(PS_ERR_IO, true, + PS_ERRORTEXT_psImageIO_IMAGE_SIZE_UNKNOWN, + filename, fitsErr); psFree(output); return NULL; @@ -201,8 +193,7 @@ break; default: - psErrorMsg(PS_ERRORNAME_DOMAIN "psImageReadSection", - PS_ERR_IO, true, - PS_ERRORTEXT_psImageIO_FITS_TYPE_UNSUPPORTED, - bitPix, filename); + psError(PS_ERR_IO, true, + PS_ERRORTEXT_psImageIO_FITS_TYPE_UNSUPPORTED, + bitPix, filename); psFree(output); return NULL; @@ -215,8 +206,7 @@ status = 0; (void)fits_close_file(fptr, &status); - psErrorMsg(PS_ERRORNAME_DOMAIN "psImageReadSection", - PS_ERR_IO, true, - PS_ERRORTEXT_psImageIO_READ_FAILED, - filename, fitsErr); + psError(PS_ERR_IO, true, + PS_ERRORTEXT_psImageIO_READ_FAILED, + filename, fitsErr); return NULL; } @@ -253,7 +243,6 @@ /* need a valid image to write */ if (input == NULL) { - psErrorMsg(PS_ERRORNAME_DOMAIN "psImageWriteSection", - PS_ERR_BAD_PARAMETER_NULL, true, - PS_ERRORTEXT_psImage_IMAGE_NULL); + psError(PS_ERR_BAD_PARAMETER_NULL, true, + PS_ERRORTEXT_psImage_IMAGE_NULL); return false; } @@ -301,8 +290,7 @@ char* typeStr; PS_TYPE_NAME(typeStr,input->type.type); - psErrorMsg(PS_ERRORNAME_DOMAIN "psImageWriteSection", - PS_ERR_BAD_PARAMETER_TYPE, true, - PS_ERRORTEXT_psImageIO_TYPE_UNSUPPORTED, - typeStr); + psError(PS_ERR_BAD_PARAMETER_TYPE, true, + PS_ERRORTEXT_psImageIO_TYPE_UNSUPPORTED, + typeStr); return false; } @@ -315,8 +303,7 @@ if (fptr == NULL || status != 0) { fits_get_errstatus(status, fitsErr); - psErrorMsg(PS_ERRORNAME_DOMAIN "psImageWriteSection", - PS_ERR_BAD_PARAMETER_VALUE, true, - PS_ERRORTEXT_psImageIO_FILENAME_INVALID, - filename, fitsErr); + psError(PS_ERR_BAD_PARAMETER_VALUE, true, + PS_ERRORTEXT_psImageIO_FILENAME_INVALID, + filename, fitsErr); return false; } @@ -328,8 +315,7 @@ status = 0; (void)fits_close_file(fptr, &status); - psErrorMsg(PS_ERRORNAME_DOMAIN "psImageWriteSection", - PS_ERR_LOCATION_INVALID, true, - PS_ERRORTEXT_psImageIO_EXTNAME_INVALID, - extname, filename, fitsErr); + psError(PS_ERR_LOCATION_INVALID, true, + PS_ERRORTEXT_psImageIO_EXTNAME_INVALID, + extname, filename, fitsErr); return false; } @@ -341,8 +327,7 @@ status = 0; (void)fits_close_file(fptr, &status); - psErrorMsg(PS_ERRORNAME_DOMAIN "psImageWriteSection", - PS_ERR_LOCATION_INVALID, true, - PS_ERRORTEXT_psImageIO_WRITE_EXTNUM_INVALID, - extnum, numHDUs); + psError(PS_ERR_LOCATION_INVALID, true, + PS_ERRORTEXT_psImageIO_WRITE_EXTNUM_INVALID, + extnum, numHDUs); return false; } else if (numHDUs == extnum) { @@ -352,8 +337,7 @@ status = 0; (void)fits_close_file(fptr, &status); - psErrorMsg(PS_ERRORNAME_DOMAIN "psImageWriteSection", - PS_ERR_LOCATION_INVALID, true, - PS_ERRORTEXT_psImageIO_EXTNUM_INVALID, - extnum, filename, fitsErr); + psError(PS_ERR_LOCATION_INVALID, true, + PS_ERRORTEXT_psImageIO_EXTNUM_INVALID, + extnum, filename, fitsErr); return false; } @@ -368,8 +352,7 @@ if (fptr == NULL || status != 0) { fits_get_errstatus(status, fitsErr); - psErrorMsg(PS_ERRORNAME_DOMAIN "psImageWriteSection", - PS_ERR_IO, true, - PS_ERRORTEXT_psImageIO_FILENAME_CREATE_FAILED, - filename, fitsErr); + psError(PS_ERR_IO, true, + PS_ERRORTEXT_psImageIO_FILENAME_CREATE_FAILED, + filename, fitsErr); return false; } @@ -386,8 +369,7 @@ status = 0; (void)fits_close_file(fptr, &status); - psErrorMsg(PS_ERRORNAME_DOMAIN "psImageWriteSection", - PS_ERR_IO, true, - PS_ERRORTEXT_psImageIO_CREATE_HDU_FAILED, - filename, fitsErr); + psError(PS_ERR_IO, true, + PS_ERRORTEXT_psImageIO_CREATE_HDU_FAILED, + filename, fitsErr); return false; } @@ -403,8 +385,7 @@ status = 0; (void)fits_close_file(fptr, &status); - psErrorMsg(PS_ERRORNAME_DOMAIN "psImageWriteSection", - PS_ERR_IO, true, - PS_ERRORTEXT_psImageIO_CREATE_EXTENSION_FAILED, - filename, fitsErr); + psError(PS_ERR_IO, true, + PS_ERRORTEXT_psImageIO_CREATE_EXTENSION_FAILED, + filename, fitsErr); return false; } @@ -424,8 +405,7 @@ status = 0; (void)fits_close_file(fptr, &status); - psErrorMsg(PS_ERRORNAME_DOMAIN "psImageWriteSection", - PS_ERR_IO, true, - PS_ERRORTEXT_psImageIO_WRITE_FAILED, - filename, fitsErr); + psError(PS_ERR_IO, true, + PS_ERRORTEXT_psImageIO_WRITE_FAILED, + filename, fitsErr); return false; } Index: trunk/psLib/src/image/psImageManip.c =================================================================== --- trunk/psLib/src/image/psImageManip.c (revision 2265) +++ trunk/psLib/src/image/psImageManip.c (revision 2273) @@ -10,6 +10,6 @@ * @author Ross Harman, MHPCC * - * @version $Revision: 1.29 $ $Name: not supported by cvs2svn $ - * @date $Date: 2004-10-27 00:57:31 $ + * @version $Revision: 1.30 $ $Name: not supported by cvs2svn $ + * @date $Date: 2004-11-04 01:05:00 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -43,8 +43,7 @@ if (max < min) { - psErrorMsg(PS_ERRORNAME_DOMAIN "psImageClip", - PS_ERR_BAD_PARAMETER_VALUE, true, - PS_ERRORTEXT_psImageManip_MAXMIN, - (double)min,(double)max); + psError(PS_ERR_BAD_PARAMETER_VALUE, true, + PS_ERRORTEXT_psImageManip_MAXMIN, + (double)min,(double)max); return 0; } @@ -58,16 +57,14 @@ case PS_TYPE_##type: { \ if (vmin < PS_MIN_##type || vmin > PS_MAX_##type) { \ - psErrorMsg(PS_ERRORNAME_DOMAIN "psImageClip", \ - PS_ERR_BAD_PARAMETER_VALUE, true, \ - PS_ERRORTEXT_psImage_PARAMETER_OUTOF_TYPERANGE, \ - "vmin",vmin, PS_TYPE_##type##_NAME, \ - (psF64)PS_MIN_##type,(psF64)PS_MAX_##type); \ + psError(PS_ERR_BAD_PARAMETER_VALUE, true, \ + PS_ERRORTEXT_psImage_PARAMETER_OUTOF_TYPERANGE, \ + "vmin",vmin, PS_TYPE_##type##_NAME, \ + (psF64)PS_MIN_##type,(psF64)PS_MAX_##type); \ } \ if (vmax > PS_MAX_##type || vmax < PS_MIN_##type) { \ - psErrorMsg(PS_ERRORNAME_DOMAIN "psImageClip", \ - PS_ERR_BAD_PARAMETER_VALUE, true, \ - PS_ERRORTEXT_psImage_PARAMETER_OUTOF_TYPERANGE, \ - "vmax",vmax, PS_TYPE_##type##_NAME, \ - (psF64)PS_MIN_##type,(psF64)PS_MAX_##type); \ + psError(PS_ERR_BAD_PARAMETER_VALUE, true, \ + PS_ERRORTEXT_psImage_PARAMETER_OUTOF_TYPERANGE, \ + "vmax",vmax, PS_TYPE_##type##_NAME, \ + (psF64)PS_MIN_##type,(psF64)PS_MAX_##type); \ } \ for (psU32 row = 0;row PS_MAX_##type) { \ - psErrorMsg(PS_ERRORNAME_DOMAIN "psImageClip", \ - PS_ERR_BAD_PARAMETER_VALUE, true, \ - PS_ERRORTEXT_psImage_PARAMETER_OUTOF_TYPERANGE, \ - "vmin",vmin, PS_TYPE_##type##_NAME, \ - (psF64)PS_MIN_##type,(psF64)PS_MAX_##type); \ + psError(PS_ERR_BAD_PARAMETER_VALUE, true, \ + PS_ERRORTEXT_psImage_PARAMETER_OUTOF_TYPERANGE, \ + "vmin",vmin, PS_TYPE_##type##_NAME, \ + (psF64)PS_MIN_##type,(psF64)PS_MAX_##type); \ } \ if (vmax > PS_MAX_##type || vmax < PS_MIN_##type) { \ - psErrorMsg(PS_ERRORNAME_DOMAIN "psImageClip", \ - PS_ERR_BAD_PARAMETER_VALUE, true, \ - PS_ERRORTEXT_psImage_PARAMETER_OUTOF_TYPERANGE, \ - "vmax",vmax, PS_TYPE_##type##_NAME, \ - (psF64)PS_MIN_##type,(psF64)PS_MAX_##type); \ + psError(PS_ERR_BAD_PARAMETER_VALUE, true, \ + PS_ERRORTEXT_psImage_PARAMETER_OUTOF_TYPERANGE, \ + "vmax",vmax, PS_TYPE_##type##_NAME, \ + (psF64)PS_MIN_##type,(psF64)PS_MAX_##type); \ } \ for (psU32 row = 0;rowtype.type); - psErrorMsg(PS_ERRORNAME_DOMAIN "psImageClip", - PS_ERR_BAD_PARAMETER_TYPE, true, - PS_ERRORTEXT_psImage_IMAGE_TYPE_UNSUPPORTED, - typeStr); + psError(PS_ERR_BAD_PARAMETER_TYPE, true, + PS_ERRORTEXT_psImage_IMAGE_TYPE_UNSUPPORTED, + typeStr); } } @@ -179,8 +173,7 @@ char* typeStr; PS_TYPE_NAME(typeStr,input->type.type); - psErrorMsg(PS_ERRORNAME_DOMAIN "psImageClipNaN", - PS_ERR_BAD_PARAMETER_TYPE, true, - PS_ERRORTEXT_psImage_IMAGE_TYPE_UNSUPPORTED, - typeStr); + psError(PS_ERR_BAD_PARAMETER_TYPE, true, + PS_ERRORTEXT_psImage_IMAGE_TYPE_UNSUPPORTED, + typeStr); } } @@ -204,14 +197,12 @@ if (image == NULL || overlay == NULL) { - psErrorMsg(PS_ERRORNAME_DOMAIN "psImageOverlaySection", - PS_ERR_BAD_PARAMETER_NULL, true, - PS_ERRORTEXT_psImage_IMAGE_NULL); + psError(PS_ERR_BAD_PARAMETER_NULL, true, + PS_ERRORTEXT_psImage_IMAGE_NULL); return 1; } if (op == NULL) { - psErrorMsg(PS_ERRORNAME_DOMAIN "psImageOverlaySection", - PS_ERR_BAD_PARAMETER_NULL, true, - PS_ERRORTEXT_psImageManip_OPERATION_NULL); + psError(PS_ERR_BAD_PARAMETER_NULL, true, + PS_ERRORTEXT_psImageManip_OPERATION_NULL); return 1; } @@ -224,8 +215,7 @@ PS_TYPE_NAME(typeStr,type); PS_TYPE_NAME(typeStrOverlay,overlay->type.type); - psErrorMsg(PS_ERRORNAME_DOMAIN "psImageOverlaySection", - PS_ERR_BAD_PARAMETER_TYPE, true, - PS_ERRORTEXT_psImageManip_OVERLAY_TYPE_MISMATCH, - typeStrOverlay, typeStr); + psError(PS_ERR_BAD_PARAMETER_TYPE, true, + PS_ERRORTEXT_psImageManip_OVERLAY_TYPE_MISMATCH, + typeStrOverlay, typeStr); return 2; } @@ -244,9 +234,8 @@ imageColLimit > imageNumCols) { - psErrorMsg(PS_ERRORNAME_DOMAIN "psImageOverlaySection", - PS_ERR_BAD_PARAMETER_VALUE, true, - PS_ERRORTEXT_psImage_SUBSET_RANGE_INVALID, - col0, imageColLimit, row0, imageRowLimit, - imageNumCols, imageNumRows); + psError(PS_ERR_BAD_PARAMETER_VALUE, true, + PS_ERRORTEXT_psImage_SUBSET_RANGE_INVALID, + col0, imageColLimit, row0, imageRowLimit, + imageNumCols, imageNumRows); return 3; } @@ -277,8 +266,7 @@ break; \ default: \ - psErrorMsg(PS_ERRORNAME_DOMAIN "psImageOverlaySection", \ - PS_ERR_BAD_PARAMETER_VALUE, true, \ - PS_ERRORTEXT_psImageManip_OVERLAY_OPERATOR_INVALID, \ - op); \ + psError(PS_ERR_BAD_PARAMETER_VALUE, true, \ + PS_ERRORTEXT_psImageManip_OVERLAY_OPERATOR_INVALID, \ + op); \ return 5; \ } \ @@ -303,8 +291,7 @@ char* typeStr; PS_TYPE_NAME(typeStr,type); - psErrorMsg(PS_ERRORNAME_DOMAIN "psImageOverlaySection", - PS_ERR_BAD_PARAMETER_TYPE, true, - PS_ERRORTEXT_psImage_IMAGE_TYPE_UNSUPPORTED, - typeStr); + psError(PS_ERR_BAD_PARAMETER_TYPE, true, + PS_ERRORTEXT_psImage_IMAGE_TYPE_UNSUPPORTED, + typeStr); return 6; } @@ -329,22 +316,19 @@ if (input == NULL) { - psErrorMsg(PS_ERRORNAME_DOMAIN "psImageClipComplexRegion", - PS_ERR_BAD_PARAMETER_NULL, true, - PS_ERRORTEXT_psImage_IMAGE_NULL); + psError(PS_ERR_BAD_PARAMETER_NULL, true, + PS_ERRORTEXT_psImage_IMAGE_NULL); return 0; } if (realMax < realMin) { - psErrorMsg(PS_ERRORNAME_DOMAIN "psImageClipComplexRegion", - PS_ERR_BAD_PARAMETER_VALUE, true, - PS_ERRORTEXT_psImageManip_MAXMIN_REAL, - (double)realMin, (double)realMax); + psError(PS_ERR_BAD_PARAMETER_VALUE, true, + PS_ERRORTEXT_psImageManip_MAXMIN_REAL, + (double)realMin, (double)realMax); return 0; } if (imagMax < imagMin) { - psErrorMsg(PS_ERRORNAME_DOMAIN "psImageClipComplexRegion", - PS_ERR_BAD_PARAMETER_VALUE, true, - PS_ERRORTEXT_psImageManip_MAXMIN_IMAG, - (double)imagMin, (double)imagMax); + psError(PS_ERR_BAD_PARAMETER_VALUE, true, + PS_ERRORTEXT_psImageManip_MAXMIN_IMAG, + (double)imagMin, (double)imagMax); return 0; } @@ -357,18 +341,16 @@ if (realfcn(vmin) < PS_MIN_##type || imagfcn(vmin) < PS_MIN_##type || \ realfcn(vmin) > PS_MAX_##type || imagfcn(vmin) > PS_MAX_##type ) { \ - psErrorMsg(PS_ERRORNAME_DOMAIN "psImageClipComplexRegion", \ - PS_ERR_BAD_PARAMETER_VALUE, true, \ - PS_ERRORTEXT_psImageManip_CLIP_VALUE_INVALID, \ - "vmin", creal(vmin), cimag(vmin), \ - PS_TYPE_##type##_NAME, PS_MIN_##type, PS_MAX_##type); \ + psError(PS_ERR_BAD_PARAMETER_VALUE, true, \ + PS_ERRORTEXT_psImageManip_CLIP_VALUE_INVALID, \ + "vmin", creal(vmin), cimag(vmin), \ + PS_TYPE_##type##_NAME, PS_MIN_##type, PS_MAX_##type); \ break; \ } \ if (realfcn(vmax) > PS_MAX_##type || imagfcn(vmax) > PS_MAX_##type || \ realfcn(vmax) < PS_MIN_##type || imagfcn(vmax) < PS_MIN_##type ) { \ - psErrorMsg(PS_ERRORNAME_DOMAIN "psImageClipComplexRegion", \ - PS_ERR_BAD_PARAMETER_VALUE, true, \ - PS_ERRORTEXT_psImageManip_CLIP_VALUE_INVALID, \ - "vmax", creal(vmax), cimag(vmax), \ - PS_TYPE_##type##_NAME, PS_MIN_##type, PS_MAX_##type); \ + psError(PS_ERR_BAD_PARAMETER_VALUE, true, \ + PS_ERRORTEXT_psImageManip_CLIP_VALUE_INVALID, \ + "vmax", creal(vmax), cimag(vmax), \ + PS_TYPE_##type##_NAME, PS_MIN_##type, PS_MAX_##type); \ break; \ } \ @@ -396,8 +378,7 @@ char* typeStr; PS_TYPE_NAME(typeStr,input->type.type); - psErrorMsg(PS_ERRORNAME_DOMAIN "psImageClipComplexRegion", - PS_ERR_BAD_PARAMETER_TYPE, true, - PS_ERRORTEXT_psImage_IMAGE_TYPE_UNSUPPORTED, - typeStr); + psError(PS_ERR_BAD_PARAMETER_TYPE, true, + PS_ERRORTEXT_psImage_IMAGE_TYPE_UNSUPPORTED, + typeStr); } } @@ -424,7 +405,6 @@ if (in == NULL) { - psErrorMsg(PS_ERRORNAME_DOMAIN "psImageRebin", - PS_ERR_BAD_PARAMETER_NULL, true, - PS_ERRORTEXT_psImage_IMAGE_NULL); + psError(PS_ERR_BAD_PARAMETER_NULL, true, + PS_ERRORTEXT_psImage_IMAGE_NULL); psFree(out); return NULL; @@ -432,8 +412,7 @@ if (scale < 1) { - psErrorMsg(PS_ERRORNAME_DOMAIN "psImageRebin", - PS_ERR_BAD_PARAMETER_VALUE, true, - PS_ERRORTEXT_psImageManip_SCALE_NOT_POSITIVE, - scale); + psError(PS_ERR_BAD_PARAMETER_VALUE, true, + PS_ERRORTEXT_psImageManip_SCALE_NOT_POSITIVE, + scale); psFree(out); return NULL; @@ -441,7 +420,6 @@ if (stats == NULL) { - psErrorMsg(PS_ERRORNAME_DOMAIN "psImageRebin", - PS_ERR_BAD_PARAMETER_NULL, true, - PS_ERRORTEXT_psImage_STAT_NULL); + psError(PS_ERR_BAD_PARAMETER_NULL, true, + PS_ERRORTEXT_psImage_STAT_NULL); psFree(out); return NULL; @@ -449,8 +427,7 @@ if (p_psGetStatValue(stats, &statVal) == false) { - psErrorMsg(PS_ERRORNAME_DOMAIN "psImageRebin", - PS_ERR_BAD_PARAMETER_VALUE, true, - PS_ERRORTEXT_psImage_BAD_STAT, - stats->options); + psError(PS_ERR_BAD_PARAMETER_VALUE, true, + PS_ERRORTEXT_psImage_BAD_STAT, + stats->options); psFree(out); return NULL; @@ -463,8 +440,7 @@ char* typeStr; PS_TYPE_NAME(typeStr,mask->type.type); - psErrorMsg(PS_ERRORNAME_DOMAIN "psImageRebin", - 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(vec); @@ -536,8 +512,7 @@ char* typeStr; PS_TYPE_NAME(typeStr,in->type.type); - psErrorMsg(PS_ERRORNAME_DOMAIN "psImageRebin", - PS_ERR_BAD_PARAMETER_TYPE, true, - PS_ERRORTEXT_psImage_IMAGE_TYPE_UNSUPPORTED, - typeStr); + psError(PS_ERR_BAD_PARAMETER_TYPE, true, + PS_ERRORTEXT_psImage_IMAGE_TYPE_UNSUPPORTED, + typeStr); psFree(out); out = NULL; @@ -562,7 +537,6 @@ if (in == NULL) { - psErrorMsg(PS_ERRORNAME_DOMAIN "psImageResample", - PS_ERR_BAD_PARAMETER_NULL, true, - PS_ERRORTEXT_psImage_IMAGE_NULL); + psError(PS_ERR_BAD_PARAMETER_NULL, true, + PS_ERRORTEXT_psImage_IMAGE_NULL); psFree(out); return NULL; @@ -570,8 +544,7 @@ if (scale < 1) { - psErrorMsg(PS_ERRORNAME_DOMAIN "psImageResample", - PS_ERR_BAD_PARAMETER_VALUE, true, - PS_ERRORTEXT_psImageManip_SCALE_NOT_POSITIVE, - scale); + psError(PS_ERR_BAD_PARAMETER_VALUE, true, + PS_ERRORTEXT_psImageManip_SCALE_NOT_POSITIVE, + scale); psFree(out); return NULL; @@ -579,8 +552,7 @@ if (mode < PS_INTERPOLATE_FLAT || mode >= PS_INTERPOLATE_NUM_MODES) { - psErrorMsg(PS_ERRORNAME_DOMAIN "psImageResample", - PS_ERR_BAD_PARAMETER_VALUE, true, - PS_ERRORTEXT_psImageManip_INTERPOLATION_MODE_UNSUPPORTED, - mode); + psError(PS_ERR_BAD_PARAMETER_VALUE, true, + PS_ERRORTEXT_psImageManip_INTERPOLATION_MODE_UNSUPPORTED, + mode); psFree(out); return NULL; @@ -622,8 +594,7 @@ char* typeStr; PS_TYPE_NAME(typeStr,in->type.type); - psErrorMsg(PS_ERRORNAME_DOMAIN "psImageResample", - PS_ERR_BAD_PARAMETER_TYPE, true, - PS_ERRORTEXT_psImage_IMAGE_TYPE_UNSUPPORTED, - typeStr); + psError(PS_ERR_BAD_PARAMETER_TYPE, true, + PS_ERRORTEXT_psImage_IMAGE_TYPE_UNSUPPORTED, + typeStr); psFree(out); out = NULL; @@ -644,7 +615,6 @@ if (in == NULL) { - psErrorMsg(PS_ERRORNAME_DOMAIN "psImageRoll", - PS_ERR_BAD_PARAMETER_NULL, true, - PS_ERRORTEXT_psImage_IMAGE_NULL); + psError(PS_ERR_BAD_PARAMETER_NULL, true, + PS_ERRORTEXT_psImage_IMAGE_NULL); psFree(out); return NULL; @@ -694,7 +664,6 @@ { if (in == NULL) { - psErrorMsg(PS_ERRORNAME_DOMAIN "psImageRotate", - PS_ERR_BAD_PARAMETER_NULL, true, - PS_ERRORTEXT_psImage_IMAGE_NULL); + psError(PS_ERR_BAD_PARAMETER_NULL, true, + PS_ERRORTEXT_psImage_IMAGE_NULL); psFree(out); return NULL; @@ -741,8 +710,7 @@ char* typeStr; PS_TYPE_NAME(typeStr,type); - psErrorMsg(PS_ERRORNAME_DOMAIN "psImageRotate", - PS_ERR_BAD_PARAMETER_TYPE, true, - PS_ERRORTEXT_psImage_IMAGE_TYPE_UNSUPPORTED, - typeStr); + psError(PS_ERR_BAD_PARAMETER_TYPE, true, + PS_ERRORTEXT_psImage_IMAGE_TYPE_UNSUPPORTED, + typeStr); psFree(out); return NULL; @@ -788,8 +756,7 @@ char* typeStr; PS_TYPE_NAME(typeStr,type); - psErrorMsg(PS_ERRORNAME_DOMAIN "psImageRotate", - PS_ERR_BAD_PARAMETER_TYPE, true, - PS_ERRORTEXT_psImage_IMAGE_TYPE_UNSUPPORTED, - typeStr); + psError(PS_ERR_BAD_PARAMETER_TYPE, true, + PS_ERRORTEXT_psImage_IMAGE_TYPE_UNSUPPORTED, + typeStr); psFree(out); return NULL; @@ -834,8 +801,7 @@ char* typeStr; PS_TYPE_NAME(typeStr,type); - psErrorMsg(PS_ERRORNAME_DOMAIN "psImageRotate", - PS_ERR_BAD_PARAMETER_TYPE, true, - PS_ERRORTEXT_psImage_IMAGE_TYPE_UNSUPPORTED, - typeStr); + psError(PS_ERR_BAD_PARAMETER_TYPE, true, + PS_ERRORTEXT_psImage_IMAGE_TYPE_UNSUPPORTED, + typeStr); psFree(out); return NULL; @@ -891,11 +857,10 @@ cimag(unexposedValue) < PS_MIN_##TYPE || \ cimag(unexposedValue) > PS_MAX_##TYPE) { \ - psErrorMsg(PS_ERRORNAME_DOMAIN "psImageRotate", \ - PS_ERR_BAD_PARAMETER_VALUE, true, \ - PS_ERRORTEXT_psImageManip_CLIP_VALUE_INVALID, \ - "unexposedValue", \ - creal(unexposedValue),cimag(unexposedValue), \ - PS_TYPE_##TYPE##_NAME, \ - (double)PS_MIN_##TYPE,(double)PS_MAX_##TYPE); \ + psError(PS_ERR_BAD_PARAMETER_VALUE, true, \ + PS_ERRORTEXT_psImageManip_CLIP_VALUE_INVALID, \ + "unexposedValue", \ + creal(unexposedValue),cimag(unexposedValue), \ + PS_TYPE_##TYPE##_NAME, \ + (double)PS_MIN_##TYPE,(double)PS_MAX_##TYPE); \ psFree(out); \ out = NULL; \ @@ -959,8 +924,7 @@ char* typeStr; \ PS_TYPE_NAME(typeStr,type); \ - psErrorMsg(PS_ERRORNAME_DOMAIN "psImageRotate", \ - PS_ERR_BAD_PARAMETER_TYPE, true, \ - PS_ERRORTEXT_psImage_IMAGE_TYPE_UNSUPPORTED, \ - typeStr); \ + psError(PS_ERR_BAD_PARAMETER_TYPE, true, \ + PS_ERRORTEXT_psImage_IMAGE_TYPE_UNSUPPORTED, \ + typeStr); \ psFree(out); \ out = NULL; \ @@ -973,8 +937,7 @@ PSIMAGE_ROTATE_ARBITRARY_CASE(BILINEAR); default: - psErrorMsg(PS_ERRORNAME_DOMAIN "psImageRotate", - PS_ERR_BAD_PARAMETER_VALUE, true, - PS_ERRORTEXT_psImageManip_INTERPOLATION_MODE_UNSUPPORTED, - mode); + psError(PS_ERR_BAD_PARAMETER_VALUE, true, + PS_ERRORTEXT_psImageManip_INTERPOLATION_MODE_UNSUPPORTED, + mode); psFree(out); out = NULL; @@ -998,7 +961,6 @@ if (in == NULL) { - psErrorMsg(PS_ERRORNAME_DOMAIN "psImageShift", - PS_ERR_BAD_PARAMETER_NULL, true, - PS_ERRORTEXT_psImage_IMAGE_NULL); + psError(PS_ERR_BAD_PARAMETER_NULL, true, + PS_ERRORTEXT_psImage_IMAGE_NULL); psFree(out); return NULL; @@ -1018,11 +980,10 @@ cimag(unexposedValue) < PS_MIN_##TYPE || \ cimag(unexposedValue) > PS_MAX_##TYPE) { \ - psErrorMsg(PS_ERRORNAME_DOMAIN "psImageShift", \ - PS_ERR_BAD_PARAMETER_VALUE, true, \ - PS_ERRORTEXT_psImageManip_CLIP_VALUE_INVALID, \ - "unexposedValue", \ - creal(unexposedValue),cimag(unexposedValue), \ - PS_TYPE_##TYPE##_NAME, \ - (double)PS_MIN_##TYPE,(double)PS_MAX_##TYPE); \ + psError(PS_ERR_BAD_PARAMETER_VALUE, true, \ + PS_ERRORTEXT_psImageManip_CLIP_VALUE_INVALID, \ + "unexposedValue", \ + creal(unexposedValue),cimag(unexposedValue), \ + PS_TYPE_##TYPE##_NAME, \ + (double)PS_MIN_##TYPE,(double)PS_MAX_##TYPE); \ psFree(out); \ out = NULL; \ @@ -1058,8 +1019,7 @@ char* typeStr; \ PS_TYPE_NAME(typeStr,type); \ - psErrorMsg(PS_ERRORNAME_DOMAIN "psImageRotate", \ - PS_ERR_BAD_PARAMETER_TYPE, true, \ - PS_ERRORTEXT_psImage_IMAGE_TYPE_UNSUPPORTED, \ - typeStr); \ + psError(PS_ERR_BAD_PARAMETER_TYPE, true, \ + PS_ERRORTEXT_psImage_IMAGE_TYPE_UNSUPPORTED, \ + typeStr); \ psFree(out); \ out = NULL; \ @@ -1073,8 +1033,7 @@ PSIMAGE_SHIFT_ARBITRARY_CASE(BILINEAR); default: - psErrorMsg(PS_ERRORNAME_DOMAIN "psImageShift", - PS_ERR_BAD_PARAMETER_VALUE, true, - PS_ERRORTEXT_psImageManip_INTERPOLATION_MODE_UNSUPPORTED, - mode); + psError(PS_ERR_BAD_PARAMETER_VALUE, true, + PS_ERRORTEXT_psImageManip_INTERPOLATION_MODE_UNSUPPORTED, + mode); psFree(out); out = NULL; 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