X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=common%2FclitkCommon.h;h=4087259d07feb1c70aff82e97557398995890785;hb=6149d78df3e94ca789aaba50133d5277afe6ab5e;hp=2d26e8a786d8045934a1af1b67ae4763326fc850;hpb=0b7c9b1e1215634b02cbd38d4e4ba101d6111ba8;p=clitk.git diff --git a/common/clitkCommon.h b/common/clitkCommon.h index 2d26e8a..4087259 100644 --- a/common/clitkCommon.h +++ b/common/clitkCommon.h @@ -15,20 +15,11 @@ - BSD See included LICENSE.txt file - CeCILL-B http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html ======================================================================-====*/ + #ifndef CLITKCOMMON_H #define CLITKCOMMON_H -/** - ------------------------------------------------------------------- - * @file clitkCommon.h - * @author David Sarrut - * @date 17 May 2006 07:57:56 - - * @brief - - -------------------------------------------------------------------*/ // clitk include - #include "clitkConfiguration.h" #include "clitkPortability.h" @@ -59,10 +50,10 @@ namespace clitk { // GGO with modified struct name #define GGO(ggo_filename, args_info) \ args_info_##ggo_filename args_info; \ - cmdline_parser2(argc, argv, &args_info, 1, 1, 0); \ + cmdline_parser_##ggo_filename##2(argc, argv, &args_info, 1, 1, 0); \ if (args_info.config_given) \ - cmdline_parser_configfile (args_info.config_arg, &args_info, 0, 0, 1); \ - else cmdline_parser(argc, argv, &args_info); + cmdline_parser_##ggo_filename##_configfile (args_info.config_arg, &args_info, 0, 0, 1); \ + else cmdline_parser_##ggo_filename(argc, argv, &args_info); //-------------------------------------------------------------------- // skip line with # @@ -189,6 +180,9 @@ namespace clitk { void openFileForReading(std::ifstream & is, const std::string & filename); void openFileForWriting(std::ofstream & os, const std::string & filename); + //-------------------------------------------------------------------- + void readDoubleFromFile(const std::string & filename, std::vector & list); + //-------------------------------------------------------------------- double cotan(double i); double invcotan(double i);