From: jean-pierre roux Date: Fri, 12 Feb 2010 12:26:28 +0000 (+0000) Subject: Fix some warnings X-Git-Tag: CREATOOLS.2-0-3~6 X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=1b82b60c6337722f1a97bc8f7d6eadcc90352017;p=creaRigidRegistration.git Fix some warnings --- diff --git a/PackRecalage/src/bbPackRecalageCalculateVectorBox.cxx b/PackRecalage/src/bbPackRecalageCalculateVectorBox.cxx index acc9925..0891bde 100644 --- a/PackRecalage/src/bbPackRecalageCalculateVectorBox.cxx +++ b/PackRecalage/src/bbPackRecalageCalculateVectorBox.cxx @@ -13,7 +13,7 @@ void CalculateVectorBox::Process() if(!bbGetInputPointsX1().empty() && !bbGetInputPointsX2().empty()) { //Checks that all the vector points are defined - if(bbGetInputPointsX1()[1] != NULL && bbGetInputPointsX2()[1] != NULL) + if(bbGetInputPointsX1()[1] != 0 && bbGetInputPointsX2()[1] != 0) { //_vector->SetData(bbGetInputPointsX1(), bbGetInputPointsX2(), bbGetInputPointsY1(), bbGetInputPointsY2(), bbGetInputPointsZ1(), bbGetInputPointsZ2()); //_vector->Run(); diff --git a/PackRecalage/src/bbPackRecalageTransform3D3PointsBox.cxx b/PackRecalage/src/bbPackRecalageTransform3D3PointsBox.cxx index 9156f13..009c16a 100644 --- a/PackRecalage/src/bbPackRecalageTransform3D3PointsBox.cxx +++ b/PackRecalage/src/bbPackRecalageTransform3D3PointsBox.cxx @@ -92,7 +92,7 @@ void Transform3D3PointsBox::Process() } //Create the new center point - double * centerPoint; + double centerPoint[3]; centerPoint[0] = O2[0]; centerPoint[1] = O2[1]; centerPoint[2] = O2[2]; @@ -251,4 +251,4 @@ void Transform3D3PointsBox::bbUserFinalizeProcessing() delete planes; } } -// EO namespace bbPackRecalage \ No newline at end of file +// EO namespace bbPackRecalage diff --git a/lib/Substraction.cxx b/lib/Substraction.cxx index c0be6d8..853e5de 100644 --- a/lib/Substraction.cxx +++ b/lib/Substraction.cxx @@ -6,7 +6,7 @@ Substraction::Substraction(vtkImageData* imageData1,vtkImageData* imageData2, in sizeImage=0; uZeroLevel=uZLevel; lZeroLevel=lZLevel; - if(uColor.size() != NULL) + if(uColor.size() != 0) { upperColor[0] = uColor[0]; upperColor[1] = uColor[1]; @@ -18,7 +18,7 @@ Substraction::Substraction(vtkImageData* imageData1,vtkImageData* imageData2, in upperColor[1] = 255; upperColor[2] = 255; } - if(mColor.size() != NULL) + if(mColor.size() != 0) { mediumColor[0] = mColor[0]; mediumColor[1] = mColor[1]; @@ -30,7 +30,7 @@ Substraction::Substraction(vtkImageData* imageData1,vtkImageData* imageData2, in mediumColor[1] = 125; mediumColor[2] = 125; } - if(lColor.size() != NULL) + if(lColor.size() != 0) { lowerColor[0] = lColor[0]; lowerColor[1] = lColor[1]; @@ -327,4 +327,4 @@ vtkImageData* Substraction::getSubstractedImage() int Substraction::getImageSize() { return sizeImage; -} \ No newline at end of file +}