Changeset 6778 for trunk/psLib/src/imageops/psImagePixelExtract.c

Timestamp:

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

Author:

drobbin

Message:

Edited functions wrt subimage v parent image issue.

File:

• trunk/psLib/src/imageops/psImagePixelExtract.c (modified) (4 diffs)

trunk/psLib/src/imageops/psImagePixelExtract.c

@@ -8 +8 @@
  *  @author Robert DeSonia, MHPCC
  *
- *  @version $Revision: 1.15 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-04-04 22:04:45 $
+ *  @version $Revision: 1.16 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-04-05 01:49:40 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -333 +333 @@
         return NULL;
     }
-    /*
-        if (col1 < 1) {
-            col1 += input->numCols;
-        }
-
-        if (row1 < 1) {
-            row1 += input->numRows;
-        }
-
-        if (    col0 < 0 ||
-                row0 < 0 ||
-                col1 > input->numCols ||
-                row1 > input->numRows ||
-                col0 >= col1 ||
-                row0 >= row1) {
-            psError(PS_ERR_BAD_PARAMETER_VALUE, true,
-                    PS_ERRORTEXT_psImage_SUBSET_RANGE_INVALID,
-                    col0, col1, row0, row1,
-                    input->numCols, input->numRows);
-            psFree(out);
-            return NULL;
-        }
-    */
+
     //Make sure x0 of region is inside image.  If so, set col0 to corresponding index number.
     if (col0 >= input->col0 && col0 < (input->col0 + input->numCols) ) {
@@ -709 +687 @@
         return NULL;
     }
-    /*
-        //Make sure x1 of region is valid.  If negative, index from tail (if valid).
-        if (col1 < 0) {
-            col1 += input->numCols;
-            if (col1 < 0) {
-                psError(PS_ERR_BAD_PARAMETER_VALUE, true,
-                        "Specified psRegion parameter, x1=%f=%f, is out of range [%d,%d].\n",
-                        region.x1, col1+input->col0, input->col0, input->col0+input->numCols);
-                psFree(out);
-                return NULL;
-            }
-        } else if (col1 >= input->col0 && col1 < (input->col0 + input->numCols) ) {
-            col1 -= input->col0;
-        } else {
-            psError(PS_ERR_BAD_PARAMETER_VALUE, true,
-                    "Specified psRegion parameter, x1=%f=%f, is out of range [%d,%d].\n",
-                    region.x1, col1, input->col0, input->col0+input->numCols);
-            psFree(out);
-            return NULL;
-        }
-        //Make sure y1 of region is valid.  If negative, index from tail (if valid).
-        if (row1 < 0) {
-            row1 += input->numRows;
-            if (row1 < 0) {
-                psError(PS_ERR_BAD_PARAMETER_VALUE, true,
-                        "Specified psRegion parameter, y1=%f=%f, is out of range [%d,%d].\n",
-                        region.y1, row1+input->row0, input->row0, input->row0+input->numRows);
-                psFree(out);
-                return NULL;
-            }
-        } else if (row1 >= input->row0 && row1 < (input->row0 + input->numRows) ) {
-            row1 -= input->row0;
-        } else {
-            psError(PS_ERR_BAD_PARAMETER_VALUE, true,
-                    "Specified psRegion parameter, y1=%f=%f, is out of range [%d,%d].\n",
-                    region.y1, row1, input->row0, input->row0+input->numRows);
-            psFree(out);
-            return NULL;
-        }
-    */
-    /*    //Now make sure that the region makes sense.
-        if (col0 > col1 || row0 > row1) {
-            if (col0 > col1) {
-                psError(PS_ERR_BAD_PARAMETER_VALUE, true,
-                        "Invalid psRegion specified.  x0=%f=%f is greater than x1=%f=%f.\n",
-                        region.x0, col0, region.x1, col1);
-            } else {
-                psError(PS_ERR_BAD_PARAMETER_VALUE, true,
-                        "Invalid psRegion specified.  y0=%f=%f is greater than y1=%f=%f.\n",
-                        region.y0, row0, region.y1, row1);
-            }
-            psFree(out);
-            return NULL;
-        } else if (col0 == col1 && row0 == row1) {
-            psError(PS_ERR_BAD_PARAMETER_VALUE, true,
-                    "Invalid psRegion specified.  Region contains only 1 pixel.\n");
-            psFree(out);
-            return NULL;
-        }
-    */
     if (col1 < 0 || row1 < 0 || col0 < 0 || row0 < 0 || col0 >= numCols || col1 >= numCols ||
             row0 >= numRows || row1 >= numRows) {
@@ -778 +696 @@
     float endCol = col1;
     float endRow = row1;
-    /*
-        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 ||
-                endCol < 0 || endCol >= numCols ||
-                endRow < 0 || endRow >= numRows) {
-            psError(PS_ERR_BAD_PARAMETER_VALUE, true,
-                    PS_ERRORTEXT_psImage_LINE_NOT_IN_IMAGE,
-                    startCol,startRow,endCol,endRow,
-                    numCols-1,numRows-1);
-            psFree(out);
-            return NULL;
-        }
-    */
 
     if (mode < PS_INTERPOLATE_FLAT ) {