]> Creatis software - clitk.git/commitdiff
Allowed arithmetic operations between 2 inputs even if they don't have the same spacing.
authorSimon Rit <simon.rit@creatis.insa-lyon.fr>
Mon, 27 Jun 2011 08:01:30 +0000 (10:01 +0200)
committerSimon Rit <simon.rit@creatis.insa-lyon.fr>
Mon, 27 Jun 2011 08:01:30 +0000 (10:01 +0200)
tools/clitkImageArithmGenericFilter.txx

index 38f7c505ba3cd3cf3bad54011e1269794c86cc08..24ebbbdac8d2d472ec6ddca3eebbdcfdd5f33f6f 100644 (file)
@@ -128,9 +128,12 @@ void ImageArithmGenericFilter<args_info_type>::UpdateWithInputImageType()
       // Set input image iterator
       it2 = IteratorType(input2, input2->GetLargestPossibleRegion());
       // Check dimension
-      if (!clitk::HaveSameSizeAndSpacing<ImageType, ImageType>(input1, input2)) {
-          std::cerr << "* ERROR * the images (input and input2) must have the same size & spacing";
-          return;
+      if (!clitk::HaveSameSize<ImageType, ImageType>(input1, input2)) {
+        itkExceptionMacro(<< "The images (input and input2) must have the same size");
+      }
+      if(!clitk::HaveSameSpacing<ImageType, ImageType>(input1, input2)) {
+        itkWarningMacro(<< "The images (input and input2) do not have the same spacing. "
+                        << "Using first input's information.");
       }
   }