Changeset 14523

Timestamp:

Aug 15, 2007, 4:51:09 PM (19 years ago)

Author:

Paul Price

Message:

Fixing range for error messages.

File:

• trunk/psLib/src/imageops/psImageStructManip.c (modified) (5 diffs)

trunk/psLib/src/imageops/psImageStructManip.c

@@ -8 +8 @@
  *  @author Robert DeSonia, MHPCC
  *
- *  @version $Revision: 1.16 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2007-04-24 22:27:17 $
+ *  @version $Revision: 1.17 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2007-08-16 02:51:09 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -50 +50 @@
     if ( col0 < image->col0 || row0 < image->row0 ) {
         psError(PS_ERR_BAD_PARAMETER_VALUE, true,
-                _("Specified subset range, [%d:%d,%d:%d], is invalid or outside input psImage's boundaries, [0:%d,0:%d]."),
-                col0, col1-1, row0, row1-1, image->numCols-1, image->numRows-1);
+                _("Specified subset range, [%d:%d,%d:%d], is invalid or outside input psImage's boundaries, [%d:%d,%d:%d]."),
+                col0, col1-1, row0, row1-1, image->col0, image->col0 + image->numCols-1, image->row0,
+                image->row0 + image->numRows-1);
         return NULL;
     }
@@ -75 +76 @@
         row1 > image->row0 + image->numRows ) {
         psError(PS_ERR_BAD_PARAMETER_VALUE, true,
-                _("Specified subset range, [%d:%d,%d:%d], is invalid or outside input psImage's boundaries, [0:%d,0:%d]."),
+                _("Specified subset range, [%d:%d,%d:%d], is invalid or outside input psImage's boundaries, [%d:%d,%d:%d]."),
                 col0, col1-1, row0, row1-1,
-                image->numCols-1, image->numRows-1);
+                image->col0, image->col0 + image->numCols-1, image->row0, image->row0 + image->numRows-1);
         return NULL;
     }
@@ -88 +89 @@
     // if this is a child, we need to start working with parent pixels
     // the subset region (col0,row0 - col1,row1) is in the parent frame
-    if (image->parent != NULL) { 
+    if (image->parent != NULL) {
         image = (psImage*)image->parent;
     }
@@ -145 +146 @@
 }
 
-psImage* psImageCopyView(psImage *output, psImage *input) 
+psImage* psImageCopyView(psImage *output, psImage *input)
 {
     psRegion region = {0, 0, 0, 0};
     region = psRegionForImage (input, region);
-    psImage *result = imageSubset (output, input, 
-                                   region.x0, region.y0,
-                                   region.x1, region.y1);
+    psImage *result = imageSubset (output, input,
+                                   region.x0, region.y0,
+                                   region.x1, region.y1);
     return result;
 }