Changeset 35421 for branches/eam_branches/ipp-20130419/psphot/src/psphotMakeResiduals.c

Timestamp:

Apr 19, 2013, 4:45:57 PM (13 years ago)

Author:

eugene

Message:

carry over changes from eam_branch/20130307

Location:

branches/eam_branches/ipp-20130419

Files:

• . (modified) (1 prop)
• psphot (modified) (1 prop)
• psphot/src (modified) (1 prop)
• psphot/src/psphotMakeResiduals.c (modified) (1 diff)

branches/eam_branches/ipp-20130419/psphot/src/psphotMakeResiduals.c

@@ -105 +105 @@
         if (model == NULL) continue;  // model must be defined
 
-        psImage *image  = psImageCopy (NULL, source->pixels,   PS_TYPE_F32);
-        psImage *variance = psImageCopy (NULL, source->variance,   PS_TYPE_F32);
-        psImage *mask   = psImageCopy (NULL, source->maskView, PS_TYPE_IMAGE_MASK);
+        psImage *image    = psImageCopy (NULL, source->pixels,     PS_TYPE_F32);
+        psImage *mask     = psImageCopy (NULL, source->maskView ? source->maskView : source->maskObj,  PS_TYPE_IMAGE_MASK);
+        psImage *variance = psImageCopy (NULL, source->variance ? source->variance : source->pixels,   PS_TYPE_F32);
         pmModelSub (image, mask, model, PM_MODEL_OP_FUNC, maskVal);