]> Creatis software - clitk.git/commitdiff
Remove warnings with travis compilators
authortbaudier <thomas.baudier@creatis.insa-lyon.fr>
Mon, 24 Apr 2017 15:13:54 +0000 (17:13 +0200)
committertbaudier <thomas.baudier@creatis.insa-lyon.fr>
Mon, 24 Apr 2017 15:13:54 +0000 (17:13 +0200)
gcc & clang

common/vvImageReader.txx
vv/vvToolCropImage.cxx
vv/vvToolRigidReg.cxx

index 4bf6616f5f8d7d29cd570ccfb66a3e7b7ff01f41..a9f17ab6afe7c8d08aec0ffa2ba2613885304983 100644 (file)
@@ -200,10 +200,10 @@ void vvImageReader::UpdateWithDimAndInputPixelType()
       }
     }
 
-    if (VImageDimension == 4)
+/*    if (VImageDimension == 4)
       mType == VECTORPIXELIMAGEWITHTIME;
     else
-      mType == VECTORPIXELIMAGE;
+      mType == VECTORPIXELIMAGE;*/
 
     try {
       mImage = vvImageFromITK<VImageDimension,InputPixelType>(output, mType == VECTORPIXELIMAGEWITHTIME);
index 736a7d696fc04549e4b24d0b0f988a457620cbbb..0fb3e5483287485931862aefe3c188db5179f28d 100644 (file)
@@ -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; dim<slicer->GetDimension() && dim<3; ++dim){
     imsize[dim] = w_ext[2*dim+1] - w_ext[2*dim] +1;
index e50ab7fda50ec3a927afc399a5796d98d038f550..5a11c7f8e367dad022cf08bc8b54cf06a92e92ed 100644 (file)
@@ -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<double,double>(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);