[Gdcm-hackers] gdcm-git:Grassroots DICOM branch release updated. 40422b47c3457e06c1f58cff2979f48942c88a8a

[Mathieu M. <ma...@us...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Grassroots DICOM".

The branch, release has been updated
       via  40422b47c3457e06c1f58cff2979f48942c88a8a (commit)
       via  10ecfc05c8fbd2858ae9ad1ee04cadf55a75f900 (commit)
      from  818ff9b138a457a3094988871c3badb43092e93f (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://sourceforge.net/p/gdcm/gdcm/ci/40422b47c3457e06c1f58cff2979f48942c88a8a/

commit 40422b47c3457e06c1f58cff2979f48942c88a8a
Author: Miguel Nunes <m....@fr...>
Date:   Thu Feb 23 13:49:31 2017 +0100

    Thank you for the update. Unfortunately I have found a bug while linking with vtk 7.1.
    virtual unsigned long GetMTime(); has the wrong signature. It should be virtual vtkMTimeType GetMTime()

diff --git a/Utilities/VTK/vtkImageMapToColors16.cxx b/Utilities/VTK/vtkImageMapToColors16.cxx
index 768b27b..c172a40 100644
--- a/Utilities/VTK/vtkImageMapToColors16.cxx
+++ b/Utilities/VTK/vtkImageMapToColors16.cxx
@@ -66,7 +66,12 @@ vtkImageMapToColors16::~vtkImageMapToColors16()
 }
 
 //----------------------------------------------------------------------------
-unsigned long vtkImageMapToColors16::GetMTime()
+#ifdef VTK_HAS_MTIME_TYPE
+vtkMTimeType
+#else
+unsigned long
+#endif
+vtkImageMapToColors16::GetMTime()
 {
   unsigned long t1, t2;
 
diff --git a/Utilities/VTK/vtkImageMapToColors16.h b/Utilities/VTK/vtkImageMapToColors16.h
index da68905..70b76ec 100644
--- a/Utilities/VTK/vtkImageMapToColors16.h
+++ b/Utilities/VTK/vtkImageMapToColors16.h
@@ -85,7 +85,11 @@ public:
 
   // Description:
   // We need to check the modified time of the lookup table too.
+#ifdef VTK_HAS_MTIME_TYPE
+  virtual vtkMTimeType GetMTime();
+#else
   virtual unsigned long GetMTime();
+#endif
 
 protected:
   vtkImageMapToColors16();

https://sourceforge.net/p/gdcm/gdcm/ci/10ecfc05c8fbd2858ae9ad1ee04cadf55a75f900/

commit 10ecfc05c8fbd2858ae9ad1ee04cadf55a75f900
Author: Mathieu Malaterre <mat...@gm...>
Date:   Thu Feb 23 13:47:40 2017 +0100

    Apparently this is deprecated

diff --git a/Utilities/VTK/CMakeLists.txt b/Utilities/VTK/CMakeLists.txt
index c6e451e..c13d7ba 100644
--- a/Utilities/VTK/CMakeLists.txt
+++ b/Utilities/VTK/CMakeLists.txt
@@ -16,7 +16,9 @@ if(GDCM_HAVE_PTHREAD_H AND CMAKE_USE_PTHREADS)
   )
 endif()
 
-include(${VTK_USE_FILE})
+if( ${VTK_VERSION_MAJOR} LESS 6 )
+  include(${VTK_USE_FILE})
+endif()
 
 if( ${VTK_MAJOR_VERSION} GREATER 5 )
   list(APPEND vtkgdcm_SRCS

-----------------------------------------------------------------------

Summary of changes:
 Utilities/VTK/CMakeLists.txt            | 4 +++-
 Utilities/VTK/vtkImageMapToColors16.cxx | 7 ++++++-
 Utilities/VTK/vtkImageMapToColors16.h   | 4 ++++
 3 files changed, 13 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
Grassroots DICOM