Changeset 13350

Timestamp:

May 11, 2007, 6:48:31 AM (19 years ago)

Author:

rhl

Message:

Support S32 in psImageConvolveDirect

File:

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

trunk/psLib/src/imageops/psImageConvolve.c

@@ -7 +7 @@
 /// @author Eugene Magnier, IfA
 ///
-/// @version $Revision: 1.51 $ $Name: not supported by cvs2svn $
-/// @date $Date: 2007-04-04 22:42:02 $
+/// @version $Revision: 1.52 $ $Name: not supported by cvs2svn $
+/// @date $Date: 2007-05-11 16:48:31 $
 ///
 /// Copyright 2004-2007 Institute for Astronomy, University of Hawaii
@@ -204 +204 @@
 {
     PS_ASSERT_IMAGE_NON_NULL(in, NULL);
-    PS_ASSERT_IMAGE_TYPE_F32_OR_F64(in, NULL);
+    if (in->type.type != PS_TYPE_S32 && in->type.type != PS_TYPE_F32 && in->type.type != PS_TYPE_F64) {
+        psError(PS_ERR_BAD_PARAMETER_TYPE, true,
+                "Unallowable operation: psImage %s is not of type S32 or F{32,64}.", "in");
+        return(NULL);
+    }
     PS_ASSERT_PTR_NON_NULL(kernel, NULL);
     PS_ASSERT_PTR_NON_NULL(kernel->kernel, NULL);
@@ -270 +274 @@
 
     switch (in->type.type) {
+        SPATIAL_CONVOLVE_CASE(S32);
         SPATIAL_CONVOLVE_CASE(F32);
         SPATIAL_CONVOLVE_CASE(F64);