Changeset 2758

Timestamp:

Dec 17, 2004, 4:32:54 PM (22 years ago)

Author:

evanalst

Message:

Add case for 1D image.

Location:

trunk/psLib/test/image

Files:

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

trunk/psLib/test/image/tst_psImageInterpolate.c

@@ -5 +5 @@
  * @author Eric Van Alst, MHPCC
  *
- * @version $Revision: 1.2 $
+ * @version $Revision: 1.3 $
  *          $Name: not supported by cvs2svn $
- * @date $Date: 2004-12-17 22:33:21 $
+ * @date $Date: 2004-12-18 02:32:53 $
  *
  * Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -27 +27 @@
 #define CHECK_INTERP_VALUE(img,x,y,mask,maskval,exposed,TYPE,expected) \
 val = (psF32)psImagePixelInterpolate(img,x,y,mask,maskval,exposed,PS_INTERPOLATE_##TYPE); \
+printf("returned = %.2f    expected = %.2f\n",val,expected); \
 if(val != expected) { \
     psError(PS_ERR_UNKNOWN,true,"Return value is not as expected."); \
@@ -41 +42 @@
 static psS32 testInterpolateError(void);
 static psS32 testInterpolateMaskFlatBilinear(void);
+static psS32 testInterpolate1D(void);
+
 testDescription tests[] = {
                               {testInterpolateFlatBilinear,999,"psImagePixelInterpolate",0,false},
                               {testInterpolateError,999,"psImagePixelInterpolate",0,false},
                               {testInterpolateMaskFlatBilinear,999,"psImagePixelInterpolate",0,false},
+                              {testInterpolate1D,999,"psImagePixelInterpolate",0,false},
                               {NULL}
                           };
@@ -263 +267 @@
 }
 
+// Perform interpolation for a 1D image
+psS32 testInterpolate1D(void)
+{
+    psImage* img1 = NULL;
+    psF32 val = 0;
+
+    GENIMAGE(img1,10,1,F32,row+col)
+    CHECK_INTERP_VALUE(img1,4.0,0.0,NULL,0,100.0,BILINEAR,3.5)
+
+    psFree(img1);
+
+    return 0;
+}
+

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

@@ -38 +38 @@
 ---> TESTPOINT PASSED (psImagePixelInterpolate{psImagePixelInterpolate} | tst_psImageInterpolate.c)
 
+/***************************** TESTPOINT ******************************************\
+*             TestFile: tst_psImageInterpolate.c                                   *
+*            TestPoint: psImagePixelInterpolate{psImagePixelInterpolate}           *
+*             TestType: Positive                                                   *
+\**********************************************************************************/
+
+
+---> TESTPOINT PASSED (psImagePixelInterpolate{psImagePixelInterpolate} | tst_psImageInterpolate.c)
+