Changeset 28534 for branches/pap/psModules

Timestamp:

Jun 28, 2010, 8:11:04 PM (16 years ago)

Author:

Paul Price

Message:

Merging trunk in preparation for merging branch to trunk.

Location:

branches/pap

Files:

• . (modified) (1 prop)
• psModules/src/objects/pmSourceMatch.c (modified) (1 diff)
• psModules/src/objects/pmSourcePhotometry.c (modified) (1 diff)

branches/pap/psModules/src/objects/pmSourceMatch.c

@@ -227 +227 @@
             }
 
+            numMaster = size;
             xMaster->n = size;
             yMaster->n = size;

branches/pap/psModules/src/objects/pmSourcePhotometry.c

@@ -393 +393 @@
     psImage *mask     = source->maskObj;
 
+    if (!flux || !variance || !mask) {
+        return false;
+    }
+
     for (int iy = 0; iy < flux->numRows; iy++) {
         for (int ix = 0; ix < flux->numCols; ix++) {