Changeset 5213 for trunk/psLib/src/imageops/psImagePixelExtract.c

Timestamp:

Sep 30, 2005, 1:09:13 PM (21 years ago)

Author:

drobbin

Message:

Updated ImageRow/Col for tail access, PixelCount fxns to allow for differing psMaskType(u8 or u16)

File:

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

trunk/psLib/src/imageops/psImagePixelExtract.c

@@ -8 +8 @@
  *  @author Robert DeSonia, MHPCC
  *
- *  @version $Revision: 1.7 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-09-29 01:15:38 $
+ *  @version $Revision: 1.8 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-09-30 23:09:13 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -50 +50 @@
 psVector *psImageRow(psVector *out,
                      const psImage *input,
-                     psU32 row)
+                     int row)
 {
     if (input == NULL) {
@@ -60 +60 @@
                 "Specified row number is out of range for specified image.\n");
         return NULL;
+    }
+    if (row < 0) {
+        row += input->numRows;
+        if (row < 0) {
+            psError(PS_ERR_BAD_PARAMETER_VALUE, true,
+                    "Specified row number is out of range for specified image.\n");
+            return NULL;
+        }
     }
     psVectorRecycle(out, input->numCols, input->type.type);
@@ -137 +145 @@
 psVector *psImageCol(psVector *out,
                      const psImage *input,
-                     psU32 column)
+                     int column)
 {
     if (input == NULL) {
@@ -143 +151 @@
         return NULL;
     }
-    if (column >= input->numRows) {
+    if (column >= input->numCols) {
         psError(PS_ERR_BAD_PARAMETER_NULL, true,
                 "Specified column number is out of range for specified image.\n");
         return NULL;
     }
-    psVectorRecycle(out, input->numCols, input->type.type);
+    if (column < 0) {
+        column += input->numCols;
+        if (column < 0) {
+            psError(PS_ERR_BAD_PARAMETER_VALUE, true,
+                    "Specified column number is out of range for specified image.\n");
+            return NULL;
+        }
+    }
+
+
+    psVectorRecycle(out, input->numRows, input->type.type);
 
     switch (input->type.type) {