Changeset 30631 for branches/czw_branch/20101203/psModules/src/objects/pmModel.c

Timestamp:

Feb 14, 2011, 1:05:28 PM (15 years ago)

Author:

watersc1

Message:

Merge of trunk back into branch.

Location:

branches/czw_branch/20101203

Files:

• . (modified) (1 prop)
• psModules/src/objects (modified) (1 prop)
• psModules/src/objects/pmModel.c (modified) (2 diffs)

branches/czw_branch/20101203/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);