[Mevislabmodules-svn] SF.net SVN: mevislabmodules:[407] trunk/Community/General/Sources/ML/ MLCSOCommunityModules/CSOSetProperties/mlCSOSetProperties.cpp

[<wol...@us...>]

Revision: 407
          http://mevislabmodules.svn.sourceforge.net/mevislabmodules/?rev=407&view=rev
Author:   wolfspindler
Date:     2012-03-02 15:38:20 +0000 (Fri, 02 Mar 2012)
Log Message:
-----------
Some backward compatible ports for MeVisLab2.3.

Modified Paths:
--------------
    trunk/Community/General/Sources/ML/MLCSOCommunityModules/CSOSetProperties/mlCSOSetProperties.cpp

Modified: trunk/Community/General/Sources/ML/MLCSOCommunityModules/CSOSetProperties/mlCSOSetProperties.cpp
===================================================================
--- trunk/Community/General/Sources/ML/MLCSOCommunityModules/CSOSetProperties/mlCSOSetProperties.cpp	2012-03-02 11:12:26 UTC (rev 406)
+++ trunk/Community/General/Sources/ML/MLCSOCommunityModules/CSOSetProperties/mlCSOSetProperties.cpp	2012-03-02 15:38:20 UTC (rev 407)
@@ -269,7 +269,10 @@
     m_InputCSOList->removeNotificationObserver(CSOListNotifyObserverCB, this);
   }
   if (!f_WorkDirectlyOnInputList->getBoolValue()){
+#if MEVISLAB_VERSION < 203
     ML_DELETE(m_OutputCSOList);
+#endif
+    m_OutputCSOList = NULL;
   }
 }
 
@@ -301,7 +304,10 @@
       bool hasChangedToOn = f_WorkDirectlyOnInputList->getBoolValue();
       if (m_InputCSOList != NULL){
         if (hasChangedToOn){
+#if MEVISLAB_VERSION < 203
           ML_DELETE(m_OutputCSOList);
+#endif
+          m_OutputCSOList = NULL;
           m_OutputCSOList = m_InputCSOList;
         } else {
           ML_CHECK_NEW(m_OutputCSOList, CSOList(*m_InputCSOList));
@@ -309,7 +315,10 @@
       } else { // no input, nothing to put out
         if (hasChangedToOn){
           if (m_OutputCSOList != NULL){
+#if MEVISLAB_VERSION < 203
             ML_DELETE(m_OutputCSOList);
+#endif
+            m_OutputCSOList = NULL;
           }
         }
         m_OutputCSOList = NULL;
@@ -345,13 +354,18 @@
     if (workDirectlyOnInputCSOList){
       m_OutputCSOList = NULL;
     } else {
+#if MEVISLAB_VERSION < 203
       ML_DELETE(m_OutputCSOList);
+#endif
       m_OutputCSOList = NULL;
     }
   }
   if (m_InputCSOList != NULL){
     if (!workDirectlyOnInputCSOList){ // make copy
+#if MEVISLAB_VERSION < 203
       ML_DELETE(m_OutputCSOList);
+#endif
+      m_OutputCSOList = NULL;
       ML_CHECK_NEW(m_OutputCSOList, CSOList(*m_InputCSOList));
     } else { // use pointer
       m_OutputCSOList = m_InputCSOList;

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.