X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=common%2FclitkCommon.h;h=f36894652b45a002d61103b677c72cd4e69b613a;hb=2dad4a649b5e61f450b47047f379fcc351b50215;hp=5831d7b8ec08b514dd59e5ae2a8e8e09b3afa294;hpb=809657ecae82ca179751ae360d7aeb5676202cdc;p=clitk.git

diff --git a/common/clitkCommon.h b/common/clitkCommon.h
index 5831d7b..f368946 100644
--- a/common/clitkCommon.h
+++ b/common/clitkCommon.h
@@ -1,39 +1,37 @@
-#ifndef CLITKCOMMON_H
-#define CLITKCOMMON_H
+/*=========================================================================
+  Program:   vv                     http://www.creatis.insa-lyon.fr/rio/vv
+
+  Authors belong to: 
+  - University of LYON              http://www.universite-lyon.fr/
+  - Léon Bérard cancer center       http://oncora1.lyon.fnclcc.fr
+  - CREATIS CNRS laboratory         http://www.creatis.insa-lyon.fr
+
+  This software is distributed WITHOUT ANY WARRANTY; without even
+  the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+  PURPOSE.  See the copyright notices for more information.
 
-/**
-   -------------------------------------------------------------------
-   * @file   clitkCommon.h
-   * @author David Sarrut <David.Sarrut@creatis.insa-lyon.fr>
-   * @date   17 May 2006 07:57:56
+  It is distributed under dual licence
 
-   * @brief  
+  - 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
 
-// std include
-#include <config.h>
-#include <cstdlib>
-#include <algorithm>
-#include <iostream>
-#include <fstream>
-#include <sstream>
-#include <vector>
-#include <math.h>
-#include <typeinfo>
+// clitk include
+#include "clitkConfiguration.h"
+#include "clitkPortability.h"
 
-#include "itkMacro.h"
+// itk include (include std)
 #include <itkContinuousIndex.h>
+#include <itkMacro.h>
 #include <itkImageRegionConstIterator.h>
 #include <itkImageRegionIterator.h>
 
 //--------------------------------------------------------------------
 namespace clitk {
-  
-#if defined(WIN32)
-#define lrint(x) (floor(x+(x>0) ? 0.5 : -0.5))
-#endif
-  
+
   typedef unsigned char uchar;
   typedef unsigned short ushort;
   typedef unsigned int uint;
@@ -50,25 +48,13 @@ namespace clitk {
   
   //--------------------------------------------------------------------
   // GGO with modified struct name
-#define GGO(ggo_filename, args_info)                                             \
-  gengetopt_args_info_##ggo_filename args_info;					\
-    cmdline_parser2(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);
-  
-
-  /*   //--------------------------------------------------------------------
-  // GGO default
 #define GGO(ggo_filename, args_info)                                    \
-  gengetopt_args_info_##ggo_filename args_info;                         \
+  args_info_##ggo_filename args_info;					\
   cmdline_parser2(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);
-  
- //--------------------------------------------------------------------
- */
+  else cmdline_parser(argc, argv, &args_info);  
+
   //--------------------------------------------------------------------
   // skip line with #
   void skipComment(std::istream & is);
@@ -194,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<double> & list);
+
   //--------------------------------------------------------------------
   double cotan(double i);
   double invcotan(double i);