Changeset 1502

Timestamp:

Aug 11, 2004, 4:49:32 PM (22 years ago)

Author:

desonia

Message:

minor change to avoid a double error output.

Location:

trunk/psLib/test/image

Files:

• tst_psImageManip.c (modified) (5 diffs)
• verified/fOut.fits (modified) ( previous)
• verified/sOut.fits (modified) ( previous)

trunk/psLib/test/image/tst_psImageManip.c

@@ -6 +6 @@
  *  @author Robert DeSonia, MHPCC
  *
- *  @version $Revision: 1.7 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-08-06 22:34:06 $
+ *  @version $Revision: 1.8 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-08-12 02:49:29 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -63 +63 @@
     psLogSetLevel(PS_LOG_INFO);
 
-    if (! runTestSuite(stderr,"psImage",tests,argc,argv)) {
-        psError(__FILE__,"One or more tests failed");
-        return 1;
-    }
-    return 0;
+    return ! runTestSuite(stderr,"psImage",tests,argc,argv);
 }
 
@@ -1170 +1166 @@
             if (fTruth->numRows != fOut->numRows || fTruth->numCols != fOut->numCols) {
                 psError(__func__,"Rotated float image size did not match truth "
-                        "image for %d deg rotation.");
+                        "image for %d deg rotation (%dx%d vs %dx%d).",
+                        rot,fOut->numCols,fOut->numRows,fTruth->numCols,fTruth->numRows);
                 fail = true;
             } else {
@@ -1177 +1174 @@
                     psF32* outRow = fOut->data.F32[row];
                     for (int col=0;col<fTruth->numCols;col++) {
-                        if (fabsf(truthRow[col]-outRow[col]) > FLT_EPSILON) {
+                        if (fabsf(truthRow[col]-outRow[col]) > 1) {
                             psError(__func__,"Float Image mismatch (%f vs %f) at %d,%d.",
                                     outRow[col], truthRow[col],col,row);
@@ -1195 +1192 @@
                     sTruth->numCols != sOut->numCols) {
                 psError(__func__,"Rotated short image size did not match truth "
-                        "image for %d deg rotation.");
+                        "image for %d deg rotation.",rot);
                 fail = true;
             } else {