X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FcreaImageIOWxAnySimpleDlg.h;h=64497d0095fe8af4c39af35c22029e3a37afbdc4;hb=1813f80def50d02057c58a83245739066f37f9f0;hp=51674d3f6ac4b5136f0e919ee2327ea2793e942f;hpb=c7482ec7d04a5e5987841932a6856ebd471cebdb;p=creaImageIO.git

diff --git a/src/creaImageIOWxAnySimpleDlg.h b/src/creaImageIOWxAnySimpleDlg.h
index 51674d3..64497d0 100644
--- a/src/creaImageIOWxAnySimpleDlg.h
+++ b/src/creaImageIOWxAnySimpleDlg.h
@@ -29,6 +29,7 @@
 #ifndef __creaImageWxAnySimpleDlg_h_INCLUDED__
 #define __creaImageWxAnySimpleDlg_h_INCLUDED__
 
+#include <vtkVersionMacros.h>
 #include "creaImageIOSimpleView.h"
 #include <creaWx.h>
 #include <itkImageFileReader.h>
@@ -102,13 +103,13 @@ namespace creaImageIO
              for(; it != m_AnyImages.end(); it++)
              {
                  imgs.push_back(boost::any_cast<TImage*> (*it));
-             }
+             } // for
              return imgs;
           }
           bool AllSameType();
 		  template <class TImage> 
 		  void split3Din3Dvtk(TImage* i_Img)
-		 {
+		{
 			typedef itk::ImageToVTKImageFilter< TImage > ConnectorType;
 			 typename ConnectorType::Pointer       connector = ConnectorType::New();
 			 connector->SetInput(i_Img);
@@ -116,17 +117,22 @@ namespace creaImageIO
 			connector->Update();
 			vtkImageData *im = vtkImageData::New();
 			im->ShallowCopy(connector->GetOutput());
+
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
 			im->Update();
+#else
+			im->Modified();
+#endif
+
+
 			m_Vresults.push_back(im);
 		 }
-
 		  
         template <typename TImage> 
         void split4Din3Dvtk(TImage* i_Img);
 
- 
     private:
-
         // strange compile error with gcc 4.5.1-4 //JPR        
         std::vector</*const*/ size_t>           m_AnyDims;   //comment out const JPR
         std::vector</*const*/ std::type_info *> m_AnyType;   //comment out const JPR
@@ -137,7 +143,6 @@ namespace creaImageIO
         wxString infoimage;
         std::string m_dir;
 
-
        bool m_dicom;
         /// interface to read data
         SimpleView m_view;
@@ -149,6 +154,5 @@ namespace creaImageIO
         const std::type_info & getType(const std::string &i_name);
     };
 
-
 }// namespace creaImageIO
 #endif //__creaImageWxAnySimpleDlg_h_INCLUDED__