Changeset 5745 for trunk/stac/src/stacWrite.c

Timestamp:

Dec 7, 2005, 4:04:22 PM (21 years ago)

Author:

Paul Price

Message:

Using autoconf; some bug fixes to the polynomial order

File:

• trunk/stac/src/stacWrite.c (modified) (4 diffs)

trunk/stac/src/stacWrite.c

@@ -4 +4 @@
 #include "stac.h"
 
-bool stacWriteMap(const char *mapName,  // Filename to write to
-                  psPlaneTransform *map // Map to write
+bool stacWriteMap(const char *mapName,  // Filename to write to
+                  psPlaneTransform *map // Map to write
     )
 {
@@ -12 +12 @@
     FILE *mapFile = fopen(mapName, "w");
     if (!mapFile) {
-        fprintf(stderr, "Unable to open map file: %s\n", mapName);
-        return false;
+        fprintf(stderr, "Unable to open map file: %s\n", mapName);
+        return false;
     }
 
-    psPolynomial2D *xMap = map->x;      // x transform
-    psPolynomial2D *yMap = map->y;      // y transform
+    psPolynomial2D *xMap = map->x;      // x transform
+    psPolynomial2D *yMap = map->y;      // y transform
 
     // A crucial limitation of the current system --- the order of each polynomial must be the same
     assert(xMap->nX == xMap->nY && yMap->nX == yMap->nY && xMap->nX == yMap->nX);
-    int order = xMap->nX;       // The polynomial order
+    int order = xMap->nX;       // The polynomial order
     fprintf(mapFile, "%d\n", order);
-    
+
     // x coefficients
-    for (int k = 0; k < order + 1; k++) {
-        for (int j = 0; j < k + 1; j++) {
-            int i = k - j;
-            if (xMap->mask[i][j]) {
-                fprintf(mapFile, "0.0 ");
-            } else {
-                fprintf(mapFile, "%g ", xMap->coeff[i][j]);
-            }
-        }
+    for (int k = 0; k <= order; k++) {
+        for (int j = 0; j <= k; j++) {
+            int i = k - j;
+            if (xMap->mask[i][j]) {
+                fprintf(mapFile, "0.0 ");
+            } else {
+                fprintf(mapFile, "%g ", xMap->coeff[i][j]);
+            }
+        }
     }
     fprintf(mapFile, "\n");
 
     // y coefficients
-    for (int k = 0; k < order + 1; k++) {
-        for (int j = 0; j < k + 1; j++) {
-            int i = k - j;
-            if (yMap->mask[i][j]) {
-                fprintf(mapFile, "0.0 ");
-            } else {
-                fprintf(mapFile, "%g ", yMap->coeff[i][j]);
-            }
-        }
+    for (int k = 0; k <= order; k++) {
+        for (int j = 0; j <= k; j++) {
+            int i = k - j;
+            if (yMap->mask[i][j]) {
+                fprintf(mapFile, "0.0 ");
+            } else {
+                fprintf(mapFile, "%g ", yMap->coeff[i][j]);
+            }
+        }
     }
     fprintf(mapFile, "\n");
-    
+
     fclose(mapFile);
 
@@ -57 +57 @@
 
 bool stacWriteMaps(const psArray *names, // Filenames of the input images (will add ".map")
-                   const psArray *maps  // Maps to write
+                   const psArray *maps  // Maps to write
     )
 {
@@ -65 +65 @@
 
     for (int i = 0; i < names->n; i++) {
-        char mapName[MAXCHAR];          // Filename of error image
-        sprintf(mapName, "%s.map", names->data[i]);
-        if (!stacWriteMap(mapName, maps->data[i])) {
-            return false;
-        }
+        char mapName[MAXCHAR];          // Filename of error image
+        sprintf(mapName, "%s.map", (const char*)names->data[i]);
+        if (!stacWriteMap(mapName, maps->data[i])) {
+            return false;
+        }
     }