Changeset 6750 for trunk/psLib/src/imageops/psImageGeomManip.c

Timestamp:

Mar 31, 2006, 4:43:57 PM (20 years ago)

Author:

drobbin

Message:

Made several changes to image functions/tests w.r.t. subimage v. parent image issue.

File:

• trunk/psLib/src/imageops/psImageGeomManip.c (modified) (2 diffs)

trunk/psLib/src/imageops/psImageGeomManip.c

@@ -10 +10 @@
  *  @author Ross Harman, MHPCC
  *
- *  @version $Revision: 1.20 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-02-24 23:43:15 $
+ *  @version $Revision: 1.21 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-04-01 02:43:57 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -749 +749 @@
         col0 = region.x0;
         col1 = region.x1;
+        //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;
+        }
         if (col1 < 1) {
-            col1 += input->numCols;
+            col1 += input->col0 + input->numCols;
         }
 
         if (row1 < 1) {
-            row1 += input->numRows;
+            row1 += input->row0 + input->numRows;
         }