Changeset 4206 for trunk/psLib/test/image/tst_psImagePixelExtract.c

Timestamp:

Jun 9, 2005, 4:30:47 PM (21 years ago)

Author:

desonia

Message:

changed psImageCut & psImageSlice to use psRegion.

File:

• trunk/psLib/test/image/tst_psImagePixelExtract.c (modified) (17 diffs)

trunk/psLib/test/image/tst_psImagePixelExtract.c

@@ -6 +6 @@
 *  @author Robert DeSonia, MHPCC
 *
-*  @version $Revision: 1.1 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2005-05-19 02:49:40 $
+*  @version $Revision: 1.2 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2005-06-10 02:30:47 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -77 +77 @@
         } \
     } \
-    out = psImageSlice(out,positions,image,mask,1,c/10,r/10,c/10+M,r/10+N,DIRECTION,stat); \
+    out = psImageSlice(out,positions,image,mask,1,psRegionSet(c/10,c/10+M,r/10,r/10+N),DIRECTION,stat); \
     \
     if (out->n != TRUTH_SIZE) { \
@@ -153 +153 @@
                         NULL, NULL,
                         NULL, 0,
-                        c/10, r/10,
-                        c/10 + 1, r/10 + 1,
+                        psRegionSet(c/10, c/10 + 1, r/10, r/10 + 1),
                         PS_CUT_X_POS,
                         stat );
@@ -171 +170 @@
                         NULL, image,
                         mask, 1,
-                        c/10, r/10,
-                        c/10 + 1,
-                        r/10 + 1,
+                        psRegionSet(c/10, c/10 + 1, r/10, r/10 + 1),
                         PS_CUT_X_POS,
                         NULL );
@@ -190 +187 @@
                         image,
                         mask, 1,
-                        c/10, r/10,
-                        c/10+1, r/10+1,
+                        psRegionSet(c/10, c/10 + 1, r/10, r/10 + 1),
                         5,
                         stat);
@@ -208 +204 @@
                         image,
                         mask, 1,
-                        c/10, r/10,
-                        c/10, r/10,
+                        psRegionSet(c/10, c/10, r/10, r/10),
                         PS_CUT_X_POS,
                         stat );
@@ -226 +221 @@
                         image,
                         mask, 1,
-                        c+1, r/10,
-                        c+2, r/10+10,
+                        psRegionSet(c+1, c+2, r/10, r/10 + 10),
                         PS_CUT_X_POS,
                         stat );
@@ -239 +233 @@
                         image,
                         mask, 1,
-                        c/10, r+1,
-                        c/10+1,r+5,
+                        psRegionSet(c/10, c/10 + 1, r+1,r+5),
                         PS_CUT_X_POS,
                         stat );
@@ -252 +245 @@
                         image,
                         mask, 1,
-                        c/10, r/10,
-                        c+1, r/10+1,
+                        psRegionSet(c/10, c+1, r/10, r/10+1),
                         PS_CUT_X_POS,
                         stat);
@@ -265 +257 @@
                         image,
                         mask, 1,
-                        c/10, r/10,
-                        c/10+1, r + 1,
+                        psRegionSet(c/10, c/10 + 1, r/10, r + 1),
                         PS_CUT_X_POS,
                         stat);
@@ -284 +275 @@
                         image,
                         mask, 1,
-                        c/10, r/10,
-                        c/10+1, r/10+1,
+                        psRegionSet(c/10, c/10 + 1, r/10, r/10+1),
                         PS_CUT_X_POS,
                         stat);
@@ -302 +292 @@
                         image,
                         maskSz, 1,
-                        c/10, r/10,
-                        c/10+1, r/10+1,
+                        psRegionSet(c/10, c/10 + 1, r/10, r/10 + 1),
                         PS_CUT_X_POS,
                         stat);
@@ -318 +307 @@
                          image,
                          maskS8, 1,
-                         c/10, r/10,
-                         c/10+1, r/10+1,
+                         psRegionSet(c/10, c/10 + 1, r/10, r/10 + 1),
                          PS_CUT_X_POS,
                          stat);
@@ -377 +365 @@
                                 image,
                                 NULL,0,
-                                startCol[n], startRow[n],
-                                endCol[n], endRow[n],
+                                psRegionSet(startCol[n], endCol[n], startRow[n],endRow[n]),
                                 length,
                                 PS_INTERPOLATE_FLAT);
@@ -386 +373 @@
                                 image,
                                 mask,1,
-                                startCol[n], startRow[n],
-                                endCol[n], endRow[n],
+                                psRegionSet(startCol[n], endCol[n], startRow[n], endRow[n]),
                                 length,
                                 PS_INTERPOLATE_FLAT);
@@ -454 +440 @@
                         NULL,
                         mask,1,
-                        startCol[0], startRow[0],
-                        endCol[0], endRow[0],
+                        psRegionSet(startCol[0], endCol[0], startRow[0], endRow[0]),
                         length,
                         PS_INTERPOLATE_FLAT);
@@ -476 +461 @@
                         image,
                         mask,1,
-                        startCol[0], startRow[0],
-                        endCol[0], endRow[0],
+                        psRegionSet(startCol[0], endCol[0], startRow[0], endRow[0]),
                         0,
                         PS_INTERPOLATE_FLAT);