Changeset 7125

Timestamp:

May 16, 2006, 1:12:20 PM (20 years ago)

Author:

drobbin

Message:

fixed tests for ImageRow/Col F32, F64. Edited value comparisons to check correct values.

Location:

trunk/psLib

Files:

• src/imageops/psImagePixelExtract.c (modified) (2 diffs)
• test/imageops/tst_psImagePixelExtract.c (modified) (3 diffs)

trunk/psLib/src/imageops/psImagePixelExtract.c

@@ -8 +8 @@
  *  @author Robert DeSonia, MHPCC
  *
- *  @version $Revision: 1.23 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-05-16 20:40:26 $
+ *  @version $Revision: 1.24 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-05-16 23:12:20 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -103 +103 @@
         psError(PS_ERR_BAD_PARAMETER_TYPE, true,
                 "Specified psImage has invalid type for this function.\n");
+        psFree(out);
         return NULL;
     }

trunk/psLib/test/imageops/tst_psImagePixelExtract.c

@@ -6 +6 @@
 *  @author Robert DeSonia, MHPCC
 *
-*  @version $Revision: 1.10 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2006-05-16 20:40:26 $
+*  @version $Revision: 1.11 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2006-05-16 23:12:20 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -1087 +1087 @@
     //Test recycling of non-NULL vector & correct output
     rowcol = psImageCol(rowcol, image, 1);
-    if (rowcol->data.F64[0] != 6.666 && rowcol->data.F64[2] != 66.666) {
+    double test1, test2;
+    double TOLTST = .001;
+    test1 = fabs(rowcol->data.F64[0]-6.6);
+    test2 = fabs(rowcol->data.F64[2]-66.666);
+    if ( (test1>TOLTST) || (test2>TOLTST) ) {
         psError(PS_ERR_BAD_PARAMETER_VALUE, false,
                 "psImageCol failed to return correct values.\n");
         return 3;
+    }
+    rowcol = psImageRow(rowcol, image, 1);
+    test1 = fabs(rowcol->data.F64[0]-66.6);
+    test2 = fabs(rowcol->data.F64[2]-666.66);
+    if ( (test1>TOLTST) || (test2>TOLTST) ) {
+        psError(PS_ERR_BAD_PARAMETER_VALUE, false,
+                "psImageRow failed to return correct values.\n");
+        return 4;
     }
 
@@ -1141 +1153 @@
     //Test recycling of non-NULL vector & correct output
     rowcol = psImageCol(rowcol, image, 1);
-    //    test1 = abs(rowcol->data.F32[0]-66.6);
-    //    test2 = abs(rowcol->data.F32[2]-666.66);
-    test1 = abs(rowcol->data.F32[0]-6.6);
-    test2 = abs(rowcol->data.F32[2]-66.666);
+    test1 = fabs(rowcol->data.F32[0]-6.6);
+    test2 = fabs(rowcol->data.F32[2]-66.666);
     if ( (test1>TOLTST) || (test2>TOLTST) ) {
         psError(PS_ERR_BAD_PARAMETER_VALUE, false,