Changeset 27838 for branches/tap_branches/pswarp/src/pswarpTransformReadout.c

Timestamp:

May 3, 2010, 8:41:49 AM (16 years ago)

Author:

eugene

Message:

updates from trunk

Location:

branches/tap_branches

Files:

• . (modified) (1 prop)
• pswarp/src/pswarpTransformReadout.c (modified) (5 diffs)

branches/tap_branches/pswarp/src/pswarpTransformReadout.c

@@ -89 +89 @@
 
     if (!pmReadoutMaskNonfinite(input, pmConfigMaskGet("SAT", config))) {
-        psError(PS_ERR_UNKNOWN, false, "Unable to mask non-finite pixels in input.");
+        psError(psErrorCodeLast(), false, "Unable to mask non-finite pixels in input.");
         return false;
     }
@@ -107 +107 @@
         psImageInit(output->mask, maskBad);
     }
+
+    // Ensure threading is off for the covariance calculation, since we are threading on a different level.
+    psImageCovarianceSetThreads(false);
 
     // create jobs and supply them to the threads
@@ -126 +129 @@
             psArrayAdd(job->args, 1, args);
             if (!psThreadJobAddPending(job)) {
-                psError(PS_ERR_UNKNOWN, false, "Unable to warp image.");
+                psError(psErrorCodeLast(), false, "Unable to warp image.");
                 return false;
             }
@@ -137 +140 @@
     // wait here for the threaded jobs to finish
     if (!psThreadPoolWait (false)) {
-        psError(PS_ERR_UNKNOWN, false, "Unable to interpolate image.");
+        psError(psErrorCodeLast(), false, "Unable to interpolate image.");
         return false;
     }
@@ -182 +185 @@
     if (goodPixels > 0) {
         if (!pswarpTransformSources(output, input, config)) {
-            psError(PS_ERR_UNKNOWN, false, "Unable to interpolate image.");
+            psError(psErrorCodeLast(), false, "Unable to interpolate image.");
             return false;
         }