Changeset 6294

Timestamp:

Feb 1, 2006, 6:41:45 PM (20 years ago)

Author:

desonia

Message:

changed psImagePixelExtract to take a psPixels instead of psVector of coord
parameter.

Location:

trunk/psLib

Files:

• src/imageops/psImagePixelExtract.c (modified) (8 diffs)
• src/imageops/psImagePixelExtract.h (modified) (3 diffs)
• test/imageops/tst_psImagePixelExtract.c (modified) (5 diffs)

trunk/psLib/src/imageops/psImagePixelExtract.c

@@ -8 +8 @@
  *  @author Robert DeSonia, MHPCC
  *
- *  @version $Revision: 1.10 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-11-16 23:06:14 $
+ *  @version $Revision: 1.11 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-02-02 04:41:42 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -216 +216 @@
 
 psVector* psImageSlice(psVector* out,
-                       psVector* coords,
+                       psPixels* coords,
                        const psImage* input,
                        const psImage* mask,
@@ -320 +320 @@
         psVector* maskVec = NULL;
         psMaskType* maskData = NULL;
-        psU32* outPosition = NULL;
+        psPixelCoord* outPosition = NULL;
 
         // recycle output to make a proper sized/type output structure
@@ -327 +327 @@
         out = psVectorRecycle(out, numCols, PS_TYPE_F64);
         if (coords != NULL) {
-            coords = psVectorRecycle(coords, numCols, PS_TYPE_U32);
-            outPosition = coords->data.U32;
+            coords = psPixelsRealloc(coords, numCols);
+            coords->n = numCols;
+            outPosition = coords->data;
         }
         outData = out->data.F64;
@@ -363 +364 @@
                 *outData = statVal; \
                 if (outPosition != NULL) { \
-                    *outPosition = c; \
+                    outPosition->x = c; \
+                    outPosition->y = row0; \
                     outPosition += delta; \
                 } \
@@ -401 +403 @@
         psVector* maskVec = NULL;
         psS32 elementSize = PSELEMTYPE_SIZEOF(type);
-        psU32* outPosition = NULL;
+        psPixelCoord* outPosition = NULL;
 
         // fill in psVector to fake out the statistics functions.
@@ -420 +422 @@
         out = psVectorRecycle(out, numRows, PS_TYPE_F64);
         if (coords != NULL) {
-            coords = psVectorRecycle(coords, numRows, PS_TYPE_U32);
-            outPosition = coords->data.U32;
+            coords = psPixelsRealloc(coords, numRows);
+            coords->n = numRows;
+            outPosition = coords->data;
         }
         outData = out->data.F64;
@@ -442 +445 @@
             *outData = statVal;
             if (outPosition != NULL) {
-                *outPosition = r;
+                outPosition->y = r;
+                outPosition->x = col0;
                 outPosition += delta;
 

trunk/psLib/src/imageops/psImagePixelExtract.h

@@ -8 +8 @@
 *  @author Robert DeSonia, MHPCC
 *
-*  @version $Revision: 1.8 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2005-09-30 23:09:13 $
+*  @version $Revision: 1.9 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2006-02-02 04:41:42 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -20 +20 @@
 #include "psVector.h"
 #include "psStats.h"
+#include "psPixels.h"
 
 /// @addtogroup Image
@@ -80 +81 @@
 psVector* psImageSlice(
     psVector* out,                     ///< psVector to recycle, or NULL.
-    psVector* coords,
+    psPixels* coords,
     ///< If not NULL, it is populated with the coordinate in the slice dimension
     ///< coorsponding to the output vector's value of the same position in the

trunk/psLib/test/imageops/tst_psImagePixelExtract.c

@@ -6 +6 @@
 *  @author Robert DeSonia, MHPCC
 *
-*  @version $Revision: 1.3 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2005-11-30 02:00:37 $
+*  @version $Revision: 1.4 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2006-02-02 04:41:45 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -64 +64 @@
     psVector* out = NULL;
     psImage* image;
-    psVector* positions = psVectorAlloc( r, PS_TYPE_U32 );
+    psPixels* positions = psPixelsAlloc( r );
     psImage* mask = psImageAlloc( c, r, PS_TYPE_MASK );
     psStats* stat = psStatsAlloc( PS_STAT_SAMPLE_MEDIAN );
@@ -102 +102 @@
     if (out->n != TRUTH_SIZE) { \
         psError(PS_ERR_UNKNOWN,true,"Number of results is wrong (%d, not %d)", \
-                out->n,n); \
+                out->n,TRUTH_SIZE); \
         return TESTNUM*4+1; \
     } \
@@ -108 +108 @@
     if (positions->n != TRUTH_SIZE) { \
         psError(PS_ERR_UNKNOWN,true,"Number of results for positions vector is wrong (%d, not %d)", \
-                out->n,n); \
+                positions->n,TRUTH_SIZE); \
         return TESTNUM*4+2; \
     } \
@@ -119 +119 @@
         } \
         if (DIRECTION == PS_CUT_X_POS || DIRECTION == PS_CUT_X_NEG) { \
-            if (positions->data.U32[i] != c/10+TRUTHPIX_X) { \
+            if (positions->data[i].x != c/10+TRUTHPIX_X) { \
                 psError(PS_ERR_UNKNOWN,true,"Improper positions (%d vs %d) result @ %d.", \
-                        positions->data.U32[i],c/10+TRUTHPIX_X,i); \
+                        positions->data[i].x,c/10+TRUTHPIX_X,i); \
                 return TESTNUM*4+4; \
             } \
         } else { \
-            if (positions->data.U32[i] != r/10+TRUTHPIX_Y) { \
+            if (positions->data[i].y != r/10+TRUTHPIX_Y) { \
                 psError(PS_ERR_UNKNOWN,true,"Improper positions (%d vs %d) result @ %d.", \
-                        positions->data.U32[i],r/10+TRUTHPIX_Y,i); \
+                        positions->data[i].y,r/10+TRUTHPIX_Y,i); \
                 return TESTNUM*4+4; \
             } \