Changeset 1404 for trunk/psLib/src/image/psImageExtraction.c

Timestamp:

Aug 6, 2004, 11:50:14 AM (22 years ago)

Author:

desonia

Message:

modified runTest / FullUnitTest to suppress line numbers in messages.

File:

• trunk/psLib/src/image/psImageExtraction.c (modified) (7 diffs)

trunk/psLib/src/image/psImageExtraction.c

@@ -9 +9 @@
 *  @author Robert DeSonia, MHPCC
 *
-*  @version $Revision: 1.5 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2004-08-04 23:37:39 $
+*  @version $Revision: 1.6 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2004-08-06 21:50:13 $
 *
 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -230 +230 @@
 
 psVector* psImageSlice( psVector* out,
+                        psVector* slicePositions,
                         const psImage* restrict in,
                         const psImage* restrict mask,
@@ -321 +322 @@
         psVector* maskVec = NULL;
         psMaskType* maskData = NULL;
+        psU32* outPosition = NULL;
 
         // recycle output to make a proper sized/type output structure
         // n.b. type is double as that is the type given for all stats in psStats.
-        out = psVectorRecycle( out, PS_TYPE_F64, numCols );
+        out = psVectorRecycle( out, numCols, PS_TYPE_F64);
+        if (slicePositions != NULL) {
+            slicePositions = psVectorRecycle(slicePositions,numCols,PS_TYPE_U32);
+            outPosition = slicePositions->data.U32;
+        }
         outData = out->data.F64;
         if ( delta < 0 ) {
@@ -355 +361 @@
                 (void)p_psGetStatValue(myStats,&statVal); \
                 *outData = statVal; \
+                if (outPosition != NULL) { \
+                    *(outPosition++) = col+c; \
+                } \
                 outData += delta; \
             } \
@@ -385 +394 @@
             psVector* maskVec = NULL;
             int elementSize = PSELEMTYPE_SIZEOF( type );
+            psU32* outPosition = NULL;
 
             // fill in psVectors to fake out the statistics functions.
@@ -398 +408 @@
             // recycle output to make a proper sized/type output structure
             // n.b. type is double as that is the type given for all stats in psStats.
-            out = psVectorRecycle( out, PS_TYPE_F64, numRows );
+            out = psVectorRecycle( out, numRows, PS_TYPE_F64 );
+            if (slicePositions != NULL) {
+                slicePositions = psVectorRecycle(slicePositions,numRows,PS_TYPE_U32);
+                outPosition = slicePositions->data.U32;
+            }
             outData = out->data.F64;
             if ( delta < 0 ) {
@@ -413 +427 @@
                 ( void ) p_psGetStatValue( myStats, &statVal ); // we know it works cause we tested it above
                 *outData = statVal;
+                if (outPosition != NULL) {
+                    *(outPosition++) = row+r;
+                }
                 outData += delta;
             }