Index: trunk/psLib/test/math/tap_psPolynomialEval2D.c
===================================================================
--- trunk/psLib/test/math/tap_psPolynomialEval2D.c	(revision 10848)
+++ trunk/psLib/test/math/tap_psPolynomialEval2D.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
@@ -101,7 +101,6 @@
         }
         ok(!errorFlag, "psPolynomial2DEval() successful (Ordinary)");
-
+        skip_end();
         psFree(polyOrd);
-        skip_end();
         ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks");
     }
@@ -137,7 +136,6 @@
         }
         ok(!errorFlag, "psPolynomial2DEval() successful (Chebyshev)");
-
+        skip_end();
         psFree(polyCheb);
-        skip_end();
         ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks");
     }
@@ -148,14 +146,11 @@
         psMemId id = psMemGetId();
         psPolynomial2D* polyOrd = psPolynomial2DAlloc(99, 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 psPolynomial2DAlloc() failed");
-
-        // Attempt to evaluation invalid polynomial type
+        // Attempt to evaluate invalid polynomial type
         psF64 result = psPolynomial2DEval(polyOrd,0.0, 0.0);
         ok(isnan(result), "psPolynomial2DEval() did not return NAN, as expected");
-
         skip_end();
         psFree(polyOrd);
-
         ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks");
     }
@@ -165,17 +160,4 @@
     {
         psMemId id = psMemGetId();
-        psPolynomial2D* polyOrd = psPolynomial2DAlloc(PS_POLYNOMIAL_ORD, TERMS-1, TERMS-1);
-        ok(polyOrd != NULL, "Ordinary polynomial allocation successful");
-        skip_start(polyOrd == NULL, 8, "Skipping tests because psPolynomial2DAlloc() failed");
-
-        // Set polynomial members
-        for(psS32 i = 0; i < TERMS; i++)
-        {
-            for(psS32 j = 0; j < TERMS; j++) {
-                polyOrd->coeff[i][j] = poly2DCoeff[i][j];
-                polyOrd->mask[i][j]  = poly2DMask[i][j];
-            }
-        }
-
         // Create input vectors
         psVector* inputOrdX  = psVectorAlloc(TESTPOINTS, PS_TYPE_F64);
@@ -189,4 +171,16 @@
         }
 
+        psPolynomial2D* polyOrd = psPolynomial2DAlloc(PS_POLYNOMIAL_ORD, TERMS-1, TERMS-1);
+        ok(polyOrd != NULL, "Ordinary polynomial allocation successful");
+        skip_start(polyOrd == NULL, 8, "Skipping tests because psPolynomial2DAlloc() failed");
+        // Set polynomial members
+        for(psS32 i = 0; i < TERMS; i++)
+        {
+            for(psS32 j = 0; j < TERMS; j++) {
+                polyOrd->coeff[i][j] = poly2DCoeff[i][j];
+                polyOrd->mask[i][j]  = poly2DMask[i][j];
+            }
+        }
+
         // Evaluate the vectors
         psVector* outputOrd = psPolynomial2DEvalVector(polyOrd, inputOrdX, inputOrdY);
@@ -223,11 +217,9 @@
         inputOrdY->type.type = PS_TYPE_U8;
         ok(psPolynomial2DEvalVector(polyOrd,inputOrdX, inputOrdY) == NULL, "psPolynomial2DEvalVector() produced NULL when called with non F64 input vector");
-
+        psFree(outputOrd);
+        skip_end();
         psFree(inputOrdX);
         psFree(inputOrdY);
-        psFree(outputOrd);
         psFree(polyOrd);
-
-        skip_end();
         ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks");
 
@@ -241,17 +233,4 @@
     {
         psMemId id = psMemGetId();
-        psPolynomial2D* polyCheb = psPolynomial2DAlloc(PS_POLYNOMIAL_CHEB, TERMS-1, TERMS-1);
-        ok(polyCheb != NULL, "Cheby polynomial allocation successful");
-        skip_start(polyCheb == NULL, 8, "Skipping tests because psPolynomial2DAlloc() failed");
-
-        // Set polynomial members
-        for(psS32 i = 0; i < TERMS; i++)
-        {
-            for(psS32 j = 0; j < TERMS; j++) {
-                polyCheb->coeff[i][j] = 1.0;
-                polyCheb->mask[i][j]  = poly2DMask[i][j];
-            }
-        }
-
         // Create input vectors
         psVector* inputChebX = psVectorAlloc(TESTPOINTS, PS_TYPE_F64);
@@ -265,4 +244,16 @@
         }
 
+        psPolynomial2D* polyCheb = psPolynomial2DAlloc(PS_POLYNOMIAL_CHEB, TERMS-1, TERMS-1);
+        ok(polyCheb != NULL, "Cheby polynomial allocation successful");
+        skip_start(polyCheb == NULL, 8, "Skipping tests because psPolynomial2DAlloc() failed");
+        // Set polynomial members
+        for(psS32 i = 0; i < TERMS; i++)
+        {
+            for(psS32 j = 0; j < TERMS; j++) {
+                polyCheb->coeff[i][j] = 1.0;
+                polyCheb->mask[i][j]  = poly2DMask[i][j];
+            }
+        }
+
         // Evaluate the vectors
         psVector* outputCheb = psPolynomial2DEvalVector(polyCheb, inputChebX, inputChebY);
@@ -300,11 +291,9 @@
         inputChebY->type.type = PS_TYPE_U8;
         ok(psPolynomial2DEvalVector(polyCheb,inputChebX, inputChebY) == NULL, "psPolynomial2DEvalVector() produced NULL when called with non F64 input vector");
-
+        psFree(outputCheb);
+        skip_end();
         psFree(inputChebX);
         psFree(inputChebY);
-        psFree(outputCheb);
         psFree(polyCheb);
-
-        skip_end();
         ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks");
     }