Merge branch 'master' of git.creatis.insa-lyon.fr:clitk

[clitk.git] / common / clitkListOfPair.cxx

diff --git a/common/clitkListOfPair.cxx b/common/clitkListOfPair.cxx
index defbe60101c4d80dbedef4eb5d4cacb41b2f96ac..337f5368c865d98848f67b397eb5b5dc9065b11b 100644 (file)
--- a/common/clitkListOfPair.cxx
+++ b/common/clitkListOfPair.cxx
@@ -1,9 +1,9 @@
 /*=========================================================================
   Program:   vv                     http://www.creatis.insa-lyon.fr/rio/vv
 
-  Authors belong to: 
+  Authors belong to:
   - University of LYON              http://www.universite-lyon.fr/
-  - Léon Bérard cancer center       http://oncora1.lyon.fnclcc.fr
+  - Léon Bérard cancer center       http://www.centreleonberard.fr
   - CREATIS CNRS laboratory         http://www.creatis.insa-lyon.fr
 
   This software is distributed WITHOUT ANY WARRANTY; without even
@@ -14,7 +14,7 @@
 
   - BSD        See included LICENSE.txt file
   - CeCILL-B   http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html
-======================================================================-====*/
+===========================================================================**/
 #ifndef CLITKLISTOFPAIR_CXX
 #define CLITKLISTOFPAIR_CXX
 /**
@@ -22,25 +22,26 @@
    * @file   clitkListOfPair.cxx
    * @author David Sarrut <david.sarrut@creatis.insa-lyon.fr>
    * @date   27 Feb 2007 09:55:56
-   * 
-   * @brief  
-   * 
-   * 
+   *
+   * @brief
+   *
+   *
    ------------------------------------------------=*/
 
 #include "clitkListOfPair.h"
 
 //--------------------------------------------------------------------
-double clitk::convertValue(double v, 
-                           const std::multimap<double, double> & conversionTable, 
-                           bool linear) {
+double clitk::convertValue(double v,
+                           const std::multimap<double, double> & conversionTable,
+                           bool linear)
+{
   std::multimap<double, double>::const_iterator i;
-  i = conversionTable.lower_bound(v);  
+  i = conversionTable.lower_bound(v);
   if (i == conversionTable.end()) {
     std::cerr << "The value " << v << " is out of the table" << std::endl;
     exit(0);
   }
-  
+
   double v2 = i->first;
   double p2 = i->second;
   if (i != conversionTable.begin()) i--;
@@ -51,8 +52,7 @@ double clitk::convertValue(double v,
   if (!linear) {
     if ((v-v1) > (v2-v)) return p2;
     else return p1;
-  }
-  else {
+  } else {
     double w = (v-v1)/(v2-v1);
     return p1*(1.0-w)+w*p2;
   }