Changeset 34800 for trunk/pswarp/src/pswarpTransformTile.c

Timestamp:

Dec 11, 2012, 2:04:31 PM (13 years ago)

Author:

watersc1

Message:

Merge from my branch including background restoration and stack stage projection cell binned images.

Location:

trunk

Files:

• . (modified) (1 prop)
• pswarp/src/pswarpTransformTile.c (modified) (2 diffs)

trunk/pswarp/src/pswarpTransformTile.c

@@ -46 +46 @@
     args->jacobian = NAN;
 
+    args->background_warping = false;
+    args->offset_x = 0.0;
+    args->offset_y = 0.0;
+    
     return args;
 }
@@ -83 +87 @@
     // Iterate over the output image pixels (parent frame)
     long goodPixels = 0;                ///< Number of input pixels landing on the output image
+
     for (int y = yMin; y < yMax; y++) {
         for (int x = xMin; x < xMax; x++) {
-
             // Only transform those pixels requested
             if (region && region->data.PS_TYPE_IMAGE_MASK_DATA[y][x]) {
                 continue;
             }
-
             // pswarpMapApply converts the output coordinate (x,y) to the input coordinate.
             // both are in the parent frames of the input and output images.
             double xIn, yIn;            // Input pixel coordinates
             pswarpMapApply(&xIn, &yIn, map, x + 0.5, y + 0.5);
+
+            // This needs to use a more reliable method to do this offset and limiting
+            //      if (args->interp->mode == 8) {
+            if (args->background_warping) {
+              //              double xOffset = 177.0 / 400.0; // (modelsize * modelbinning - xsize) / 2.0
+              //              double yOffset = 166.0 / 400.0; // (modelsize * modelbinning - ysize) / 2.0
+              xIn += args->offset_x;
+              yIn += args->offset_y;
+
+              if ((xIn > inNumCols - args->offset_x)||
+                  (yIn > inNumRows - args->offset_y)||
+                  (xIn < args->offset_x)||
+                  (yIn < args->offset_y)) {
+                continue;
+              }
+            }
+            
             if (xIn < 0 || xIn >= inNumCols || yIn < 0 || yIn >= inNumRows) {
                 continue;