]> Creatis software - clitk.git/commitdiff
Merge branch 'master' of git.creatis.insa-lyon.fr:clitk into VTK6_Qt5
authorSimon Rit <simon.rit@creatis.insa-lyon.fr>
Thu, 18 Feb 2016 06:38:49 +0000 (07:38 +0100)
committerSimon Rit <simon.rit@creatis.insa-lyon.fr>
Thu, 18 Feb 2016 06:38:49 +0000 (07:38 +0100)
1  2 
common/vvImageReader.txx

diff --combined common/vvImageReader.txx
index 551f1139691d31eb944a721741a740a18644a3dd,02b2193367dd2d7b3107e286dfccc3d32fc946ee..a797bf465bb9f0c9103aac948bbdab4586e5ba65
@@@ -60,7 -60,7 +60,7 @@@ void vvImageReader::UpdateWithDim(std::
    else
      std::cerr << "Error, input pixel type : " << InputPixelType << " unknown !" << std::endl;
  
-   if (CLITK_EXPERIMENTAL && mLastError.size()==0) {
+   if (mLastError.size()==0) {
      //ReadNkiImageTransform();
      ReadMatImageTransform();
    }
@@@ -86,7 -86,6 +86,7 @@@ void vvImageReader::UpdateWithDimAndInp
        reader->SetFileName(*i);
        try {
          mImage->AddItkImage<InputImageType>(reader->GetOutput());
 +        mImage->ComputeScalarRangeBase<InputPixelType, VImageDimension-1>(reader->GetOutput());
        } catch ( itk::ExceptionObject & err ) {
          std::cerr << "Error while reading " << mInputFilenames[0].c_str()
                    << " " << err << std::endl;
  #endif
      try {
        mImage->AddItkImage<SlicedImageType>(filter->GetOutput());
 +      mImage->ComputeScalarRangeBase<InputPixelType, VImageDimension-1>(filter->GetOutput());
      } catch ( itk::ExceptionObject & err ) {
        std::cerr << "Error while slicing " << mInputFilenames[0].c_str()
                  << "(slice #" << mSlice << ") " << err << std::endl;