Changeset 34838 for branches/eam_branches/ipp-20121130/pswarp/src/pswarpTransformReadout.c

Timestamp:

Dec 18, 2012, 5:56:48 AM (14 years ago)

Author:

eugene

Message:

merge changes from trunk

File:

• branches/eam_branches/ipp-20121130/pswarp/src/pswarpTransformReadout.c (modified) (6 diffs)

branches/eam_branches/ipp-20121130/pswarp/src/pswarpTransformReadout.c

@@ -29 +29 @@
     psImageInterpolateMode interpolationMode = psMetadataLookupS32(NULL, config->arguments,
                                                                    "INTERPOLATION.MODE"); ///< Mode for interp
+
     int numKernels = psMetadataLookupS32(NULL, config->arguments, "INTERPOLATION.NUM"); ///< Number of kernels
 
@@ -60 +61 @@
     // output coordinates to input coordinates
     pswarpMapGrid *grid = pswarpMapGridFromImage(input, output, nGridX, nGridY);
-
+    //    if (psMetadataLookupBool(NULL,config->arguments,"BACKGROUND_WARPING")) {
+    
     // XXX optionally modify the grid based on this result and force the maxError < XXX
     double maxError = pswarpMapGridMaxError(grid); // Maximum (positional) error from using grid
@@ -130 +132 @@
             args->goodPixels = 0;
 
+            if (psMetadataLookupBool(NULL,config->arguments,"BACKGROUND_WARPING")) {
+              args->background_warping = true;
+              args->offset_x = psMetadataLookupF32(NULL,config->arguments,"BKG_WARP_XOFFSET");
+              args->offset_y = psMetadataLookupF32(NULL,config->arguments,"BKG_WARP_YOFFSET");
+            }
+
+            
             // allocate a job
             psThreadJob *job = psThreadJobAlloc ("PSWARP_TRANSFORM_TILE");
@@ -171 +180 @@
         } else {
             pswarpTransformTileArgs *args = job->args->data[0];
-            // fprintf (stderr, "finished job %d,%d, Nargs: %ld\n", args->gridX, args->gridY, job->args->n);
             goodPixels += args->goodPixels;
             xMin = PS_MIN(args->xMin, xMin);
@@ -183 +191 @@
                 jacobian += args->jacobian * args->goodPixels;
             }
+
+            
         }
         psFree(job);
@@ -201 +211 @@
 
     if (goodPixels > 0 && psMetadataLookupBool(&mdok, recipe, "SOURCES")) {
+      if (!psMetadataLookupBool(NULL,config->arguments,"BACKGROUND_WARPING")) {
         if (!pswarpTransformSources(output, input, config)) {
-            psError(psErrorCodeLast(), false, "Unable to interpolate image.");
-            return false;
+          psError(psErrorCodeLast(), false, "Unable to interpolate image.");
+          return false;
         }
+      }
     }