X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=tools%2FclitkVFResampleGenericFilter.cxx;h=d287fec36e0b4047b64c7c5490b59536afcdb810;hb=543b72e23ad001ac2a7743b9beacf48e2d0054ac;hp=6bbcff55a70da893d35bebd54b0f69e5f57b4bc1;hpb=65aef3ac46440b21894dd0b360acaaabb906bea8;p=clitk.git diff --git a/tools/clitkVFResampleGenericFilter.cxx b/tools/clitkVFResampleGenericFilter.cxx old mode 100755 new mode 100644 index 6bbcff5..d287fec --- a/tools/clitkVFResampleGenericFilter.cxx +++ b/tools/clitkVFResampleGenericFilter.cxx @@ -3,7 +3,7 @@ Authors belong to: - University of LYON http://www.universite-lyon.fr/ - - Léon Bérard cancer center http://oncora1.lyon.fnclcc.fr + - Léon Bérard cancer center http://www.centreleonberard.fr - CREATIS CNRS laboratory http://www.creatis.insa-lyon.fr This software is distributed WITHOUT ANY WARRANTY; without even @@ -14,7 +14,7 @@ - BSD See included LICENSE.txt file - CeCILL-B http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html -======================================================================-====*/ +===========================================================================**/ #ifndef CLITKVFRESAMPLEGENERICFILTER_CXX #define CLITKVFRESAMPLEGENERICFILTER_CXX @@ -41,7 +41,7 @@ void clitk::VFResampleGenericFilter::InitializeImageType() { //typedef itk::Vector v3f; //ADD_IMAGE_TYPE(Dim, v3f); - ADD_VEC_IMAGE_TYPE(Dim, Dim, float) + ADD_DEFAULT_VEC_IMAGE_TYPES } //-------------------------------------------------------------------- @@ -92,17 +92,17 @@ clitk::VFResampleGenericFilter::ComputeImage(typename ImageType::Pointer inputIm static unsigned int dim = ImageType::ImageDimension; if (mOutputSize.size() != dim) { std::cerr << "Please set size with " << dim << " dimensions." << std::endl; - return NULL; + return ITK_NULLPTR; } if (mOutputSpacing.size() != dim) { std::cerr << "Please set spacing with " << dim << " dimensions." << std::endl; - return NULL; + return ITK_NULLPTR; } mOutputOrigin.resize(dim); if (mApplyGaussianFilterBefore && mSigma.size() != dim) { std::cerr << "Please set sigma with " << dim << " dimensions." << std::endl; - return NULL; + return ITK_NULLPTR; } // Some typedefs