Changeset 6294 for trunk/psLib/test/imageops/tst_psImagePixelExtract.c

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.

File:

• trunk/psLib/test/imageops/tst_psImagePixelExtract.c (modified) (5 diffs)

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; \
             } \