Changeset 34489 for branches/czw_branch/20120906/pswarp/src/pswarpTransformTile.c

Timestamp:

Sep 28, 2012, 4:56:30 PM (14 years ago)

Author:

watersc1

Message:

Removed excess debug information, and pulled header information so that I don't need to hard code anything anymore.

File:

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

branches/czw_branch/20120906/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;
 }
@@ -96 +100 @@
 
             // This needs to use a more reliable method to do this offset and limiting
-            if (args->interp->mode == 8) {
-              double xOffset = 177.0 / 400.0; // (modelsize * modelbinning - xsize) / 2.0
-              double yOffset = 166.0 / 400.0; // (modelsize * modelbinning - ysize) / 2.0
-              xIn += xOffset;
-              yIn += yOffset;
+            //      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 - xOffset)||
-                  (yIn > inNumRows - yOffset)||
-                  (xIn < xOffset)||
-                  (yIn < yOffset)) {
+              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) {