Changeset 4212 for trunk/psLib/src/collections/psPixels.c

Timestamp:

Jun 10, 2005, 11:46:46 AM (21 years ago)

Author:

desonia

Message:

fixed bug in psPixels and tested psVectorExtend.

File:

• trunk/psLib/src/collections/psPixels.c (modified) (4 diffs)

trunk/psLib/src/collections/psPixels.c

@@ -7 +7 @@
  *  @author Robert DeSonia, MHPCC
  *
- *  @version $Revision: 1.5 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-06-09 23:51:49 $
+ *  @version $Revision: 1.6 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-06-10 21:46:46 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -132 +132 @@
 
     // determine the output image size
-    int numRows = x1-x0;
-    int numCols = y1-y0;
+    int numRows = y1-y0;
+    int numCols = x1-x0;
     if (numRows < 1 || numCols < 1) {
         psError(PS_ERR_BAD_PARAMETER_VALUE, true,
                 PS_ERRORTEXT_psPixels_REGION_INVALID,
-                x0,x1,y0,y1);
+                y0,y1,x0,x1);
         psFree(out);
         return NULL;
@@ -150 +150 @@
         return NULL;
     }
-    *(psS32*)&out->row0 = x0;
-    *(psS32*)&out->col0 = y0;
+    *(psS32*)&out->row0 = y0;
+    *(psS32*)&out->col0 = x0;
 
     // initialize image to all zeros
@@ -169 +169 @@
         // pixel in region?
         if (x >= x0 && x < x1 && y >= y0 && y < y1) {
-            outData[x-x0][y-y0] |= maskVal;
+            outData[y-y0][x-x0] |= maskVal;
         }
     }