Changeset 12257 for trunk/psLib/test/imageops/tap_psImagePixelExtract.c

Timestamp:

Mar 5, 2007, 5:14:01 PM (19 years ago)

Author:

gusciora

Message:

Removed bug with psVector->n++

File:

• trunk/psLib/test/imageops/tap_psImagePixelExtract.c (modified) (7 diffs)

trunk/psLib/test/imageops/tap_psImagePixelExtract.c

@@ -6 +6 @@
 *  @author Robert DeSonia, MHPCC
 *
-*  @version $Revision: 1.1 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2007-02-08 01:26:20 $
+*  @version $Revision: 1.2 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2007-03-06 03:14:01 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -21 +21 @@
     psLogSetFormat("HLNM");
     psLogSetLevel(PS_LOG_INFO);
-    plan_tests(244);
+    plan_tests(248);
 
     // testImageSlice()
@@ -396 +396 @@
         psVector* cols = psVectorAlloc(length,PS_TYPE_F32);
     
-        psVector* result = NULL;
+        psVector* result = psVectorAlloc(length,PS_TYPE_F32);
         for (psS32 n = 0; n < numPoints; n++) {
             psVector* orig = result;
@@ -468 +468 @@
         }
 
-    
         // Following should be an error (NULL image)
         // XXX: Verify error
@@ -534 +533 @@
         for (psS32 i=0; i < 10; i++) {
             radii->data.F32[i] = 10+i*10;
-            radii->n++;
         }
     
         bool errorFlag = false;    
-        psVector* result = NULL;
-        ok(false, "Skipping psImageRadialCut() test because of bugs");
-        if (0) {
+        psVector* result = psVectorAlloc(10,PS_TYPE_F32);
+        if (1) {
             result = psImageRadialCut(result,image,mask,1,centerX,centerY,radii,stat);
             ok(result != NULL, "psImageRadialCut returned non-NULL");
@@ -553 +550 @@
             ok(!errorFlag, "psImageRadialCut() produced the correct data values");
         }    
-
         // again, but without mask
         psVector* orig = result;
-        ok(false, "Skipping psImageRadialCut() test because of bugs");
-        if (0) {
+        if (1) {
             result = psImageRadialCut(result,image,NULL,1,centerX,centerY,radii,stat);
             ok(result != NULL, "psImageRadialCut returned non-NULL");
@@ -1247 +1242 @@
         ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks");
     }
-/* HERE
-*/
 }