Changeset 12505 for trunk/pswarp/src/pswarpTransformReadout_Opt.c

Timestamp:

Mar 19, 2007, 3:58:02 PM (19 years ago)

Author:

eugene

Message:

updates to fix mosaic astrometry

File:

• trunk/pswarp/src/pswarpTransformReadout_Opt.c (modified) (5 diffs)

trunk/pswarp/src/pswarpTransformReadout_Opt.c

@@ -5 +5 @@
 
     int minX, minY, maxX, maxY;
-    int gridX, gridY, nextGridX, nextGridY;
+    int gridXo, gridX, gridY, nextGridX, nextGridY;
     pswarpMap *map = NULL;
 
@@ -19 +19 @@
 
     // we might want to do the rectangular regions outside of the selection independently
-    psImageInit (output->image, NAN);
+    // psImageInit (output->image, NAN);
 
     // find the output pixel range
@@ -31 +31 @@
 
     pswarpMapGridSetGrid (grid, minX, minY, &gridX, &gridY); 
-    pswarpMapGridNextGrid (grid, gridX, gridY, &nextGridX, &nextGridY);
+    pswarpMapGridNextGrid_Y (grid, gridY, &nextGridY);
     map = grid->maps[gridX][gridY];
 
@@ -38 +38 @@
         if (y >= nextGridY) {
             gridY ++;
-            pswarpMapGridNextGrid (grid, gridX, gridY, &nextGridX, &nextGridY);
+            pswarpMapGridNextGrid_Y (grid, gridY, &nextGridY);
             map = grid->maps[gridX][gridY];
         }
+
+        gridXo = gridX;
         for (int x = minX; x < maxX; x++) {
             if (x >= nextGridX) {
                 gridX ++;
-                pswarpMapGridNextGrid (grid, gridX, gridY, &nextGridX, &nextGridY);
+                pswarpMapGridNextGrid_X (grid, gridX, &nextGridX);
                 map = grid->maps[gridX][gridY];
             }
@@ -60 +62 @@
             outData[y][x] = (psF32)psImagePixelInterpolate(inImage, inPix->x, inPix->y, NULL, 1, NAN, PS_INTERPOLATE_BILINEAR);
         }
+        gridX = gridXo;
+        pswarpMapGridNextGrid_X (grid, gridX, &nextGridX);
+        map = grid->maps[gridX][gridY];
     }