Changeset 6484 for trunk/psLib/test/imageops

Timestamp:

Feb 24, 2006, 1:43:16 PM (20 years ago)

Author:

drobbin

Message:

Changed psArray & psVector to zero 'n' upon allocation. Used to set vector->n = nalloc.

Location:

trunk/psLib/test/imageops

Files:

• tst_psImageConvolve.c (modified) (4 diffs)
• tst_psImagePixelExtract.c (modified) (2 diffs)
• verified/tst_psImagePixelExtract.stderr (modified) (1 diff)

trunk/psLib/test/imageops/tst_psImageConvolve.c

@@ -5 +5 @@
  *  @author Robert DeSonia, MHPCC
  *
- *  @version $Revision: 1.1 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-07-13 02:47:00 $
+ *  @version $Revision: 1.2 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-02-24 23:43:15 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -129 +129 @@
     for (psS32 i = 0; i < size; i++) {
         xVec->data.U32[i] = x[i];
+        xVec->n++;
         yVec->data.U32[i] = y[i];
+        yVec->n++;
         tVec->data.U32[i] = t[i];
+        tVec->n++;
     }
 
@@ -186 +189 @@
     for (psS32 i = 0; i < size; i++) {
         xVec->data.S16[i] = x[i];
+        xVec->n++;
         yVec->data.S16[i] = y[i];
+        yVec->n++;
         tVec->data.S16[i] = t[i];
+        tVec->n++;
     }
 
@@ -242 +248 @@
 
     for (psS32 i = 0; i < size; i++) {
-        xVec->data.F32[i] = x[i]+0.1;
+        //        xVec->data.F32[i] = x[i]+0.1;
+        //        xVec->n++;
+        psVectorSet(xVec, i, x[i]+0.1);
         yVec->data.F32[i] = y[i]+0.2;
+        yVec->n++;
         tVec->data.F32[i] = t[i]+0.3;
+        tVec->n++;
     }
 

trunk/psLib/test/imageops/tst_psImagePixelExtract.c

@@ -6 +6 @@
 *  @author Robert DeSonia, MHPCC
 *
-*  @version $Revision: 1.4 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2006-02-02 04:41:45 $
+*  @version $Revision: 1.5 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2006-02-24 23:43:15 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -532 +532 @@
     for (psS32 i=0; i < 10; i++) {
         radii->data.F32[i] = 10+i*10;
+        radii->n++;
     }
 

trunk/psLib/test/imageops/verified/tst_psImagePixelExtract.stderr

@@ -138 +138 @@
     Following should be an error.
 <DATE><TIME>|<HOST>|E|psImageRadialCut (FILE:LINENO)
-    Input radii vector size, 1, can not be less than 2.
+    Input radii vector size, 0, can not be less than 2.
 <DATE><TIME>|<HOST>|I|testImageRadialCut
     Following should be an error.