Changeset 6750 for trunk/psLib/src/types

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/types/psPixels.c (modified) (3 diffs)

trunk/psLib/src/types/psPixels.c

@@ -7 +7 @@
  *  @author Robert DeSonia, MHPCC
  *
- *  @version $Revision: 1.22 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-02-28 02:53:03 $
+ *  @version $Revision: 1.23 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-04-01 02:43:57 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -168 +168 @@
     float y1 = region.y1;
 
+    if ( (x0 < 0 || x1 < 0) || (y0 < 0 || y1 < 0) ) {
+        psError(PS_ERR_BAD_PARAMETER_VALUE, true,
+                PS_ERRORTEXT_psPixels_REGION_INVALID,
+                (int)y0,(int)y1,(int)x0,(int)x1);
+        psFree(out);
+        return NULL;
+    }
+
     // determine the output image size
     int numRows = y1-y0;
     int numCols = x1-x0;
+    numRows += 1;
+    numCols += 1;
     if (numRows < 1 || numCols < 1) {
         psError(PS_ERR_BAD_PARAMETER_VALUE, true,
@@ -205 +215 @@
         float y = data[p].y;
         // pixel in region?
-        if (x >= x0 && x < x1 && y >= y0 && y < y1) {
+        if (x >= x0 && x <= x1 && y >= y0 && y <= y1) {
             outData[(int)(y-y0)][(int)(x-x0)] |= maskVal;
         }