Windows compilation: 3/3

diff --git a/appli/bash/Utility.h.in b/appli/bash/Utility.h.in
index a0bbb2183900c891250492163dd33bf753248854..95c8be0f97292d329922b9bc7b76d6b39f93df04 100644 (file)
--- a/appli/bash/Utility.h.in
+++ b/appli/bash/Utility.h.in
@@ -6,15 +6,14 @@
 #include <string>
 
 // -------------------------------------------------------------------------
-#ifdef @prj_NAME@_Windows
+#define @prj_NAME_OS@
+#ifdef @prj_NAME_OS@
 #  define cpExtensions_STRTOK( A, B, N )  strtok_s(  A, B, N )
 #  define cpExtensions_SPRINTF( B, S, O ) sprintf_s( B, S, "%s", O );
-#  define
-#else // @prj_NAME@_Windows
+#else // @prj_NAME_OS@
 #  define cpExtensions_STRTOK( A, B, N )  std::strtok( A, B )
 #  define cpExtensions_SPRINTF( B, S, O ) std::sprintf( B, "%s", O );
-#endif // @prj_NAME@_Windows
-
+#endif // @prj_NAME_OS@
 
 // -------------------------------------------------------------------------
 namespace cpPlugins_bash

diff --git a/cmake/DetectOS.cmake b/cmake/DetectOS.cmake
index 42621f82f4d720fb010c726cb84be94c373d668f..6f8abc6bf819174a10ad2e7c602954540b342966 100644 (file)
--- a/cmake/DetectOS.cmake
+++ b/cmake/DetectOS.cmake
@@ -17,7 +17,7 @@ ELSEIF("${CMAKE_SYSTEM_NAME}" STREQUAL "Windows")
   SET(prj_NAME_LIB_PREFIX "")
   SET(prj_NAME_LIB_EXT ".dll")
   SET(prj_NAME_ENV_SEPARATOR ";")
-  SET(prj_NAME_PATH_SEPARATOR "\\\\")
+  SET(prj_NAME_PATH_SEPARATOR "\\\\\\\\")
 ENDIF("${CMAKE_SYSTEM_NAME}" STREQUAL "Linux")
 
 ## eof - $RCSfile$

diff --git a/cmake/cpPluginsConfig.cmake.in b/cmake/cpPluginsConfig.cmake.in
index 5465875a251d2d9288c7d6fdae37d2ae138bba2f..4f79456d9ccf96211a248c8c217105fe5cac392a 100644 (file)
--- a/cmake/cpPluginsConfig.cmake.in
+++ b/cmake/cpPluginsConfig.cmake.in
@@ -9,7 +9,6 @@ ENDIF("@Qt4_FOUND@" STREQUAL "TRUE")
 ## ====================
 ## == Find libraries ==
 ## ====================
-
 SET(
   _all_libs
   "@cpPlugins_tinyxml2_LIB@"

diff --git a/lib/cpExtensions/Visualization/ImageSliceMapper.cxx b/lib/cpExtensions/Visualization/ImageSliceMapper.cxx
index f510b51291c16277aa915fe1c02b1a7c0f7febe5..5bf36fc7943f804fc2d9b0873140af4998d4d2af 100644 (file)
--- a/lib/cpExtensions/Visualization/ImageSliceMapper.cxx
+++ b/lib/cpExtensions/Visualization/ImageSliceMapper.cxx
@@ -18,6 +18,7 @@ cpExtensions::Visualization::ImageSliceMapper::
 ImageSliceMapper( )
   : Superclass( )
 {
+#ifdef cpPlugins_OpenGL_BackEnd_OpenGL2
   // Complete polydatas to avoid bizarre rendering errors (multi-thread)
   vtkActor* a[ 3 ];
   a[ 0 ] = this->PolyDataActor;
@@ -51,6 +52,7 @@ ImageSliceMapper( )
     } // fi
 
   } // rof
+#endif // cpPlugins_OpenGL_BackEnd_OpenGL2
 }
 
 // -------------------------------------------------------------------------

