Changeset 7056 for trunk/psLib/test/imageops/tst_psImageStats.c

Timestamp:

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

Author:

drobbin

Message:

Fixed tests for psImageCountPixelMask.

File:

• trunk/psLib/test/imageops/tst_psImageStats.c (modified) (5 diffs)

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;