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

Timestamp:

Jul 27, 2008, 12:41:58 PM (18 years ago)

Author:

eugene

Message:

turn on threading; add -threads argument, split out pswarpTransformSources

File:

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

branches/eam_branch_20080719/pswarp/src/pswarpTransformTile.c

@@ -37 +37 @@
     // 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);
+    // get the coordinate range for this grid tile
+    psPlane minPt, maxPt;
+    pswarpMapGridCoordRange (args->grid, args->gridX, args->gridY, &minPt, &maxPt);
 
-    psF32 **outImageData     = args->output->image->data.F32;
-    psF32 **outVarData       = args->output->weight->data.F32;
-    psMaskType **outMaskData = args->output->mask->data.U8;
+    psF32 **outImageData     = (args->output->image)  ? args->output->image->data.F32  : NULL;
+    psF32 **outVarData       = (args->output->weight) ? args->output->weight->data.F32 : NULL;
+    psMaskType **outMaskData = (args->output->mask)   ? args->output->mask->data.U8    : NULL;
 
     pswarpMap *map = args->grid->maps[args->gridX][args->gridY];
@@ -60 +58 @@
     // 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++) {
-        for (int x = minX; x < maxX; x++) {
+    for (int y = minPt.y; y < maxPt.y; y++) {
+        for (int x = minPt.x; x < maxPt.x; x++) {
 
             // Only transform those pixels requested