From: Pierre Gueth Date: Thu, 7 Feb 2013 14:35:00 +0000 (+0100) Subject: merger works when files are ordered X-Git-Tag: v1.4.0~164^2~26 X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=be3f251813a0915c4290d08ed9fd7d892091346b;p=clitk.git merger works when files are ordered --- diff --git a/tests_dav/clitkMergeRootFiles.cxx b/tests_dav/clitkMergeRootFiles.cxx index ac11580..b3aa4c6 100644 --- a/tests_dav/clitkMergeRootFiles.cxx +++ b/tests_dav/clitkMergeRootFiles.cxx @@ -26,9 +26,6 @@ using std::endl; using std::cout; -typedef std::list Strings; - - //----------------------------------------------------------------------------- int main(int argc, char * argv[]) { @@ -64,8 +61,8 @@ int main(int argc, char * argv[]) { if (all_pet_output) { - GateMergeManager* manager = new GateMergeManager(args_info.fastmerge_given,args_info.verbose_arg,true,0,"."); - delete manager; + GateMergeManager manager(args_info.fastmerge_given,args_info.verbose_arg,true,0,""); + manager.StartMergingFromFilenames(input_filenames,args_info.output_arg); return 0; } }