Changeset 6578 for trunk/psLib/src/mathtypes

Timestamp:

Mar 13, 2006, 5:25:48 PM (20 years ago)

Author:

drobbin

Message:

Updated psImageGet in accordance with rules for dealing with sub-images.

File:

• trunk/psLib/src/mathtypes/psImage.c (modified) (3 diffs)

trunk/psLib/src/mathtypes/psImage.c

@@ -9 +9 @@
  *  @author Ross Harman, MHPCC
  *
- *  @version $Revision: 1.96 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-03-14 02:22:55 $
+ *  @version $Revision: 1.97 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-03-14 03:25:48 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -319 +319 @@
     PS_ASSERT_INT_NONNEGATIVE(image->col0, false);
     PS_ASSERT_INT_NONNEGATIVE(image->row0, false);
-    PS_ASSERT_INT_NONNEGATIVE(image->numCols, false);
-    PS_ASSERT_INT_NONNEGATIVE(image->numRows, false);
+    PS_ASSERT_INT_POSITIVE(image->numCols, false);
+    PS_ASSERT_INT_POSITIVE(image->numRows, false);
     if ( x >= (image->col0 + image->numCols) ) {
         psError(PS_ERR_BAD_PARAMETER_SIZE, true,
@@ -414 +414 @@
                           int y)
 {
-    if (image == NULL) {
-        psError(PS_ERR_BAD_PARAMETER_NULL, true, PS_ERRORTEXT_psImage_IMAGE_NULL);
-        return NAN;
-    }
-    if (x >= image->numRows || y >= image->numCols) {
-        psError(PS_ERR_BAD_PARAMETER_SIZE, true, "Invalid position.  Position too large\n");
-        return NAN;
-    }
-
-    if(x < 0)
-        x += image->numRows;
-    if(x < 0) {
-        psError(PS_ERR_BAD_PARAMETER_SIZE, true, "Invalid x.  Negative number too large\n");
-        return NAN;
-    }
-
-    if(y < 0)
-        y += image->numCols;
-    if(y < 0) {
-        psError(PS_ERR_BAD_PARAMETER_SIZE, true, "Invalid y.  Negative number too large\n");
-        return NAN;
-    }
+    /*    if (image == NULL) {
+            psError(PS_ERR_BAD_PARAMETER_NULL, true, PS_ERRORTEXT_psImage_IMAGE_NULL);
+            return NAN;
+        }
+        if (x >= image->numRows || y >= image->numCols) {
+            psError(PS_ERR_BAD_PARAMETER_SIZE, true, "Invalid position.  Position too large\n");
+            return NAN;
+        }
+     
+        if(x < 0)
+            x += image->numRows;
+        if(x < 0) {
+            psError(PS_ERR_BAD_PARAMETER_SIZE, true, "Invalid x.  Negative number too large\n");
+            return NAN;
+        }
+     
+        if(y < 0)
+            y += image->numCols;
+        if(y < 0) {
+            psError(PS_ERR_BAD_PARAMETER_SIZE, true, "Invalid y.  Negative number too large\n");
+            return NAN;
+        }
+    */
+    PS_ASSERT_IMAGE_NON_NULL(image, NAN);
+    PS_ASSERT_INT_NONNEGATIVE(image->col0, NAN);
+    PS_ASSERT_INT_NONNEGATIVE(image->row0, NAN);
+    PS_ASSERT_INT_POSITIVE(image->numCols, NAN);
+    PS_ASSERT_INT_POSITIVE(image->numRows, NAN);
+    if ( x >= (image->col0 + image->numCols) ) {
+        psError(PS_ERR_BAD_PARAMETER_SIZE, true,
+                "Invalid x-position %d.  Position out of range (%d-%d)\n",
+                x, image->col0, image->numCols+image->col0-1 );
+        return false;
+    } else if ( y >= (image->row0 + image->numRows) ) {
+        psError(PS_ERR_BAD_PARAMETER_SIZE, true,
+                "Invalid y-position %d.  Position out of range (%d-%d)\n",
+                y, image->row0, image->numRows+image->row0-1 );
+        return false;
+    } else if (x < image->col0 && x >= 0) {
+        psError(PS_ERR_BAD_PARAMETER_SIZE, true,
+                "Invalid x-position %d.  Position out of range (%d-%d)\n",
+                x, image->col0, image->numCols+image->col0-1 );
+        return false;
+    } else if (y < image->row0 && y >= 0) {
+        psError(PS_ERR_BAD_PARAMETER_SIZE, true,
+                "Invalid y-position %d.  Position out of range (%d-%d)\n",
+                y, image->row0, image->numRows+image->row0-1 );
+        return false;
+    } else if (x < 0 || y < 0) {
+        if (x < 0) {
+            x += image->numCols;
+        }
+        if (x < 0) {
+            psError(PS_ERR_BAD_PARAMETER_SIZE, true,
+                    "Invalid x-position %d.  Position out of range (%d-%d)\n",
+                    (x+image->col0), image->col0, image->numCols+image->col0-1 );
+            return false;
+        }
+        if (y < 0) {
+            y += image->numRows;
+        }
+        if (y < 0) {
+            psError(PS_ERR_BAD_PARAMETER_SIZE, true,
+                    "Invalid y-position %d.  Position out of range (%d-%d)\n",
+                    (y+image->row0), image->row0, image->numRows+image->row0-1 );
+            return false;
+        }
+    } else {
+        x -= image->col0;
+        y -= image->row0;
+    }
+
 
     switch (image->type.type) {