Changeset 2273 for trunk/psLib/src/fft/psImageFFT.c

Timestamp:

Nov 3, 2004, 3:05:00 PM (22 years ago)

Author:

desonia

Message:

changed the psError signature to match SDRS. Also made misc. cleanups as
I was combing the files.

File:

• trunk/psLib/src/fft/psImageFFT.c (modified) (10 diffs)

trunk/psLib/src/fft/psImageFFT.c

@@ -5 +5 @@
  *  @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 +43 @@
     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 +83 @@
     /* 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 +159 @@
         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 +221 @@
         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 +251 @@
         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 +259 @@
 
     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 +300 @@
         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 +360 @@
         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 +424 @@
         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;
+
+}