Changeset 4206 for trunk/psLib/src/image/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/src/image/psImagePixelExtract.c (modified) (5 diffs)

trunk/psLib/src/image/psImagePixelExtract.c

@@ -8 +8 @@
  *  @author Robert DeSonia, MHPCC
  *
- *  @version $Revision: 1.1 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-05-19 02:08:21 $
+ *  @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
@@ -28 +28 @@
                        const psImage* restrict mask,
                        psU32 maskVal,
-                       psS32 col0,
-                       psS32 row0,
-                       psS32 col1,
-                       psS32 row1,
+                       psRegion region,
                        psImageCutDirection direction,
                        const psStats* stats)
@@ -42 +39 @@
     psS32 delta = 1;
     psF64* outData;
+    psS32 row0 = region.y0;
+    psS32 row1 = region.y1;
+    psS32 col0 = region.x0;
+    psS32 col1 = region.x1;
 
     if (in == NULL || in->data.V == NULL) {
@@ -271 +272 @@
                      psVector* cutRows,
                      const psImage* in,
-                     const psImage* restrict mask,
+                     const psImage* mask,
                      psU32 maskVal,
-                     float startCol,
-                     float startRow,
-                     float endCol,
-                     float endRow,
+                     psRegion region,
                      psU32 nSamples,
                      psImageInterpolateMode mode)
 {
+
     if (in == NULL || in->data.V == NULL) {
         psError(PS_ERR_BAD_PARAMETER_NULL, true,
@@ -297 +296 @@
     }
 
+    float startCol = region.x0;
+    float startRow = region.y0;
+    float endCol = region.x1;
+    float endRow = region.y1;
     if (startCol < 0 || startCol >= numCols ||
             startRow < 0 || startRow >= numRows ||