Changeset 6750 for trunk/psLib/src/mathtypes

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/mathtypes/psImage.c (modified) (4 diffs)

trunk/psLib/src/mathtypes/psImage.c

@@ -9 +9 @@
  *  @author Ross Harman, MHPCC
  *
- *  @version $Revision: 1.99 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-03-17 20:38:19 $
+ *  @version $Revision: 1.100 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-04-01 02:43:57 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -173 +173 @@
 {
 
-    if (image == NULL) {
-        return in;
+    //    if (image == NULL) {
+    //        return in;
+    //    }
+    PS_ASSERT_IMAGE_NON_NULL(image, in);
+    //if the region is [0,0,0,0], the whole image (or subimage) is to be included.
+    if (in.x0 == 0 && in.x1 == 0 && in.y0 == 0 && in.y1 == 0) {
+        in.x0 = image->col0;
+        in.x1 = image->col0 + image->numCols - 1;
+        in.y0 = image->row0;
+        in.y1 = image->row0 + image->numRows - 1;
+        return (in);
     }
 
@@ -195 +204 @@
     // flip start and end if out of order
     if (in.x0 > in.x1) {
+        psError (PS_ERR_BAD_PARAMETER_VALUE, true,
+                 "Invalid region in psRegionForImage.  x0 > x1.  Values have been swapped.\n");
         PS_SWAP (in.x0, in.x1);
     }
     if (in.y0 > in.y1) {
+        psError (PS_ERR_BAD_PARAMETER_VALUE, true,
+                 "Invalid region in psRegionForImage.  y0 > y1.  Values have been swapped.\n");
         PS_SWAP (in.y0, in.y1);
     }
@@ -717 +730 @@
 {
 
-    if (input == NULL) {
-        psError(PS_ERR_BAD_PARAMETER_NULL,true,
-                PS_ERRORTEXT_psImage_IMAGE_NULL);
-        return unexposedValue;
+    /*    if (input == NULL) {
+            psError(PS_ERR_BAD_PARAMETER_NULL,true,
+                    PS_ERRORTEXT_psImage_IMAGE_NULL);
+            return unexposedValue;
+        }
+    */
+    PS_ASSERT_IMAGE_NON_NULL(input, unexposedValue);
+    if (input->row0 != 0 || input->col0 != 0) {
+        x += input->col0;
+        y += input->row0;
     }