Index: trunk/psLib/test/math/tap_psPolynomialEval3D.c
===================================================================
--- trunk/psLib/test/math/tap_psPolynomialEval3D.c	(revision 10848)
+++ trunk/psLib/test/math/tap_psPolynomialEval3D.c	(revision 11397)
@@ -4,6 +4,6 @@
 *  ORD and CHEB type polynomials.
 *
-*  @version  $Revision: 1.2 $  $Name: not supported by cvs2svn $
-*  @date  $Date: 2006-12-29 04:38:42 $
+*  @version  $Revision: 1.3 $  $Name: not supported by cvs2svn $
+*  @date  $Date: 2007-01-30 00:11:31 $
 *
 * Copyright 2004-2005 Maui High Performance Computing Center, Univ. of Hawaii
@@ -207,7 +207,6 @@
         psMemId id = psMemGetId();
         psPolynomial3D* polyOrd = psPolynomial3DAlloc(99, TERMS-1, TERMS-1, TERMS-1);
-        ok(polyOrd == NULL, "Ordinary polynomial allocation successful");
+        ok(polyOrd != NULL, "Ordinary polynomial allocation successful");
         skip_start(polyOrd == NULL, 1, "Skipping tests because psPolynomial3DAlloc() failed");
-
         // Attempt to evaluation invalid polynomial type
         psF64 result = psPolynomial3DEval(polyOrd,0.0, 0.0, 0.0);
@@ -222,19 +221,4 @@
     {
         psMemId id = psMemGetId();
-        psPolynomial3D* polyOrd = psPolynomial3DAlloc(PS_POLYNOMIAL_ORD, TERMS-1, TERMS-1, TERMS-1);
-        ok(polyOrd != NULL, "Ordinary polynomial allocation successful");
-        skip_start(polyOrd == NULL, 8, "Skipping tests because psPolynomial3DAlloc() failed");
-
-        // Set polynomial members
-        for(psS32 i = 0; i < TERMS; i++)
-        {
-            for(psS32 j = 0; j < TERMS; j++) {
-                for(psS32 k = 0; k < TERMS; k++) {
-                    polyOrd->coeff[i][j][k] = Dpoly3DCoeff[i][j][k];
-                    polyOrd->mask[i][j][k]  = poly3DMask[i][j][k];
-                }
-            }
-        }
-
         // Create input vectors
         psVector* inputOrdX  = psVectorAlloc(TESTPOINTS, PS_TYPE_F64);
@@ -251,4 +235,18 @@
         }
 
+        psPolynomial3D* polyOrd = psPolynomial3DAlloc(PS_POLYNOMIAL_ORD, TERMS-1, TERMS-1, TERMS-1);
+        ok(polyOrd != NULL, "Ordinary polynomial allocation successful");
+        skip_start(polyOrd == NULL, 10, "Skipping tests because psPolynomial3DAlloc() failed");
+        // Set polynomial members
+        for(psS32 i = 0; i < TERMS; i++)
+        {
+            for(psS32 j = 0; j < TERMS; j++) {
+                for(psS32 k = 0; k < TERMS; k++) {
+                    polyOrd->coeff[i][j][k] = Dpoly3DCoeff[i][j][k];
+                    polyOrd->mask[i][j][k]  = poly3DMask[i][j][k];
+                }
+            }
+        }
+
         // Evaluate the vectors
         psVector* outputOrd = psPolynomial3DEvalVector(polyOrd,inputOrdX,inputOrdY,inputOrdZ);
@@ -293,11 +291,10 @@
         inputOrdZ->type.type = PS_TYPE_U8;
         ok(psPolynomial3DEvalVector(polyOrd,inputOrdX,inputOrdY,inputOrdZ) == NULL, "psPolynomial3DEvalVector() produced NULL when called with non F64 input vector");
-
+        psFree(outputOrd);
+        skip_end();
         psFree(inputOrdX);
         psFree(inputOrdY);
         psFree(inputOrdZ);
-        psFree(outputOrd);
         psFree(polyOrd);
-        skip_end();
         ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks");
     }
@@ -309,19 +306,4 @@
     {
         psMemId id = psMemGetId();
-        psPolynomial3D* polyCheb = psPolynomial3DAlloc(PS_POLYNOMIAL_CHEB, TERMS-1, TERMS-1, TERMS-1);
-        ok(polyCheb != NULL, "Ordinary polynomial allocation successful");
-        skip_start(polyCheb == NULL, 8, "Skipping tests because psPolynomial3DAlloc() failed");
-
-        // Set polynomial members
-        for(psS32 i = 0; i < TERMS; i++)
-        {
-            for(psS32 j = 0; j < TERMS; j++) {
-                for(psS32 k = 0; k < TERMS; k++) {
-                    polyCheb->coeff[i][j][k] = 1.0;
-                    polyCheb->mask[i][j][k]  = poly3DMask[i][j][k];
-                }
-            }
-        }
-
         // Create input vectors
         psVector* inputChebX = psVectorAlloc(TESTPOINTS, PS_TYPE_F64);
@@ -337,4 +319,17 @@
             inputChebZ->n++;
         }
+        psPolynomial3D* polyCheb = psPolynomial3DAlloc(PS_POLYNOMIAL_CHEB, TERMS-1, TERMS-1, TERMS-1);
+        ok(polyCheb != NULL, "Ordinary polynomial allocation successful");
+        skip_start(polyCheb == NULL, 10, "Skipping tests because psPolynomial3DAlloc() failed");
+        // Set polynomial members
+        for(psS32 i = 0; i < TERMS; i++)
+        {
+            for(psS32 j = 0; j < TERMS; j++) {
+                for(psS32 k = 0; k < TERMS; k++) {
+                    polyCheb->coeff[i][j][k] = 1.0;
+                    polyCheb->mask[i][j][k]  = poly3DMask[i][j][k];
+                }
+            }
+        }
 
         // Evaluate the vectors
@@ -380,11 +375,10 @@
         inputChebZ->type.type = PS_TYPE_U8;
         ok(psPolynomial3DEvalVector(polyCheb,inputChebX,inputChebY,inputChebZ) == NULL, "psPolynomial3DEvalVector() produced NULL when called with non F64 input vector");
-
+        psFree(outputCheb);
+        skip_end();
         psFree(inputChebX);
         psFree(inputChebY);
         psFree(inputChebZ);
-        psFree(outputCheb);
         psFree(polyCheb);
-        skip_end();
         ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks");
     }