X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=tools%2FclitkCropImageGenericFilter.cxx;h=4f3bb231762ca6c6fe19fdc528a90a8c15b5456d;hb=5578995d9a82792833333eeb3dd5c8ecac967293;hp=c3343f6d3913b073a5bdec7070676e75366cf8ed;hpb=54b1d547551dcaeba536ce59104db998e9c40719;p=clitk.git

diff --git a/tools/clitkCropImageGenericFilter.cxx b/tools/clitkCropImageGenericFilter.cxx
index c3343f6..4f3bb23 100644
--- a/tools/clitkCropImageGenericFilter.cxx
+++ b/tools/clitkCropImageGenericFilter.cxx
@@ -69,7 +69,7 @@ typename clitk::CropImageGenericFilter::AutoCrop<ImageType>::ImagePointer
 clitk::CropImageGenericFilter::AutoCrop<ImageType>::Do(args_info_type &, ImagePointer, PixelDimType<Dim> *)
 {
   clitkExceptionMacro("Autocrop is not implemented for vector fields");
-  return NULL;
+  return ITK_NULLPTR;
 }
 //--------------------------------------------------------------------
 
@@ -106,6 +106,8 @@ void clitk::CropImageGenericFilter::UpdateWithInputImageType()
   // Check options
   if (mArgsInfo.BG_given && mArgsInfo.like_given)
     clitkExceptionMacro("Do not use --BG and --like at the same time");
+  if (mArgsInfo.updateOrigin_flag && !mArgsInfo.like_given)
+    clitkExceptionMacro("Use --updateOrigin with --like");
 
   // Prepare output
   typename ImageType::Pointer output;
@@ -182,7 +184,7 @@ void clitk::CropImageGenericFilter::UpdateWithInputImageType()
   typename ImageType::IndexType index = region.GetIndex();
   typename ImageType::PointType origin = output->GetOrigin();
   typename ImageType::SpacingType spacing = output->GetSpacing();
-  if (!mArgsInfo.BG_given) {
+  if (!mArgsInfo.BG_given && (!mArgsInfo.like_given || mArgsInfo.updateOrigin_flag)) {
     if (mArgsInfo.verbose_flag) std::cout << "origin before crop " << origin << std::endl;
     input->TransformIndexToPhysicalPoint(index,origin);
     if (mArgsInfo.verbose_flag) std::cout << "origin after crop " << origin << std::endl;