Changeset 1840 for trunk/psLib/src/imageops/psImageConvolve.c

Timestamp:

Sep 21, 2004, 12:30:19 PM (22 years ago)

Author:

desonia

Message:

Changed the image code to the new psErrorMsg error handling specification.

File:

• trunk/psLib/src/imageops/psImageConvolve.c (modified) (5 diffs)

trunk/psLib/src/imageops/psImageConvolve.c

@@ -5 +5 @@
  *  @author Robert DeSonia, MHPCC
  *
- *  @version $Revision: 1.1 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-08-28 01:18:28 $
+ *  @version $Revision: 1.2 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-09-21 22:30:19 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -16 +16 @@
 #include "psLogMsg.h"
 #include "psError.h"
+
+#include "psImageErrors.h"
 
 static void freeKernel(psKernel* ptr);
@@ -76 +78 @@
 }
 
-psKernel *psKernelGenerate(const psVector *xShifts, const psVector *yShifts)
+psKernel* psKernelGenerate(const psVector* xShifts, const psVector* yShifts)
 {
     int x = 0;
@@ -91 +93 @@
     // got non-NULL vectors?
     if (xShifts == NULL || yShifts == NULL) {
-        psError(__func__,"Shift vectors can not be NULL.");
+        psErrorMsg(PS_ERRORNAME_DOMAIN "psKernelGenerate",
+                   PS_ERR_BAD_PARAMETER_NULL, true,
+                   PS_ERRORTEXT_psImageConvolve_SHIFT_NULL);
         return NULL;
     }
 
+    // types match?
     if (xShifts->type.type != yShifts->type.type) {
-        psError(__func__,"Shift vectors can not be different data types.");
+        char* typeXStr;
+        char* typeYStr;
+        PS_TYPE_NAME(typeXStr,xShifts->type.type);
+        PS_TYPE_NAME(typeYStr,yShifts->type.type);
+        psErrorMsg(PS_ERRORNAME_DOMAIN "psKernelGenerate",
+                   PS_ERR_BAD_PARAMETER_TYPE, true,
+                   PS_ERRORTEXT_psImageConvolve_SHIFT_TYPE_MISMATCH,
+                   typeXStr, typeYStr);
         return NULL;
     }
@@ -158 +170 @@
         KERNEL_GENERATE_CASE(C32);
         KERNEL_GENERATE_CASE(C64);
-    default:
-        psError(__func__,"Shift vector datatype not supported.");
+
+    default: {
+            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);
+        }
     }