Changeset 36884 for branches/eam_branches/ipp-20140610/psModules/src/objects/pmSourceUtils.c

Timestamp:

Jun 17, 2014, 5:58:38 AM (12 years ago)

Author:

eugene

Message:

merge in changes from trunk (up through pv3 tag)

Location:

branches/eam_branches/ipp-20140610

Files:

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

branches/eam_branches/ipp-20140610/psModules/src/objects/pmSourceUtils.c

@@ -34 +34 @@
 #include "pmMoments.h"
 #include "pmModelFuncs.h"
+#include "pmModelClass.h"
 #include "pmModel.h"
 #include "pmModelUtils.h"
-#include "pmModelClass.h"
 #include "pmSourceMasks.h"
 #include "pmSourceExtendedPars.h"
@@ -65 +65 @@
     pmModel *model = pmModelAlloc(modelType);
 
-    if (!model->modelGuess(model, source, maskVal, markVal)) {
+    if (!model->class->modelGuess(model, source, maskVal, markVal)) {
         psFree (model);
         return NULL;