X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=tools%2FclitkImageConvert.cxx;h=e54c736d99ae1d9e433204931ebb0c4f7533c9d3;hb=543b72e23ad001ac2a7743b9beacf48e2d0054ac;hp=297b63711f6c107f389ea487b9049221582a4b44;hpb=eddba34cfd972c817bdfba337a9c866b3ae5c410;p=clitk.git

diff --git a/tools/clitkImageConvert.cxx b/tools/clitkImageConvert.cxx
index 297b637..e54c736 100644
--- a/tools/clitkImageConvert.cxx
+++ b/tools/clitkImageConvert.cxx
@@ -40,14 +40,25 @@ int main(int argc, char * argv[])
 
   // Get list of filenames
   std::vector<std::string> l;
-  for(unsigned int i=0; i<args_info.input_given; i++) {
-    l.push_back(args_info.input_arg[i]);
+  unsigned int nCmdLineInputs = args_info.inputs_num;
+  std::string output;
+  if(args_info.output_given)
+    output = args_info.output_arg;
+  else if(nCmdLineInputs--)
+    output = args_info.inputs[nCmdLineInputs];
+  else {
+    std::cerr << "Error, you should give the --output option or one image filename on the commande line." << std::endl;
+    exit(0);
+  }
+
+  if(args_info.input_given) {
+    l.push_back(args_info.input_arg);
   }
-  for(unsigned int i=0; i<args_info.inputs_num; i++) {
-    l.push_back(args_info.inputs[i]);
+  if(nCmdLineInputs==1) {
+    l.push_back(args_info.inputs[0]);
   }
   if (l.size() < 1) {
-    std::cerr << "Error, you should give at least one --input option or one image filename on the commande line." << std::endl;
+    std::cerr << "Error, you should give the --input option or one image filename on the commande line." << std::endl;
     exit(0);
   }
 
@@ -55,12 +66,15 @@ int main(int argc, char * argv[])
   clitk::ImageConvertGenericFilter::Pointer filter = clitk::ImageConvertGenericFilter::New();
   filter->SetInputFilenames(l);
   filter->SetIOVerbose(args_info.verbose_flag);
-  filter->SetOutputFilename(args_info.output_arg);
+  filter->SetOutputFilename(output);
+  filter->SetVV(args_info.vv_flag);
+  filter->SetNoNiiMeta(args_info.noniimeta_flag);
+  filter->SetCorrectNegativeSpacingFlag(args_info.correct_flag);
   filter->EnableWriteCompression(args_info.compression_flag);
   if (args_info.type_given) filter->SetOutputPixelType(args_info.type_arg);
 
   // Go !
-  filter->Update();
+  CLITK_TRY_CATCH_EXIT(filter->Update());
 
   // this is the end my friend
   return 0;
@@ -68,4 +82,3 @@ int main(int argc, char * argv[])
 //-------------------------------------------------------------------=
 
 #endif /* end #define CLITKIMAGECONVERT_CXX */
-