X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=tools%2FclitkImageArithmGenericFilter.txx;h=1afb77f55c1ae0fb970e4a9331a0e15ba9eb436e;hb=f8d48c8481db84a9f2a9c140bf19c0c987d1bd59;hp=38f7c505ba3cd3cf3bad54011e1269794c86cc08;hpb=615a1af31ba4649c58c684b006b696536e7d8ef5;p=clitk.git diff --git a/tools/clitkImageArithmGenericFilter.txx b/tools/clitkImageArithmGenericFilter.txx index 38f7c50..1afb77f 100644 --- a/tools/clitkImageArithmGenericFilter.txx +++ b/tools/clitkImageArithmGenericFilter.txx @@ -45,6 +45,8 @@ template void ImageArithmGenericFilter::InitializeImageType() { ADD_DEFAULT_IMAGE_TYPES(Dim); + ADD_VEC_IMAGE_TYPE(3u,3u,float); + ADD_VEC_IMAGE_TYPE(3u,3u,double); } //-------------------------------------------------------------------- @@ -128,9 +130,12 @@ void ImageArithmGenericFilter::UpdateWithInputImageType() // Set input image iterator it2 = IteratorType(input2, input2->GetLargestPossibleRegion()); // Check dimension - if (!clitk::HaveSameSizeAndSpacing(input1, input2)) { - std::cerr << "* ERROR * the images (input and input2) must have the same size & spacing"; - return; + if (!clitk::HaveSameSize(input1, input2)) { + itkExceptionMacro(<< "The images (input and input2) must have the same size"); + } + if(!clitk::HaveSameSpacing(input1, input2)) { + itkWarningMacro(<< "The images (input and input2) do not have the same spacing. " + << "Using first input's information."); } } @@ -395,6 +400,8 @@ void clitk::ImageArithmGenericFilter::ComputeImage(Iter1 it, Ite } //-------------------------------------------------------------------- + + } // end namespace #endif //#define CLITKIMAGEARITHMGENERICFILTER_TXX