Changeset 5743 for trunk/stac/src/stacInvertMaps.c

Timestamp:

Dec 7, 2005, 2:57:14 PM (21 years ago)

Author:

Paul Price

Message:

Importing from PAP cvs tree again. This will now be the working tree.

File:

• trunk/stac/src/stacInvertMaps.c (modified) (3 diffs)

trunk/stac/src/stacInvertMaps.c

@@ -27 +27 @@
         assert(oldMap->x->nX == oldMap->x->nY && oldMap->y->nX == oldMap->y->nY &&
                oldMap->x->nX == oldMap->y->nX);
-        int order = oldMap->x->nX;      // Polynomial order
+        int order = oldMap->x->nX + 1;  // Polynomial order
         psTrace("stac.invertMaps", 4, "Generating order %d polynomial inverse transformation.\n", order);
-        psPlaneTransform *newMap = psPlaneTransformAlloc(order, order); // Inverted map
+        psPlaneTransform *newMap = psPlaneTransformAlloc(order + 1, order + 1); // Inverted map
 
         // Create fake polynomial to use in evaluation
-        psDPolynomial2D *fakePoly = psDPolynomial2DAlloc(order, order, PS_POLYNOMIAL_ORD);
+        psPolynomial2D *fakePoly = psPolynomial2DAlloc(order, order, PS_POLYNOMIAL_ORD);
         for (int i = 0; i < order; i++) {
             for (int j = 0; j < order; j++) {
@@ -82 +82 @@
 
                     fakePoly->mask[i][j] = 0;
-                    double ijPoly = psDPolynomial2DEval(fakePoly, xIn->data.F32[g], yIn->data.F32[g]);
+                    double ijPoly = psPolynomial2DEval(fakePoly, xIn->data.F32[g], yIn->data.F32[g]);
                     fakePoly->mask[i][j] = 1;
 
@@ -89 +89 @@
                             
                             fakePoly->mask[m][n] = 0;
-                            double mnPoly = psDPolynomial2DEval(fakePoly, xIn->data.F32[g], yIn->data.F32[g]);
+                            double mnPoly = psPolynomial2DEval(fakePoly, xIn->data.F32[g], yIn->data.F32[g]);
                             fakePoly->mask[m][n] = 1;