#3470 merge vtk8itk5wx3-mingw64

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6fbc02988847a18a0b66d0250e685dcba82b6010..6eac5f282c504850feced026fb19d6eef03412ca 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -183,7 +183,10 @@ ENDIF(WIN32)
 ##. This cmake code is not working ??????   MacOs..
 
 message(STATUS "Checking OpenMP")
-find_package(OpenMP)
+find_package(OpenMP )
+if(OpenMP_CXX_FOUND)
+    message("OpenMP. Yessssssss")
+endif()
 IF(OPENMP_FOUND)
     message("Found OpenMP! ^_^")
     # add flags for OpenMP

diff --git a/bbtk/src/bbcreaMaracasVisuManualPaint_Model.cxx b/bbtk/src/bbcreaMaracasVisuManualPaint_Model.cxx
index aba4fc8bf54805e111a86d1bf00efdab3750eba9..be8c85ca6c337cf0e7d302963ad1aa42f45f856a 100644 (file)
--- a/bbtk/src/bbcreaMaracasVisuManualPaint_Model.cxx
+++ b/bbtk/src/bbcreaMaracasVisuManualPaint_Model.cxx
@@ -6,8 +6,9 @@
 #include "bbcreaMaracasVisuManualPaint_Model.h"
 #include "bbcreaMaracasVisuPackage.h"
 
-#include <omp.h>
-
+/* EED 20210-09-13  Not compiling in MacOs
+ #include <omp.h>
+*/
 
 namespace bbcreaMaracasVisu
 {
@@ -268,15 +269,9 @@ printf("EED ManualPaint_Model::Process  ByImagePoints (with openmp)  size=%d
                                for (index=0; index<size; index++)
                                {
                                        if ( (k1omp==index) || (k2omp==index) || (k3omp==index) || 
-                                                (k4omp==index) || (k5omp==index) || (k6omp==index) ) 
-                                       { 
-                                               if (size==1) 
-                                               { 
-                                                       printf("  100% (just one element)\n"); 
-                                               } else {
-                                                       printf("  %d%%  omp_get_num_threads=%d\n", (int)(((double)index/(double)(size-1))*100 ),  omp_get_num_threads() ); 
-                                               } 
-                                       }// if K#omp
+                                                (k4omp==index) || (k5omp==index) || (k6omp==index) )
+                        { printf("  %d%\n", (int)(((double)index/(double)(size-1))*100 )); }
+                    
 //                                     double value1;
 //                                     GETVALUE2_VTK_CREA(value1,pBIP,sTBIP,index)
 //                                     if (value1>0)

diff --git a/bbtk/src/bbcreaMaracasVisuReadCreaContourFile.cxx b/bbtk/src/bbcreaMaracasVisuReadCreaContourFile.cxx
index a3fafa05cd0c2bdf934e2af9406a66bb790954c5..7e371210b0fd1f741f498edf317b6b8c53ed5a74 100644 (file)
--- a/bbtk/src/bbcreaMaracasVisuReadCreaContourFile.cxx
+++ b/bbtk/src/bbcreaMaracasVisuReadCreaContourFile.cxx
@@ -120,7 +120,7 @@ void ReadCreaContourFile::Process()
                        bbSetOutputLstIndexs( LstIndexs );
 
                        } else {
-                                               printf("EED Warnning!  ReadCreaContourFile::Process  %s is not a creaContour .roi file\n",bbGetInputFileNameRoi() );
+                                               printf("EED Warnning!  ReadCreaContourFile::Process  %s is not a creaContour .roi file\n",bbGetInputFileNameRoi().c_str() );
                        } // if --CreaContour--
                } // if ff
        } // if FileNameRoi