Changeset 6778 for trunk/psLib/src/mathtypes

Timestamp:

Apr 4, 2006, 3:49:41 PM (20 years ago)

Author:

drobbin

Message:

Edited functions wrt subimage v parent image issue.

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.100 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-04-01 02:43:57 $
+ *  @version $Revision: 1.101 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-04-05 01:49:41 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -703 +703 @@
 }
 
-bool p_psImagePrint (int fd, psImage *a, char *name)
+bool p_psImagePrint (int fd,
+                     psImage *a,
+                     char *name)
 {
     write(fd,"matrix: ",8);
@@ -730 +732 @@
 {
 
-    /*    if (input == NULL) {
-            psError(PS_ERR_BAD_PARAMETER_NULL,true,
-                    PS_ERRORTEXT_psImage_IMAGE_NULL);
+    PS_ASSERT_IMAGE_NON_NULL(input, unexposedValue);
+    /*    if ( x < input->col0 || x >= (input->col0 + input->numCols) ) {
+            psError(PS_ERR_BAD_PARAMETER_VALUE, true,
+                "x-input in psImagePixelInterpolate is outside of image region.\n");
             return unexposedValue;
         }
+        if ( y < input->row0 || y >= (input->row0 + input->numRows) ) {
+            psError(PS_ERR_BAD_PARAMETER_VALUE, true,
+                "y-input in psImagePixelInterpolate is outside of image region.\n");
+            return unexposedValue;
+        }
+        x -= input->col0;
+        y -= input->row0;
     */
-    PS_ASSERT_IMAGE_NON_NULL(input, unexposedValue);
-    if (input->row0 != 0 || input->col0 != 0) {
-        x += input->col0;
-        y += input->row0;
-    }
 
     #define PSIMAGE_PIXEL_INTERPOLATE_CASE(TYPE)                             \