From: tbaudier <thomas.baudier@creatis.insa-lyon.fr>
Date: Thu, 19 Jan 2017 15:13:25 +0000 (+0100)
Subject: Merge branch 'master' into wipe
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=0b4d512916fbaf29f2f52f7f24aa9af37ce24ece;hp=71021d34bda3e0e61917cdc1780f7ed901714965;p=clitk.git

Merge branch 'master' into wipe
---

diff --git a/.travis.yml b/.travis.yml
index c13255a..ce53271 100644
--- 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 0e4c22b..5e7d903 100644
--- 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);