Changeset 6778 for trunk/psLib/test/imageops

Timestamp:

Apr 4, 2006, 3:49:41 PM (20 years ago)

Author:

drobbin

Message:

Edited functions wrt subimage v parent image issue.

Location:

trunk/psLib/test/imageops

Files:

• tst_psImagePixelExtract.c (modified) (2 diffs)
• tst_psImageStats.c (modified) (1 diff)

trunk/psLib/test/imageops/tst_psImagePixelExtract.c

@@ -6 +6 @@
 *  @author Robert DeSonia, MHPCC
 *
-*  @version $Revision: 1.7 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2006-04-04 22:04:46 $
+*  @version $Revision: 1.8 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2006-04-05 01:49:41 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -100 +100 @@
         } \
     } \
-    out = psImageSlice(out,positions,image,mask,1,psRegionSet(c/10,c/10+M,r/10,r/10+N),DIRECTION,stat); \
+    image->col0 = 1; \
+    image->row0 = 1; \
+    out = psImageSlice(out,positions,image,mask,1, \
+                       psRegionSet(1+c/10,1+c/10+M,1+r/10,1+r/10+N),DIRECTION,stat); \
     \
     if (out->n != TRUTH_SIZE) { \

trunk/psLib/test/imageops/tst_psImageStats.c

@@ -634 +634 @@
     }
 
+    //Test a subimage.
+    reg.y0 = 1;
+    reg.y1 = 5;
+    numPix2 = -1;
+    in2->row0 = 1;
+    numPix2 = psImageCountPixelMask(in2, reg, 1);
+    if (numPix2 != 2) {
+        psError(PS_ERR_BAD_PARAMETER_VALUE, false,
+                "psImageCountPixelMask returned incorrect pixel count %ld (!=2)\n", numPix2);
+        return 11;
+    }
+
     psFree(in);
     psFree(in2);