Changeset 5213

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)

Location:

trunk/psLib

Files:

• src/imageops/psImagePixelExtract.c (modified) (5 diffs)
• src/imageops/psImagePixelExtract.h (modified) (3 diffs)
• src/imageops/psImageStats.c (modified) (3 diffs)
• src/mathtypes/psVector.c (modified) (4 diffs)
• test/mathtypes/verified/tst_psVector.stderr (modified) (1 diff)

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) {

trunk/psLib/src/imageops/psImagePixelExtract.h

@@ -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
@@ -41 +41 @@
     psVector *out,                     ///< specified vector to return
     const psImage *input,              ///< input image
-    psU32 row                          ///< row number to extract
+    int row                            ///< row number to extract
 );
 
@@ -52 +52 @@
     psVector *out,                     ///< specified vector to return
     const psImage *input,              ///< input image
-    psU32 column                       ///< column number to extract
+    int column                         ///< column number to extract
 );
 

trunk/psLib/src/imageops/psImageStats.c

@@ -9 +9 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.81 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-09-26 22:35:53 $
+ *  @version $Revision: 1.82 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-09-30 23:09:13 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -677 +677 @@
 
     type = mask->type.type;
+    if (type != PS_TYPE_MASK) {
+        psError(PS_ERR_BAD_PARAMETER_TYPE, true,
+                "psImage type does not match the specified psMaskType!\n");
+        return -1;
+    }
 
     switch (type) {
     case PS_TYPE_U8:
+    case PS_TYPE_U16:
         for (long i = x0; i < x1; i++) {
             for (long j = y0; j < y1; j++) {
-                if (mask->data.U8[i][j] & value) {
+                if (mask->data.PS_TYPE_MASK_DATA[i][j] & value) {
                     Npixels ++;
                 }
@@ -692 +698 @@
     case PS_TYPE_S32:
     case PS_TYPE_S64:
-    case PS_TYPE_U16:
     case PS_TYPE_U32:
     case PS_TYPE_U64:

trunk/psLib/src/mathtypes/psVector.c

@@ -9 +9 @@
 *  @author Robert DeSonia, MHPCC
 *
-*  @version $Revision: 1.58 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2005-09-29 18:59:01 $
+*  @version $Revision: 1.59 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2005-09-30 23:09:13 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -608 +608 @@
         f = fdopen(fd, "a+");
         fprintf (f, "vector: %s\n", name);
-     
+
         for (int i = 0; i < a[0].n; i++) {
             fprintf (f, "%f\n", p_psVectorGetElementF64(a, i));
@@ -974 +974 @@
     type = mask->type.type;
 
+    if (type != PS_TYPE_MASK) {
+        psError(PS_ERR_BAD_PARAMETER_TYPE, true,
+                "psVector type does not match the specified psMaskType!\n");
+        return -1;
+    }
+
     switch (type) {
     case PS_TYPE_U8:
+    case PS_TYPE_U16:
         for (long i = 0; i < mask->n; i++) {
-            if (mask->data.U8[i] & value) {
+            if (mask->data.PS_TYPE_MASK_DATA[i] & value) {
                 Npixels ++;
             }
@@ -986 +993 @@
     case PS_TYPE_S32:
     case PS_TYPE_S64:
-    case PS_TYPE_U16:
     case PS_TYPE_U32:
     case PS_TYPE_U64:

trunk/psLib/test/mathtypes/verified/tst_psVector.stderr

@@ -78 +78 @@
     The input psVector can not be NULL.
 <DATE><TIME>|<HOST>|E|psVectorCountPixelMask (FILE:LINENO)
-    Input psVector is an unsupported type (0x104).
+    psVector type does not match the specified psMaskType!
 
 ---> TESTPOINT PASSED (psVector{psVectorCountPixelMask} | tst_psVector.c)