Changeset 1840 for trunk/psLib/src/image/psImage.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/image/psImage.c (modified) (4 diffs)

trunk/psLib/src/image/psImage.c

@@ -10 +10 @@
  *  @author Ross Harman, MHPCC
  *
- *  @version $Revision: 1.43 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-09-16 18:51:31 $
+ *  @version $Revision: 1.44 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-09-21 22:30:19 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -224 +224 @@
     }
 
-    #define PSIMAGE_PIXEL_INTERPOLATE_CASE(TYPE)                             \
+    #define PSIMAGE_PIXEL_INTERPOLATE_CASE(TYPE)                     \
 case PS_TYPE_##TYPE:                                                 \
     switch (mode) {                                                  \
@@ -237 +237 @@
     default:                                                         \
         psErrorMsg(PS_ERRORNAME_DOMAIN "psImagePixelInterpolate",    \
-                   PS_ERR_BAD_PARAMETER_VALUE,true,                     \
-                   PS_ERRORTEXT_psImage_INTERPOLATE_METHOD_INVALID,     \
-                   mode);                                               \
-    }                                                                    \
+                   PS_ERR_BAD_PARAMETER_VALUE,true,                  \
+                   PS_ERRORTEXT_psImage_INTERPOLATE_METHOD_INVALID,  \
+                   mode);                                            \
+    }                                                                \
     break
 
@@ -256 +256 @@
         PSIMAGE_PIXEL_INTERPOLATE_CASE(C32);
         PSIMAGE_PIXEL_INTERPOLATE_CASE(C64);
-    default:
-        psErrorMsg(PS_ERRORNAME_DOMAIN "psImagePixelInterpolate",
-                   PS_ERR_BAD_PARAMETER_TYPE,true,
-                   PS_ERRORTEXT_psImage_IMAGE_TYPE_UNSUPPORTED,
-                   input->type.type);
+    default: {
+            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);
+        }
     }