Merge remote-tracking branch 'origin/vtk8itk5wx3-mingw64' into vtk8itk5wx3-macos

diff --git a/lib/doxygen/CMakeLists.txt b/lib/doxygen/CMakeLists.txt
index 8f3d2679927a32d194c7b84d2adbc7ea276de174..744ce591b33d138dfd2ea76f72be64ff3133f051 100644 (file)
--- a/lib/doxygen/CMakeLists.txt
+++ b/lib/doxygen/CMakeLists.txt
@@ -28,7 +28,7 @@
 MACRO(CREA_BUILD_DOXYGEN_DOC NAME INPUT DOC_RELATIVE_INSTALL_PATH PREDEFINED)
 
   #--------------------------------------------------------------------------
-  SET(USE_DOXYGEN ON CACHE BOOL "" FORCE)
+  SET(USE_DOXYGEN OFF CACHE BOOL "" FORCE)
   
   # Name
   SET(DOXYGEN_PROJECT_NAME "${NAME}")

diff --git a/lib/kernel_ManagerContour_NDimensions/OutlineModelManager.cxx b/lib/kernel_ManagerContour_NDimensions/OutlineModelManager.cxx
index b1c4f4b67c5bdfb4b8bcc51993d38fb344bf2cf4..9de974ed95f33ee92a035deb39f75fde63ab45bd 100644 (file)
--- a/lib/kernel_ManagerContour_NDimensions/OutlineModelManager.cxx
+++ b/lib/kernel_ManagerContour_NDimensions/OutlineModelManager.cxx
@@ -393,7 +393,9 @@
        {
 //             imageSource = new ImageSourceThing(aSource);
                //return addImageSource(new ImageSourceThing(aSource), theInstantData);
-               return NULL;//***********************************************************************************************
+//EED 2021-12-02
+//             return NULL;//***********************************************************************************************
+        return false;
        }
 
        /*
@@ -406,7 +408,9 @@
        {
                //imageSection = new ImageSectionThing(aSecImageData);
 //             return addImageSection(new ImageSectionThing(aSecImageData), theInstantData);
-               return NULL;
+        //EED 2021-12-02
+        //        return NULL;//***********************************************************************************************
+                return false;
        }
 
        /*