Changeset 6631 for trunk/psLib/src/mathtypes

Timestamp:

Mar 17, 2006, 10:38:19 AM (20 years ago)

Author:

drobbin

Message:

Updated ImageRow, Col, Slice with respect to Sub-image v. parent-image specs.

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.98 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-03-14 03:35:14 $
+ *  @version $Revision: 1.99 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-03-17 20:38:19 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -293 +293 @@
                 double complex value)
 {
-    /*    if (image == NULL) {
-            psError(PS_ERR_BAD_PARAMETER_NULL, true, PS_ERRORTEXT_psImage_IMAGE_NULL);
-            return false;
-        }
-        if (x >= image->numRows || y >= image->numCols) {
-            psError(PS_ERR_BAD_PARAMETER_SIZE, true,
-                "Invalid position %d.  Position out of range (%d-%d)\n", x, );
-            return false;
-        }
-
-        if(x < 0)
-            x += image->numRows;
-        if(x < 0) {
-            psError(PS_ERR_BAD_PARAMETER_SIZE, true, "Invalid x.  Negative number too large\n");
-            return false;
-        }
-
-        if(y < 0)
-            y += image->numCols;
-        if(y < 0) {
-            psError(PS_ERR_BAD_PARAMETER_SIZE, true, "Invalid y.  Negative number too large\n");
-            return false;
-        }
-
-    */
     PS_ASSERT_IMAGE_NON_NULL(image, false);
     PS_ASSERT_INT_NONNEGATIVE(image->col0, false);
@@ -416 +391 @@
                           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;
-        }
-    */
     PS_ASSERT_IMAGE_NON_NULL(image, NAN);
     PS_ASSERT_INT_NONNEGATIVE(image->col0, NAN);