Merge branch 'master' of git.creatis.insa-lyon.fr:clitk

Conflicts:
	vv/vvSlicer.cxx

diff --cc vv/vvSlicer.cxx
index 0c7852ad12e83b2c31518b4b3e75e8f82cbcacdc,751316041310d604542a04f8dd22c40b7342e973..30a8f1034931e169815e884c2ada69129a72ae4c
--- 1/vv/vvSlicer.cxx
--- 2/vv/vvSlicer.cxx
+++ b/vv/vvSlicer.cxx
@@@ -901,11 -901,8 +901,13 @@@ void vvSlicer::AdjustResliceToSliceOrie
    // Step 1: from world coordinates to image coordinates
    origin[this->SliceOrientation] -= mImageReslice->GetOutput()->GetOrigin()[this->SliceOrientation];
    origin[this->SliceOrientation] /= mImageReslice->GetOutput()->GetSpacing()[this->SliceOrientation];
 -  // Step 2: round to superior grid positionInc.
 -  origin[this->SliceOrientation] = itk::Math::Ceil<double>(origin[this->SliceOrientation]);
++
 +  // Step 2: round to nearest grid positionInc. This has been validated as the only
 +  // way to have something consistent with the thickness of a 2D slice visible on the
 +  // other slices. The thickness is accounted for so if the 2D slice is to thin and
 +  // between two slices, one will never be able to see this 2D slice (bug #1883).
 +  origin[this->SliceOrientation] = itk::Math::Round<double>(origin[this->SliceOrientation]);
++
    // Step 3: back to world coordinates
    origin[this->SliceOrientation] *= mImageReslice->GetOutput()->GetSpacing()[this->SliceOrientation];
    origin[this->SliceOrientation] += mImageReslice->GetOutput()->GetOrigin()[this->SliceOrientation];