Changeset 1221 for trunk/psLib/test/image/tst_psImageManip.c

Timestamp:

Jul 14, 2004, 2:08:44 PM (22 years ago)

Author:

desonia

Message:

fixed tests to coorespond to changes in psImageClip and/or the FullUnitTest/runTest
scripts.

File:

• trunk/psLib/test/image/tst_psImageManip.c (modified) (4 diffs)

trunk/psLib/test/image/tst_psImageManip.c

@@ -6 +6 @@
  *  @author Robert DeSonia, MHPCC
  *
- *  @version $Revision: 1.2 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-07-14 23:23:42 $
+ *  @version $Revision: 1.3 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-07-15 00:08:43 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -52 +52 @@
     unsigned int c = 128;
     unsigned int r = 256;
-    psF32 min;
-    psF32 max;
+    psF64 min;
+    psF64 max;
     int numClipped = 0;
     int retVal;
@@ -91 +91 @@
         } \
     } \
-    min = (float)r/2.0f; \
-    max = (float)r; \
+    min = (psF64)r/2.0; \
+    max = (psF64)r; \
     \
-    retVal = psImageClip(img,min,-1.0f,max,-2.0f); \
+    retVal = psImageClip(img,min,(double)PS_MIN_##datatype,max,(double)PS_MAX_##datatype); \
     \
     numClipped = 0; \
@@ -101 +101 @@
         for (unsigned int col=0;col<c;col++) { \
             ps##datatype value = (ps##datatype)(row+col); \
-            if (value < (ps##datatype)min) { \
+            if (value < min) { \
                 numClipped++; \
-                value = -1; \
-            } else if (value > (ps##datatype)max) { \
+                value = PS_MIN_##datatype; \
+            } else if (value > max) { \
                 numClipped++; \
-                value = -2; \
+                value = PS_MAX_##datatype; \
             } \
             if (fabsf(imgRow[col]-value) > FLT_EPSILON) { \
-                psError(__func__,"Pixel value is not as expected (%d vs %d) at %u,%u", \
-                        imgRow[col],value,col,row); \
+                psError(__func__,"Pixel value is not as expected (%g vs %g) at %u,%u", \
+                        (psF64)imgRow[col],(psF64)value,col,row); \
                 return 1; \
             } \