diff --git a/lib/cpExtensions/Visualization/LUTImageActor.cxx b/lib/cpExtensions/Visualization/LUTImageActor.cxx
index a022b309badf79d52369a0170bf5877ba4218c7d..d37721537d23ee9741fe145cad3d323a88bc829a 100644 (file)
--- a/lib/cpExtensions/Visualization/LUTImageActor.cxx
+++ b/lib/cpExtensions/Visualization/LUTImageActor.cxx
@@ -86,7 +86,7 @@ GetLUTColor(
 void cpExtensions::Visualization::LUTImageActor::
 SetLUTColor( unsigned int id, double r, double g, double b, double a )
 {
-  if( id >= this->m_LUT->GetNumberOfTableValues( ) )
+  if( id >= ( unsigned int )( this->m_LUT->GetNumberOfTableValues( ) ) )
     this->m_LUT->SetNumberOfTableValues( id + 1 );
   this->m_LUT->SetTableValue( id, r, g, b, a );
   this->m_LUT->Modified( );

diff --git a/lib/cpPlugins/Config.h.in b/lib/cpPlugins/Config.h.in
index dea43e50b4182ccfeef1e2c05431a26a6372d0d9..1c0f1066d1a4716fa70ad353ac2e8cf14909175c 100644 (file)
--- a/lib/cpPlugins/Config.h.in
+++ b/lib/cpPlugins/Config.h.in
@@ -16,14 +16,14 @@
 #define @prj_NAME@_ENV_SEPARATOR  "@prj_NAME_ENV_SEPARATOR@"
 #define @prj_NAME@_PATH_SEPARATOR "@prj_NAME_PATH_SEPARATOR@"
 
-#ifdef @prj_NAME@_Windows
+#ifdef @prj_NAME@_OS_Windows
 #  ifndef WIN32_LEAN_AND_MEAN
 #    define WIN32_LEAN_AND_MEAN
 #  endif
 #  define NOMINMAX
 #  include <windows.h>
 #  include <tchar.h>
-#endif
+#endif // @prj_NAME@_OS_Windows
 
 /*
  * =========================================================================
@@ -53,6 +53,7 @@
 #define @prj_NAME@_RELEASE_VERSION @prj_REL_VER@
 #define @prj_NAME@_VERSION         "@prj_VERSION@"
 #define @prj_NAME@_SHORT_VERSION   "@prj_SHORT_VERSION@"
+#define @prj_NAME@_OpenGL_BackEnd_@VTK_RENDERING_BACKEND@
 
 /*
  * =========================================================================
@@ -67,12 +68,12 @@
 #  define @prj_NAME@_NOEXCEPT noexcept
 #  define @prj_NAME@_HAS_CXX11_STATIC_ASSERT
 #  define @prj_NAME@_HAS_CXX11_RVREF
-#else
+#else // __cplusplus >= 201103L
 #  define @prj_NAME@_OVERRIDE
 #  define @prj_NAME@_DELETE_FUNCTION
 #  define @prj_NAME@_NULLPTR  NULL
 #  define @prj_NAME@_NOEXCEPT throw()
-#endif
+#endif // __cplusplus >= 201103L
 
 /*
  * =========================================================================

diff --git a/lib/cpPlugins/DataObjects/Image.cxx b/lib/cpPlugins/DataObjects/Image.cxx
index da575bb23b16b60409282793996cee6997dd6eff..d7e26d4bac75084a5267f6fb2bbfd9feed316e90 100644 (file)
--- a/lib/cpPlugins/DataObjects/Image.cxx
+++ b/lib/cpPlugins/DataObjects/Image.cxx
@@ -21,7 +21,7 @@ SetITK( itk::LightObject* o )
 void cpPlugins::DataObjects::Image::
 SetVTK( vtkObjectBase* o )
 {
-  vtkImageData* img = dynamic_cast< vtkImageData* >( img );
+  vtkImageData* img = dynamic_cast< vtkImageData* >( o );
   this->Superclass::SetVTK( img );
   if( img == NULL )
   {

diff --git a/lib/cpPlugins/Interface/Plugins.cxx b/lib/cpPlugins/Interface/Plugins.cxx
index b5f9269809b4f5f86f3f4350073e47c914e0d332..42ab2cc77ded0fd88249a1c6a8bf9f6b8b1b70d5 100644 (file)
--- a/lib/cpPlugins/Interface/Plugins.cxx
+++ b/lib/cpPlugins/Interface/Plugins.cxx
@@ -424,7 +424,13 @@ cpPlugins::Interface::Plugins::
 Plugins( )
   : Superclass( )
 {
+#ifdef cpPlugins_OS_Windows
+  char* p;
+  size_t size;
+  _dupenv_s( &p, &size, cpPlugins_PATHS );
+#else // cpPlugins_OS_Windows
   char* p = std::getenv( cpPlugins_PATHS );
+#endif // cpPlugins_OS_Windows
   std::stringstream str;
   if( p != NULL )
     str << p << cpPlugins_ENV_SEPARATOR;