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

Timestamp:

Sep 25, 2012, 6:08:46 PM (14 years ago)

Author:

watersc1

Message:

Quick clean up of some debug statements that aren't required anymore.

File:

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

branches/czw_branch/20120906/pswarp/src/pswarpTransformTile.c

@@ -83 +83 @@
     // Iterate over the output image pixels (parent frame)
     long goodPixels = 0;                ///< Number of input pixels landing on the output image
-    psTrace("pswarp",3,"Size: %d %d\n",xMax,yMax);
+
     for (int y = yMin; y < yMax; y++) {
         for (int x = xMin; x < xMax; x++) {
@@ -95 +95 @@
             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) {
-              xIn += 177.0 / 400.0;
-              yIn += 166.0 / 400.0;
+              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 ((xIn > inNumCols - 177.0/ 400.0)||
-                  (yIn > inNumRows - 166.0/ 400.0)||
-                  (xIn < 177.0/ 400.0)||
-                  (yIn < 166.0/ 400.0)
-                  
-                  ) {
-                fprintf(stderr,"\n");
+              if ((xIn > inNumCols - xOffset)||
+                  (yIn > inNumRows - yOffset)||
+                  (xIn < xOffset)||
+                  (yIn < yOffset)) {
                 continue;
               }
@@ -124 +124 @@
             int xOut = x - outCol0, yOut = y - outRow0; ///< Position on output image
 
-            if (((xOut % 500) == 0)&&((yOut % 500) == 0)) {
-              fprintf(stderr,"%d %d %g %g %d %d (%d %d %d %d) %g %g %g\n",
-                      x,y,xIn,yIn,xOut,yOut,xMin,xMax,yMin,yMax,imageValue,
-                      (4846 - 400 * (12)) / 2.0,
-                      (4868 - 400 * (12)) / 2.0
-                      
-                      );
-            }
-            
-/*          if ((xIn >= args->interp->image->numCols - 1)|| */
-/*              (yIn >= args->interp->image->numRows - 1)) { */
-/*            imageValue = NAN; */
-/*          } */
             if (outImageData) {
                 outImageData[yOut][xOut] = imageValue * jacobian;