Changeset 21235 for branches/pap_branch_20090128/pswarp/src/pswarpTransformReadout.c

Timestamp:

Jan 29, 2009, 5:29:04 PM (17 years ago)

Author:

Paul Price

Message:

Merging in mainline so that problems with mask and PSF can be dealt with --- I think I branched while the mainline was in the process of being updated.

File:

• branches/pap_branch_20090128/pswarp/src/pswarpTransformReadout.c (modified) (2 diffs)

branches/pap_branch_20090128/pswarp/src/pswarpTransformReadout.c

@@ -22 +22 @@
 
     // output mask bits
-    psMaskType maskIn   = psMetadataLookupU8(&mdok, recipe, "MASK.INPUT");
-    psMaskType maskPoor = pmConfigMaskGet("POOR.WARP", config);
-    psMaskType maskBad  = pmConfigMaskGet("BAD.WARP", config);
+    psImageMaskType maskIn   = psMetadataLookupImageMask(&mdok, recipe, "MASK.INPUT");
+    psImageMaskType maskPoor = pmConfigMaskGet("POOR.WARP", config);
+    psImageMaskType maskBad  = pmConfigMaskGet("BAD.WARP", config);
     psAssert(mdok, "MASK.INPUT was not defined");
 
@@ -80 +80 @@
     }
     if ((input->mask || maskPoor || maskBad) && !output->mask) {
-        output->mask = psImageAlloc(output->image->numCols, output->image->numRows, PS_TYPE_MASK);
+        output->mask = psImageAlloc(output->image->numCols, output->image->numRows, PS_TYPE_IMAGE_MASK);
         psImageInit(output->mask, maskBad);
     }