Allow no -i in clitkImageStatistics

diff --git a/tools/clitkImageStatistics.ggo b/tools/clitkImageStatistics.ggo
index d2e55f36572162d451c80567924c92ba610eb68e..bc7998bf2be05d2ce65a84d23444f4e9c65e4327 100644 (file)
--- 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 00cfff8e9fad3908a391936199ab219ca909247e..8544d59b6a4027e2bea3fd89f0f621dcc9b17715 100644 (file)
--- 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);
+      }
     }