- correct crop 2D bug

[clitk.git] / common / clitkListOfPair.cxx

diff --git a/common/clitkListOfPair.cxx b/common/clitkListOfPair.cxx
index 09cc04b81e1492d2aa7f2533f56f0c935cb59eb1..defbe60101c4d80dbedef4eb5d4cacb41b2f96ac 100644 (file)
--- a/common/clitkListOfPair.cxx
+++ b/common/clitkListOfPair.cxx
@@ -1,22 +1,22 @@
-/*------------------------------------------------------------------------=
-                                                                                
-  Program:   clitk
-  Language:  C++
-                                                                                
-  Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
-  l'Image). All rights reserved. See Doc/License.txt or
-  http://www.creatis.insa-lyon.fr/Public/Gdcm/License.html for details.
-                                                                                
-     This software is distributed WITHOUT ANY WARRANTY; without even
-     the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-     PURPOSE.  See the above copyright notices for more information.
-                                                                             
-------------------------------------------------------------------------=*/
+/*=========================================================================
+  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 CLITKLISTOFPAIR_CXX
 #define CLITKLISTOFPAIR_CXX
-
 /**
    ------------------------------------------------=
    * @file   clitkListOfPair.cxx
@@ -32,13 +32,13 @@
 
 //--------------------------------------------------------------------
 double clitk::convertValue(double v, 
-                                       const std::multimap<double, double> & conversionTable, 
-                                       bool linear) {
-  std::map<double, double>::const_iterator i;
+                           const std::multimap<double, double> & conversionTable, 
+                           bool linear) {
+  std::multimap<double, double>::const_iterator i;
   i = conversionTable.lower_bound(v);  
   if (i == conversionTable.end()) {
-       std::cerr << "The value " << v << " is out of the table" << std::endl;
-       exit(0);
+    std::cerr << "The value " << v << " is out of the table" << std::endl;
+    exit(0);
   }
   
   double v2 = i->first;
@@ -49,12 +49,12 @@ double clitk::convertValue(double v,
 
   // interpol
   if (!linear) {
-       if ((v-v1) > (v2-v)) return p2;
-       else return p1;
+    if ((v-v1) > (v2-v)) return p2;
+    else return p1;
   }
   else {
-       double w = (v-v1)/(v2-v1);
-       return p1*(1.0-w)+w*p2;
+    double w = (v-v1)/(v2-v1);
+    return p1*(1.0-w)+w*p2;
   }
 }
 //--------------------------------------------------------------------