From: Eduardo DAVILA Date: Wed, 4 Oct 2017 09:45:40 +0000 (+0200) Subject: Merge remote-tracking branch 'origin/changestoITK3and4' into vtk7itk4wx3 X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=b52bf19755b9e9f7d4a40abb2c8e881b56d49577;p=creaImageIO.git Merge remote-tracking branch 'origin/changestoITK3and4' into vtk7itk4wx3 --- b52bf19755b9e9f7d4a40abb2c8e881b56d49577 diff --cc src/creaImageIOWxAnySimpleDlg.h index df24819,df655a4..65c80a6 --- a/src/creaImageIOWxAnySimpleDlg.h +++ b/src/creaImageIOWxAnySimpleDlg.h @@@ -116,18 -116,9 +116,17 @@@ namespace creaImageI 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 void split4Din3Dvtk(TImage* i_Img);