Changeset 30152

Timestamp:

Dec 24, 2010, 3:05:30 PM (15 years ago)

Author:

eugene

Message:

add pmModel.isPCM; allow NULL input to pmModelCopy

Location:

branches/eam_branches/ipp-20101205/psModules/src/objects

Files:

• pmModel.c (modified) (2 diffs)
• pmModel.h (modified) (1 diff)

branches/eam_branches/ipp-20101205/psModules/src/objects/pmModel.c

@@ -70 +70 @@
     tmp->fitRadius = 0;
     tmp->flags = PM_MODEL_STATUS_NONE;
-    tmp->residuals = NULL;              // XXX should the model own this memory?
+    tmp->residuals = NULL;              // do not free: the model does not own this memory
+    tmp->isPCM = false;
 
     psS32 Nparams = pmModelClassParameterCount(type);
@@ -108 +109 @@
 pmModel *pmModelCopy (pmModel *model)
 {
-    PS_ASSERT_PTR_NON_NULL(model, NULL);
-
+    if (model == NULL) {
+        return NULL;
+    }
     pmModel *new = pmModelAlloc (model->type);
 

branches/eam_branches/ipp-20101205/psModules/src/objects/pmModel.h

@@ -43 +43 @@
     float fitRadius;                    ///< fit radius actually used
     pmResiduals *residuals;             ///< normalized PSF residuals
+    bool isPCM;                         ///< is this model fitted with PSF-convolution?
 
     // functions for this model which depend on the model class