Merge branch 'master' into GammaIndex3D

diff --git a/.travis.yml b/.travis.yml
index c13255acc0c1864952f62a932746efd533c1e08e..ce53271188e155e2f65bb4bee940d52ce61e7271 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -76,5 +76,5 @@ before_script:
 #Install vtk and itk (different version)
 
 script:
-- echo "coucou";
-#- $SCRIPTS/travis_build_vv.sh
+#- echo "coucou";
+- $SCRIPTS/travis_build_vv.sh

diff --git a/common/vvImageReader.cxx b/common/vvImageReader.cxx
index 0e4c22ba05b468522dace0bf3b08ee2412652d08..5e7d90364dc6ee28e067cfd18c7aa0a8169a07a4 100644 (file)
--- a/common/vvImageReader.cxx
+++ b/common/vvImageReader.cxx
@@ -19,6 +19,7 @@
 #define VVIMAGEREADER_CXX
 
 #include <itkImageFileReader.h>
+#include "gdcmImageHelper.h"
 #include "vvImageReader.h"
 #include "vvImageReader.txx"
 #include "clitkTransformUtilities.h"
@@ -57,6 +58,7 @@ void vvImageReader::Update(LoadedImageType type)
     mLastError="Unable to read file.";
   } else {
     reader->SetFileName(mInputFilenames[0]);
+    gdcm::ImageHelper::SetForcePixelSpacing(true);
     reader->ReadImageInformation();
     if (mInputFilenames.size() > 1)
       Update(reader->GetNumberOfDimensions()+1,reader->GetComponentTypeAsString(reader->GetComponentType()),type);