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

Timestamp:

Apr 6, 2006, 12:55:18 PM (20 years ago)

Author:

drobbin

Message:

Made changes concerning subimage issue and testing of changes.

File:

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

trunk/psLib/src/imageops/psImagePixelExtract.c

@@ -8 +8 @@
  *  @author Robert DeSonia, MHPCC
  *
- *  @version $Revision: 1.17 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-04-06 04:12:27 $
+ *  @version $Revision: 1.18 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-04-06 22:55:18 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -334 +334 @@
     }
 
+    //If [0,0,0,0] specified, the whole image is to be included
+    if (row0 == 0 && col0 == 0 && row1 == 0 && col1 == 0) {
+        row0 = input->row0;
+        col0 = input->col0;
+        row1 = input->row0 + input->numRows - 1;
+        col1 = input->col0 + input->numCols - 1;
+    }
+
     //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) ) {
@@ -341 +349 @@
                 "Specified psRegion parameter, x0=%f, is out of range [%d,%d].\n",
                 region.x0, input->col0, input->col0+input->numCols-1);
+        psFree(out);
         return NULL;
     }
@@ -350 +359 @@
                 "Specified psRegion parameter, y0=%f, is out of range [%d,%d].\n",
                 region.y0, input->row0, input->row0+input->numRows-1);
-        return NULL;
-    }
-
-    //If [0,0,0,0] specified, the whole image is to be included
-    if (row0 == 0 && col0 == 0 && row1 == 0 && col1 == 0) {
-        row0 = input->row0;
-        col0 = input->col0;
-        row1 = input->row0 + input->numRows;
-        col1 = input->col0 + input->numCols;
+        psFree(out);
+        return NULL;
     }
 
@@ -368 +370 @@
                     "Specified psRegion parameter, x1=%f=%d, is out of range [%d,%d].\n",
                     region.x1, col1+input->col0, input->col0, input->col0+input->numCols-1);
+            psFree(out);
             return NULL;
         }
@@ -376 +379 @@
                 "Specified psRegion parameter, x1=%f=%d, is out of range [%d,%d].\n",
                 region.x1, col1, input->col0, input->col0+input->numCols-1);
+        psFree(out);
         return NULL;
     }
@@ -385 +389 @@
                     "Specified psRegion parameter, y1=%f=%d, is out of range [%d,%d].\n",
                     region.y1, row1+input->row0, input->row0, input->row0+input->numRows-1);
+            psFree(out);
             return NULL;
         }
@@ -393 +398 @@
                 "Specified psRegion parameter, y1=%f=%d, is out of range [%d,%d].\n",
                 region.y1, row1, input->row0, input->row0+input->numRows-1);
+        psFree(out);
         return NULL;
     }
@@ -406 +412 @@
                     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;
     }
@@ -679 +687 @@
         row0 = input->row0;
         col0 = input->col0;
-        row1 = input->row0 + input->numRows;
-        col1 = input->col0 + input->numCols;
+        row1 = input->row0 + input->numRows - 1;
+        col1 = input->col0 + input->numCols - 1;
     }