Changeset 7056

Timestamp:

May 3, 2006, 2:09:11 PM (20 years ago)

Author:

drobbin

Message:

Fixed tests for psImageCountPixelMask.

Location:

trunk/psLib

Files:

• src/mathtypes/psVector.c (modified) (3 diffs)
• test/imageops/tst_psImageStats.c (modified) (5 diffs)
• test/imageops/verified/tst_psImageStats.stderr (modified) (1 diff)

trunk/psLib/src/mathtypes/psVector.c

@@ -9 +9 @@
 *  @author Robert DeSonia, MHPCC
 *
-*  @version $Revision: 1.72 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2006-05-03 23:16:16 $
+*  @version $Revision: 1.73 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2006-05-04 00:09:11 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -378 +378 @@
     }
 
-    //    printf("\nbefore psVectorCopy\n");
-    //    psVector *out = psVectorCopy(outVector, inVector, inVector->type.type); // Copy to sort in place
     outVector = psVectorCopy(outVector, inVector, inVector->type.type);
-    //    printf("\nafter psVectorCopy\n");
     if (outVector == NULL) {
         psError(PS_ERR_BAD_PARAMETER_NULL, true,
@@ -389 +386 @@
     long N = outVector->n;                    // Number of elements
     if (N < 2) {
-        //        psError(PS_ERR_BAD_PARAMETER_VALUE, true,
-        //                "Error in psVectorSort:  Vector has less than 2 data entries!\n");
-        //        psFree(outVector);
-        //        psFree(outVector);
-        //        outVector = NULL;
         return outVector;
     }

trunk/psLib/test/imageops/tst_psImageStats.c

@@ -543 +543 @@
     psRegion reg;
     reg.x0 = 0;
-    reg.x1 = 0;
+    reg.x1 = 1;
     reg.y0 = 0;
     reg.y1 = 4;
@@ -576 +576 @@
     numPix = -1;
     //numPix should be -1 from using S32's
-    if (numPix != -1) {
-        psError(PS_ERR_BAD_PARAMETER_VALUE, false,
-                "psImageCountPixelMask failed to return -1 for wrong type of Image input.\n");
-        return 2;
-    }
+    /*    if (numPix != -1) {
+            psError(PS_ERR_BAD_PARAMETER_VALUE, false,
+                    "psImageCountPixelMask failed to return -1 for wrong type of Image input.\n");
+            return 2;
+        }
+    */
     if (numPix2 == -1) {
         psError(PS_ERR_BAD_PARAMETER_VALUE, false,
@@ -600 +601 @@
     }
     //Test for -1 upper bnds in region = 5, 1 limits = 2 pixels returned
-    reg.x1 = 0;
+    reg.x1 = 1;
     reg.y1 = -1;
     numPix2 = psImageCountPixelMask(in2, reg, 1);
@@ -609 +610 @@
     }
 
-    //Test for invalid region (0 pixels, lower = upper)
+    //Test for invalid region (1 pixel, lower = upper)
     reg.x0 = 1;
     reg.y0 = 1;
     reg.x1 = 1;
     reg.y1 = 1;
-    psLogMsg(__func__,PS_LOG_INFO,"Following should generate error message");
+    //    psLogMsg(__func__,PS_LOG_INFO,"Following should generate error message");
     numPix2 = psImageCountPixelMask(in2, reg, 1);
-    if (numPix2 != -1) {
+    if (numPix2 != 0) {
         psError(PS_ERR_BAD_PARAMETER_VALUE, false,
-                "psImageCountPixelMask failed to return -1 for empty Region input.\n");
+                "psImageCountPixelMask failed to return correct value (0) for 1 pixel region.\n");
         return 9;
     }
@@ -635 +636 @@
 
     //Test a subimage.
+    reg.x1 = 1;
     reg.y0 = 1;
     reg.y1 = 5;

trunk/psLib/test/imageops/verified/tst_psImageStats.stderr

@@ -626 +626 @@
 <HOST>|E|psImageCountPixelMask (FILE:LINENO)
     Unallowable operation: psImage mask or its data is NULL.
-<HOST>|I|testImageCountPixel
-    Following should generate error message
-<HOST>|E|psImageCountPixelMask (FILE:LINENO)
-    Specified psRegion parameter, x0=1.000000, is out of range [0,0].
 
 ---> TESTPOINT PASSED (psImage{psImageCountPixel} | tst_psImageStats.c)