Merge remote-tracking branch 'origin/changestoITK3and4' into vtk7itk4wx3

diff --combined src/creaImageIOWxAnySimpleDlg.h
index df248194e422405edfd7a69d4515ae6bfd69194a,df655a4ce7369a28490eda436f3d81fbb911728a..65c80a627f9c92bee84340ce7cabca029f0a2abe
--- 1/src/creaImageIOWxAnySimpleDlg.h
--- 2/src/creaImageIOWxAnySimpleDlg.h
+++ b/src/creaImageIOWxAnySimpleDlg.h
@@@ -102,13 -102,13 +102,13 @@@ namespace creaImageI
               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,25 -116,14 +116,22 @@@
                        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
@@@ -145,7 -134,6 +142,6 @@@
          wxString infoimage;
          std::string m_dir;
  
- 
         bool m_dicom;
          /// interface to read data
          SimpleView m_view;
@@@ -157,6 -145,5 +153,5 @@@
          const std::type_info & getType(const std::string &i_name);
      };
  
- 
  }// namespace creaImageIO
  #endif //__creaImageWxAnySimpleDlg_h_INCLUDED__