Changeset 15703

Timestamp:

Nov 27, 2007, 1:50:44 PM (18 years ago)

Author:

Paul Price

Message:

Only copy image if defined.

File:

• trunk/psModules/src/objects/pmSource.c (modified) (2 diffs)

trunk/psModules/src/objects/pmSource.c

@@ -6 +6 @@
  *  @author EAM, IfA: significant modifications.
  *
- *  @version $Revision: 1.42 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2007-11-27 21:01:59 $
+ *  @version $Revision: 1.43 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2007-11-27 23:50:44 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -169 +169 @@
     source->pixels   = psImageCopyView(NULL, in->pixels);
     source->weight   = psImageCopyView(NULL, in->weight);
-    source->maskView = psImageCopyView(NULL, in->maskView);
+    source->maskView = in->maskView ? psImageCopyView(NULL, in->maskView) : NULL;
 
     // the maskObj is a unique mask array; create a new mask image
-    if (in->maskObj) {
-        source->maskObj = psImageCopy (NULL, in->maskObj, PS_TYPE_MASK);
-    }
+    source->maskObj = in->maskObj ? psImageCopy (NULL, in->maskObj, PS_TYPE_MASK) : NULL;
 
     source->type = in->type;