Changeset 18752 for branches/eam_branch_20080719/pswarp/src/pswarpTransformTile.c

Timestamp:

Jul 27, 2008, 8:00:23 AM (18 years ago)

Author:

eugene

Message:

threaded and unthreaded equivalent versions now compile

File:

• branches/eam_branch_20080719/pswarp/src/pswarpTransformTile.c (modified) (3 diffs)

branches/eam_branch_20080719/pswarp/src/pswarpTransformTile.c

@@ +1 @@
+# include "pswarp.h"
 
-// XXX need to determine all of the needed inputs and put them in a structure
+void pswarpTransformTileArgsFree (pswarpTransformTileArgs *args) {
+    if (!args) return;
+    return;
+}
 
-typedef struct {
-    int gridX;
-    int gridY;
-} pswarpTransformTileOpts;
+pswarpTransformTileArgs *pswarpTransformTileArgsAlloc() {
 
-pswarpTransformTile (int gridX, int gridY) {
+    pswarpTransformTileArgs *args = (pswarpTransformTileArgs *)psAlloc(sizeof(pswarpTransformTileArgs));
+    psMemSetDeallocator(args, (psFreeFunc)pswarpTransformTileArgsFree);
 
-    minX = pswarpMapGridNextGrid_Y (grid, gridY);
-    minY = pswarpMapGridNextGrid_X (grid, gridX);
+    args->input = NULL;
+    args->output = NULL;
+    args->grid = NULL;
+    args->interp = NULL;
+    args->region = NULL;
 
-    maxX = pswarpMapGridNextGrid_Y (grid, gridY);
-    maxY = pswarpMapGridNextGrid_X (grid, gridX);
+    args->gridX = 0;
+    args->gridY = 0;
 
-    map = grid->maps[gridX][gridY];
+    args->goodPixels = 0;
 
-    psPlane *inPix = psPlaneAlloc();    // Coordinates on the input detector
+    return args;
+}
+
+bool pswarpTransformTile (pswarpTransformTileArgs *args) {
+
+    // int inCol0 = args->input->image->col0;
+    // int inRow0 = args->input->image->row0;
+    int inNcol = args->input->image->numCols;
+    int inNrow = args->input->image->numRows;
+
+    int outCol0 = args->output->image->col0;
+    int outRow0 = args->output->image->row0;
+    // int outNcol = args->output->image->numCols;
+    // int outNrow = args->output->image->numRows;
+
+    // XXX these are wrong (min or max is wrong)
+    int minX = pswarpMapGridNextGrid_Y (args->grid, args->gridY);
+    int minY = pswarpMapGridNextGrid_X (args->grid, args->gridX);
+    int maxX = pswarpMapGridNextGrid_Y (args->grid, args->gridY);
+    int maxY = pswarpMapGridNextGrid_X (args->grid, args->gridX);
+
+    psF32 **outImageData     = args->output->image->data.F32;
+    psF32 **outVarData       = args->output->weight->data.F32;
+    psMaskType **outMaskData = args->output->mask->data.U8;
+
+    pswarpMap *map = args->grid->maps[args->gridX][args->gridY];
+
+    psImage *region = args->region;
+
+    double xInRaw, yInRaw;
+
+    // output values for this pixel
+    double imageValue;
+    double varValue;
+    psMaskType maskValue;
 
     // Iterate over the output image pixels (parent frame)
     long goodPixels = 0;                // Number of input pixels landing on the output image
     for (int y = minY; y < maxY; y++) {
-        int yOut = y - outRow0;         // Position on image
         for (int x = minX; x < maxX; x++) {
 
@@ -30 +68 @@
             // pswarpMapApply converts the output coordinate (x,y) to the input coordinate.
             // both are in the parent frames of the input and output images.
-            pswarpMapApply (&inPix->x, &inPix->y, map, x + 0.5, y + 0.5);
+            pswarpMapApply (&xInRaw, &yInRaw, map, x + 0.5, y + 0.5);
 
-            if (inPix->x - inCol0 < 0) continue;
-            if (inPix->x - inCol0 >= inImage->numCols) continue;
-            if (inPix->y - inRow0 < 0) continue;
-            if (inPix->y - inRow0 >= inImage->numRows) continue;
+            double xIn = xInRaw - outCol0;      // Position on input image
+            double yIn = yInRaw - outRow0;      // Position on input image
+
+            if (xIn < 0) continue;
+            if (yIn >= inNcol) continue;
+            if (yIn < 0) continue;
+            if (yIn >= inNrow) continue;
 
             goodPixels++;
 
-            // XXX include mask
-            // XXX apply scale and offset?
             // psImagePixelInterpolate determines the value at pixel coordinate (x,y) in child coordinates
-            double imageValue, varValue;
-            psMaskType maskValue;
-            if (!psImageInterpolate(&imageValue, &varValue, &maskValue,
-                                    inPix->x - inCol0, inPix->y - inRow0, interp)) {
+            if (!psImageInterpolate(&imageValue, &varValue, &maskValue, xIn, yIn, args->interp)) {
                 psError(PS_ERR_UNKNOWN, false, "Unable to interpolate image.");
-                psFree(interp);
-                psFree(inPix);
-                psFree(grid);
                 return false;
             }
-            int xOut = x - outCol0;     // Position on image
-            outImageData[yOut][xOut] = imageValue;
-            if (inVar) {
+
+            int xOut = x - outCol0;     // Position on output image
+            int yOut = y - outRow0;     // Position on output image
+
+            // not all images need be transformed
+            if (outImageData) {
+                outImageData[yOut][xOut] = imageValue;
+            }
+            if (outVarData) {
                 outVarData[yOut][xOut] = varValue;
             }
@@ -62 +101 @@
         }
     }
-
-    psFree(inPix);
+    args->goodPixels = goodPixels;
+    return true;
 }