Changeset 6204 for trunk/psLib/src/astro/psCoord.c

Timestamp:

Jan 26, 2006, 11:10:22 AM (20 years ago)

Author:

gusciora

Message:

Implemented the polynomial alloc argument changes.

File:

• trunk/psLib/src/astro/psCoord.c (modified) (7 diffs)

trunk/psLib/src/astro/psCoord.c

@@ -10 +10 @@
 *  @author GLG, MHPCC
 *
-*  @version $Revision: 1.100 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2006-01-23 22:25:31 $
+*  @version $Revision: 1.101 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2006-01-26 21:10:22 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -212 +212 @@
 
     psPlaneTransform *pt = psAlloc(sizeof(psPlaneTransform));
-    pt->x = psPolynomial2DAlloc(order1, order2, PS_POLYNOMIAL_ORD);
-    pt->y = psPolynomial2DAlloc(order1, order2, PS_POLYNOMIAL_ORD);
+    pt->x = psPolynomial2DAlloc(PS_POLYNOMIAL_ORD, order1, order2);
+    pt->y = psPolynomial2DAlloc(PS_POLYNOMIAL_ORD, order1, order2);
 
     psMemSetDeallocator(pt, (psFreeFunc) planeTransformFree);
@@ -275 +275 @@
 
     psPlaneDistort *pt = psAlloc(sizeof(psPlaneDistort));
-    pt->x = psPolynomial4DAlloc(order1, order2, order3, order4, PS_POLYNOMIAL_ORD);
-    pt->y = psPolynomial4DAlloc(order1, order2, order3, order4, PS_POLYNOMIAL_ORD);
+    pt->x = psPolynomial4DAlloc(PS_POLYNOMIAL_ORD, order1, order2, order3, order4);
+    pt->y = psPolynomial4DAlloc(PS_POLYNOMIAL_ORD, order1, order2, order3, order4);
 
     psMemSetDeallocator(pt, (psFreeFunc) planeDistortFree);
@@ -573 +573 @@
     psTrace(__func__, 5, "out poly (nX, nY) is (%d, %d)\n", orderX, orderY);
 
-    psPolynomial2D *out = psPolynomial2DAlloc(orderX, orderY, PS_POLYNOMIAL_ORD);
+    psPolynomial2D *out = psPolynomial2DAlloc(PS_POLYNOMIAL_ORD, orderX, orderY);
     psTrace(__func__, 5, "Creating poly (%d, %d)\n", orderX, orderY);
 
@@ -689 +689 @@
                 psTrace(__func__, 6, "In this iteration, we raise trans1->x to the %d power and trans1->y to the %d-power.\n", t2x, t2y);
                 // Create the constant "f(x, y) = 1" polynomial.
-                psPolynomial2D *currPoly = psPolynomial2DAlloc(0, 0, PS_POLYNOMIAL_ORD);
+                psPolynomial2D *currPoly = psPolynomial2DAlloc(PS_POLYNOMIAL_ORD, 0, 0);
                 currPoly->coeff[0][0] = 1.0;
 
@@ -738 +738 @@
                 psTrace(__func__, 5, "In this iteration, we raise trans1->x to the %d power and trans1->y to the %d-power.\n", t2x, t2y);
                 // Create the constant "f(x, y) = 1" polynomial.
-                psPolynomial2D *currPoly = psPolynomial2DAlloc(0, 0, PS_POLYNOMIAL_ORD);
+                psPolynomial2D *currPoly = psPolynomial2DAlloc(PS_POLYNOMIAL_ORD, 0, 0);
                 currPoly->coeff[0][0] = 1.0;
 
@@ -809 +809 @@
     //
     // XXX: Verify this (poly order/nterm change)
-    psPolynomial2D *fakePoly = psPolynomial2DAlloc(order-1, order-1, PS_POLYNOMIAL_ORD);
+    psPolynomial2D *fakePoly = psPolynomial2DAlloc(PS_POLYNOMIAL_ORD, order-1, order-1);
     for (int i = 0; i < order; i++) {
         for (int j = 0; j < order; j++) {