From 5c7d0fb1118c51f5441a667af081b5703ad55442 Mon Sep 17 00:00:00 2001 From: tbaudier Date: Mon, 24 Apr 2017 17:13:54 +0200 Subject: [PATCH] Remove warnings with travis compilators gcc & clang --- common/vvImageReader.txx | 4 ++-- vv/vvToolCropImage.cxx | 2 +- vv/vvToolRigidReg.cxx | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/common/vvImageReader.txx b/common/vvImageReader.txx index 4bf6616..a9f17ab 100644 --- a/common/vvImageReader.txx +++ b/common/vvImageReader.txx @@ -200,10 +200,10 @@ void vvImageReader::UpdateWithDimAndInputPixelType() } } - if (VImageDimension == 4) +/* if (VImageDimension == 4) mType == VECTORPIXELIMAGEWITHTIME; else - mType == VECTORPIXELIMAGE; + mType == VECTORPIXELIMAGE;*/ try { mImage = vvImageFromITK(output, mType == VECTORPIXELIMAGEWITHTIME); diff --git a/vv/vvToolCropImage.cxx b/vv/vvToolCropImage.cxx index 736a7d6..0fb3e54 100644 --- a/vv/vvToolCropImage.cxx +++ b/vv/vvToolCropImage.cxx @@ -215,7 +215,7 @@ void vvToolCropImage::InputIsSelected(vvSlicerManager * slicer) } // Set initial sliders values - int w_ext[6], imsize[3]; + int w_ext[6], imsize[4]; mCurrentSlicerManager->GetSlicer(0)->GetRegisterExtent(w_ext); for(int dim=0; dimGetDimension() && dim<3; ++dim){ imsize[dim] = w_ext[2*dim+1] - w_ext[2*dim] +1; diff --git a/vv/vvToolRigidReg.cxx b/vv/vvToolRigidReg.cxx index e50ab7f..5a11c7f 100644 --- a/vv/vvToolRigidReg.cxx +++ b/vv/vvToolRigidReg.cxx @@ -413,7 +413,7 @@ void vvToolRigidReg::SetTransform(vtkMatrix4x4 *matrix) double rad = (checkBoxDegrees->checkState()==Qt::Checked)?180./itk::Math::pi:1.; double angleDiff = euler->GetParameters()[i]-rotSBs[i]->value()/rad+2*itk::Math::pi; angleDiff = angleDiff - 2*itk::Math::pi*itk::Math::Round(angleDiff/(2*itk::Math::pi)); - if(abs(angleDiff)>1.e-4) { + if(std::abs(angleDiff)>1.e-4) { rotSBs[i]->blockSignals(true); rotSBs[i]->setValue( euler->GetParameters()[i]*rad ); rotSBs[i]->blockSignals(false); -- 2.47.1