- correct crop 2D bug

[clitk.git] / common / clitkCommon.h

diff --git a/common/clitkCommon.h b/common/clitkCommon.h
index 00a32cfea64f4d76bcd3938c4f1fedcd4360edf1..f36894652b45a002d61103b677c72cd4e69b613a 100644 (file)
--- a/common/clitkCommon.h
+++ b/common/clitkCommon.h
@@ -1,29 +1,27 @@
+/*=========================================================================
+  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.
+
+  It is distributed under dual licence
+
+  - 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 <David.Sarrut@creatis.insa-lyon.fr>
-   * @date   17 May 2006 07:57:56
-
-   * @brief  
-
-   -------------------------------------------------------------------*/
-
-// std include
-//#include <config.h>
-//#include <cstdlib>
-//#include <algorithm>
-//#include <iostream>
-//#include <string>
-//#include <fstream>
-//#include <sstream>
-//#include <vector>
-//#include <math.h>
-//#include <typeinfo>
-//#include <utility>
-//#include <algorithm>
+// clitk include
+#include "clitkConfiguration.h"
+#include "clitkPortability.h"
 
 // itk include (include std)
 #include <itkContinuousIndex.h>
@@ -33,11 +31,7 @@
 
 //--------------------------------------------------------------------
 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;
@@ -186,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);