Changeset 3446 for trunk/psLib/test/image

Timestamp:

Mar 17, 2005, 4:35:15 PM (21 years ago)

Author:

desonia

Message:

added BILINEAR_VARIANCE interpolation mode.

Location:

trunk/psLib/test/image

Files:

• tst_psImageInterpolate.c (modified) (2 diffs)
• tst_psImageManip.c (modified) (2 diffs)
• verified/tst_psImageManip.stderr (modified) (1 diff)

trunk/psLib/test/image/tst_psImageInterpolate.c

@@ -5 +5 @@
  * @author Eric Van Alst, MHPCC
  *
- * @version $Revision: 1.4 $
+ * @version $Revision: 1.5 $
  *          $Name: not supported by cvs2svn $
- * @date $Date: 2005-02-17 19:26:25 $
+ * @date $Date: 2005-03-18 02:35:15 $
  *
  * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -28 +28 @@
 val = (psF32)psImagePixelInterpolate(img,x,y,mask,maskval,exposed,PS_INTERPOLATE_##TYPE); \
 printf("returned = %.2f    expected = %.2f\n",val,expected); \
-if(val != expected) { \
+if(fabsf(val-expected)>FLT_EPSILON) { \
     psError(PS_ERR_UNKNOWN,true,"Return value is not as expected."); \
     return 1; \

trunk/psLib/test/image/tst_psImageManip.c

@@ -6 +6 @@
  *  @author Robert DeSonia, MHPCC
  *
- *  @version $Revision: 1.39 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-02-22 19:25:53 $
+ *  @version $Revision: 1.40 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-03-18 02:35:15 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -1771 +1771 @@
     // verify that invalid interpolation mode is handled properly
     psErrorClear();
-    result = psImageResample(result,image,2,0);
+    result = psImageResample(result,image,2,-1);
 
     if (result != NULL) {

trunk/psLib/test/image/verified/tst_psImageManip.stderr

@@ -422 +422 @@
     Specified scale value, 0, must be a positive value.
 <DATE><TIME>|<HOST>|E|psImageResample (FILE:LINENO)
-    Specified interpolation mode, 0, is unsupported.
+    Specified interpolation mode, -1, is unsupported.
 <DATE><TIME>|<HOST>|E|psImageResample (FILE:LINENO)
     Specified psImage type, psPtr, is not supported.