From: Simon Rit <simon.rit@creatis.insa-lyon.fr>
Date: Thu, 6 Jun 2013 16:12:08 +0000 (+0200)
Subject: Merge branch 'master' of git.creatis.insa-lyon.fr:clitk
X-Git-Tag: v1.4.0~218
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=226d4c1d1400f7b5f95e6ec9766ed148e1683ecf;hp=2f90c84deb4bc7a9ef28b123accd478b6ea20d52;p=clitk.git

Merge branch 'master' of git.creatis.insa-lyon.fr:clitk
---

diff --git a/tools/clitkImageStatistics.ggo b/tools/clitkImageStatistics.ggo
index d2e55f3..bc7998b 100644
--- a/tools/clitkImageStatistics.ggo
+++ b/tools/clitkImageStatistics.ggo
@@ -7,7 +7,7 @@ purpose "Compute statistics on an image, or on part of an image specified by a m
 option "config"	  	-	"Config file"			  string  	no
 option "verbose"   	v   	"Verbose"			  flag		off
 
-option "input"		i	"Input image filename"		  string  	yes multiple
+option "input"		i	"Input image filename"		  string  	no multiple
 option "channel"    c "Image channel to be used in statistics (-1 to process all channels)"  int no default="-1"
 option "mask"		m	"Mask image filename (uchar)"		  string  	no
 option "label"		l	"Label(s) in the mask image to consider"	int  	no 	multiple 	default="1"
diff --git a/tools/clitkImageStatisticsGenericFilter.h b/tools/clitkImageStatisticsGenericFilter.h
index 00cfff8..8544d59 100644
--- a/tools/clitkImageStatisticsGenericFilter.h
+++ b/tools/clitkImageStatisticsGenericFilter.h
@@ -61,7 +61,15 @@ namespace clitk
     {
       m_ArgsInfo=a;
       m_Verbose=m_ArgsInfo.verbose_flag;
-      m_InputFileName=m_ArgsInfo.input_arg[0];
+
+      if(m_ArgsInfo.input_given)
+        m_InputFileName=m_ArgsInfo.input_arg[0];
+      else if(m_ArgsInfo.inputs_num>0)
+        m_InputFileName=m_ArgsInfo.inputs[0];
+      else {
+        std::cerr << "You must give an input file name" << std::endl;
+        exit(1);
+      }
     }
     
     
diff --git a/tools/clitkSplitImageGenericFilter.cxx b/tools/clitkSplitImageGenericFilter.cxx
index 55bf7a8..71d93c5 100644
--- a/tools/clitkSplitImageGenericFilter.cxx
+++ b/tools/clitkSplitImageGenericFilter.cxx
@@ -83,6 +83,7 @@ clitk::SplitImageGenericFilter::PngConversion<ImageType>::Do(double window,
   typename CastFilterType::Pointer cast = CastFilterType::New();
   cast->SetWindowLevel(window, level);
   cast->SetInput(input);
+  cast->Update();
   return cast->GetOutput();
 }
 //--------------------------------------------------------------------