Changeset 1909

Timestamp:

Sep 27, 2004, 2:30:32 PM (22 years ago)

Author:

desonia

Message:

fixed problems from psImagePixelInterpolate number of parameters changing.

Location:

trunk/psLib/test

Files:

• dataManip/Makefile (modified) (4 diffs)
• image/tst_psImageManip.c (modified) (2 diffs)
• image/tst_psImageStats03.c (modified) (2 diffs)

trunk/psLib/test/dataManip/Makefile

@@ -3 +3 @@
 ##  Makefile:   test/sysUtils
 ##
-##  $Revision: 1.46 $  $Name: not supported by cvs2svn $
-##  $Date: 2004-09-27 23:41:42 $
+##  $Revision: 1.47 $  $Name: not supported by cvs2svn $
+##  $Date: 2004-09-28 00:30:32 $
 ##
 ##  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -25 +25 @@
 tst_psFunc04 \
 tst_psFunc05 \
-tst_psFunc06 \
 tst_psFunc07 \
 tst_psHist00 \
@@ -42 +41 @@
 tst_psMatrixVectorArithmetic03 \
 tst_psMinimize04 \
-tst_psMinimize04b \
 tst_psMinimize05 \
 tst_psMinimize06 \
@@ -55 +53 @@
 tst_psStats09 \
 tst_psVectorFFT 
+# tst_psFunc06 \
+# tst_psMinimize04b \
 
 OBJS = $(addsuffix .o,$(TARGET))

trunk/psLib/test/image/tst_psImageManip.c

@@ -6 +6 @@
  *  @author Robert DeSonia, MHPCC
  *
- *  @version $Revision: 1.19 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-09-25 01:38:24 $
+ *  @version $Revision: 1.20 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-09-28 00:30:32 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -1391 +1391 @@
         for (int col=0;col<cols;col++) {
             psF32 fValue = psImagePixelInterpolate(fImg,col+colShift,
-                                                   row+rowShift,NAN,PS_INTERPOLATE_FLAT);
+                                                   row+rowShift,NULL,0,NAN,PS_INTERPOLATE_FLAT);
             psS16 sValue = (psS16)psImagePixelInterpolate(sImg,col+colShift,
-                           row+rowShift,-1,PS_INTERPOLATE_FLAT);
+                           row+rowShift,NULL,0,-1,PS_INTERPOLATE_FLAT);
 
             if (fabsf(fRow[col] - fValue) > FLT_EPSILON) {

trunk/psLib/test/image/tst_psImageStats03.c

@@ -46 +46 @@
             x = 0.2 + (float) i;
             y = 0.2 + (float) j;
-            pixel = psImagePixelInterpolate(tmpImage, x, y,0,PS_INTERPOLATE_BILINEAR);
+            pixel = psImagePixelInterpolate(tmpImage,
+                                            x, y,
+                                            NULL, 0,
+                                            0,
+                                            PS_INTERPOLATE_BILINEAR);
             printf("%.1f ", pixel);
         }
@@ -56 +60 @@
             x = 0.2 + (float) i;
             y = 0.2 + (float) j;
-            pixel = psImagePixelInterpolate(tmpImage, x, y,0,PS_INTERPOLATE_BILINEAR);
+            pixel = psImagePixelInterpolate(tmpImage,
+                                            x, y,
+                                            NULL,0,
+                                            0,
+                                            PS_INTERPOLATE_BILINEAR);
             printf("image[%.1f][%.1f] is interpolated at %.1f\n", x, y, pixel);
         }