diff --git a/Code/ChangeDetection/otbBinaryFunctorNeighborhoodImageFilter.h b/Code/ChangeDetection/otbBinaryFunctorNeighborhoodImageFilter.h
index bb3ee9b7502e1a75fd8ea990a6b6e6fd0a5a38dd..42de947450f9f72fe93020c4b1b1356eb2f4b0bf 100755
--- a/Code/ChangeDetection/otbBinaryFunctorNeighborhoodImageFilter.h
+++ b/Code/ChangeDetection/otbBinaryFunctorNeighborhoodImageFilter.h
@@ -1,13 +1,18 @@
 /*=========================================================================
 
-  Programme :   OTB (ORFEO ToolBox)
-  Auteurs   :   CNES - J.Inglada Rodriguez
-  Language  :   C++
-  Date      :   07 mars 2006
-  Version   :   
-  Role      :   Classe qui met en application l'opération générique 
-  		voisinage-sage de deux images 
-  $Id: $
+  Program:   ORFEO Toolbox
+  Language:  C++
+  Date:      $Date$
+  Version:   $Revision$
+
+
+  Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
+  See OTBCopyright.txt 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.
 
 =========================================================================*/
 #ifndef __otbBinaryFunctorNeighborhoodImageFilter_h
diff --git a/Code/ChangeDetection/otbBinaryFunctorNeighborhoodImageFilter.txx b/Code/ChangeDetection/otbBinaryFunctorNeighborhoodImageFilter.txx
index 743a9f46d079910114e104d2cfae5d9cdcd3ef6b..3776864e49323e9aa09845969902fd4674e95d80 100755
--- a/Code/ChangeDetection/otbBinaryFunctorNeighborhoodImageFilter.txx
+++ b/Code/ChangeDetection/otbBinaryFunctorNeighborhoodImageFilter.txx
@@ -1,13 +1,18 @@
 /*=========================================================================
 
-  Programme :   OTB (ORFEO ToolBox)
-  Auteurs   :   CNES - J.Inglada Rodriguez
-  Language  :   C++
-  Date      :   07 mars 2006
-  Version   :   
-  Role      :   Classe qui met en application l'opération générique 
-  		voisinage-sage de deux images 
-  $Id: $
+  Program:   ORFEO Toolbox
+  Language:  C++
+  Date:      $Date$
+  Version:   $Revision$
+
+
+  Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
+  See OTBCopyright.txt 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.
 
 =========================================================================*/
 #ifndef _otbBinaryFunctorNeighborhoodImageFilter_txx
diff --git a/Code/ChangeDetection/otbBinaryFunctorNeighborhoodJoinHistogramImageFilter.h b/Code/ChangeDetection/otbBinaryFunctorNeighborhoodJoinHistogramImageFilter.h
index b8b315c0b4fe8e3c764ddeb7fddd2e6d482524e7..1c76ddccbe31a65c33fbab30f87781527275a84f 100755
--- a/Code/ChangeDetection/otbBinaryFunctorNeighborhoodJoinHistogramImageFilter.h
+++ b/Code/ChangeDetection/otbBinaryFunctorNeighborhoodJoinHistogramImageFilter.h
@@ -1,13 +1,18 @@
 /*=========================================================================
 
-  Programme :   OTB (ORFEO ToolBox)
-  Auteurs   :   CNES - J.Inglada Rodriguez
-  Language  :   C++
-  Date      :   07 mars 2006
-  Version   :   
-  Role      :   Classe qui met en application l'opération générique 
-  		voisinage-sage de deux images (Join Histogram)
-  $Id: $
+  Program:   ORFEO Toolbox
+  Language:  C++
+  Date:      $Date$
+  Version:   $Revision$
+
+
+  Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
+  See OTBCopyright.txt 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.
 
 =========================================================================*/
 #ifndef __otbBinaryFunctorNeighborhoodJoinHistogramImageFilter_h
diff --git a/Code/ChangeDetection/otbBinaryFunctorNeighborhoodJoinHistogramImageFilter.txx b/Code/ChangeDetection/otbBinaryFunctorNeighborhoodJoinHistogramImageFilter.txx
index 5294fbc4b4365507dc6bd5ee871e60fbe036fcbc..3c68aa4e3b4f7552abeb4487e05a2a4a544665c4 100755
--- a/Code/ChangeDetection/otbBinaryFunctorNeighborhoodJoinHistogramImageFilter.txx
+++ b/Code/ChangeDetection/otbBinaryFunctorNeighborhoodJoinHistogramImageFilter.txx
@@ -1,13 +1,18 @@
 /*=========================================================================
 
-  Programme :   OTB (ORFEO ToolBox)
-  Auteurs   :   CNES - J.Inglada Rodriguez
-  Language  :   C++
-  Date      :   07 mars 2006
-  Version   :   
-  Role      :   Classe qui met en application l'opération générique 
-  		voisinage-sage de deux images (Join Histogram)
-  $Id: $
+  Program:   ORFEO Toolbox
+  Language:  C++
+  Date:      $Date$
+  Version:   $Revision$
+
+
+  Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
+  See OTBCopyright.txt 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.
 
 =========================================================================*/
 #ifndef _otbBinaryFunctorNeighborhoodJoinHistogramImageFilter_txx
diff --git a/Code/ChangeDetection/otbCBAMIChangeDetector.h b/Code/ChangeDetection/otbCBAMIChangeDetector.h
index a21d48ce3d14dc1916b113efdb9abf27117faad4..68fbbce1c58aca73a2d13ffdd38aa40b60377364 100755
--- a/Code/ChangeDetection/otbCBAMIChangeDetector.h
+++ b/Code/ChangeDetection/otbCBAMIChangeDetector.h
@@ -1,13 +1,18 @@
 /*=========================================================================
 
-  Programme :   OTB (ORFEO ToolBox)
-  Auteurs   :   CNES - J.Inglada Rodriguez
-  Language  :   C++
-  Date      :   07 mars 2006
-  Version   :   
-  Role      :   Classe d'application du filtre CBAMI 
-  		(cumulant-based approximation to mutual information)
-  $Id: $
+  Program:   ORFEO Toolbox
+  Language:  C++
+  Date:      $Date$
+  Version:   $Revision$
+
+
+  Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
+  See OTBCopyright.txt 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.
 
 =========================================================================*/
 #ifndef __otbCBAMIChangeDetector_h
diff --git a/Code/ChangeDetection/otbCommandProgressUpdate.h b/Code/ChangeDetection/otbCommandProgressUpdate.h
index cc90ff23f1e3d9e4c4420bdea9b8cc5a088a04c7..dd1ddb4e6528e8f5d1f0be300b4a50015731b17c 100755
--- a/Code/ChangeDetection/otbCommandProgressUpdate.h
+++ b/Code/ChangeDetection/otbCommandProgressUpdate.h
@@ -1,12 +1,18 @@
 /*=========================================================================
 
-  Programme :   OTB (ORFEO ToolBox)
-  Auteurs   :   CNES - J.Inglada Rodriguez
-  Language  :   C++
-  Date      :   07 mars 2006
-  Version   :   
-  Role      :   Classe de suivi des commandes
-  $Id: $
+  Program:   ORFEO Toolbox
+  Language:  C++
+  Date:      $Date$
+  Version:   $Revision$
+
+
+  Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
+  See OTBCopyright.txt 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.
 
 =========================================================================*/
 #ifndef __ProgressObserver_h
diff --git a/Code/ChangeDetection/otbCommandProgressUpdate.txx b/Code/ChangeDetection/otbCommandProgressUpdate.txx
index 359e244d86f5f98c5efaf28fcc0364c0bae112ef..ba8fe1943ad5bfe616c99099e075cfbe11a7018a 100755
--- a/Code/ChangeDetection/otbCommandProgressUpdate.txx
+++ b/Code/ChangeDetection/otbCommandProgressUpdate.txx
@@ -1,12 +1,18 @@
 /*=========================================================================
 
-  Programme :   OTB (ORFEO ToolBox)
-  Auteurs   :   CNES - J.Inglada Rodriguez
-  Language  :   C++
-  Date      :   07 mars 2006
-  Version   :   
-  Role      :   Classe de suivi des commandes
-  $Id: $
+  Program:   ORFEO Toolbox
+  Language:  C++
+  Date:      $Date$
+  Version:   $Revision$
+
+
+  Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
+  See OTBCopyright.txt 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.
 
 =========================================================================*/
 #ifndef __otbCommandProgressUpdate_txx
diff --git a/Code/ChangeDetection/otbCorrelationChangeDetector.h b/Code/ChangeDetection/otbCorrelationChangeDetector.h
index 3ed1abfe60a17e4a678af3e9d704e886f9263f71..772031a3d89be784bdb73cd3a07b2c9937a782ea 100755
--- a/Code/ChangeDetection/otbCorrelationChangeDetector.h
+++ b/Code/ChangeDetection/otbCorrelationChangeDetector.h
@@ -1,13 +1,18 @@
 /*=========================================================================
 
-  Programme :   OTB (ORFEO ToolBox)
-  Auteurs   :   CNES - J.Inglada Rodriguez
-  Language  :   C++
-  Date      :   07 mars 2006
-  Version   :   
-  Role      :   Classe d'application du filtre crosscorrelation 
- 
-  $Id: $
+  Program:   ORFEO Toolbox
+  Language:  C++
+  Date:      $Date$
+  Version:   $Revision$
+
+
+  Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
+  See OTBCopyright.txt 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.
 
 =========================================================================*/
 #ifndef __otbCorrelationChangeDetector_h
diff --git a/Code/ChangeDetection/otbJoinHistogramMIImageFilter.h b/Code/ChangeDetection/otbJoinHistogramMIImageFilter.h
index 0de4dc2104ecd20e6b2f0f8d067bd67a8f4b3174..7ee7283745f18df7d31369fe102d645e3933b9aa 100755
--- a/Code/ChangeDetection/otbJoinHistogramMIImageFilter.h
+++ b/Code/ChangeDetection/otbJoinHistogramMIImageFilter.h
@@ -1,13 +1,18 @@
 /*=========================================================================
 
-  Programme :   OTB (ORFEO ToolBox)
-  Auteurs   :   CNES - J.Inglada Rodriguez
-  Language  :   C++
-  Date      :   07 mars 2006
-  Version   :   
-  Role      :   Classe d'application du filtre JHMI 
-  		(computation of mutual information using a join histogram)
-  $Id: $
+  Program:   ORFEO Toolbox
+  Language:  C++
+  Date:      $Date$
+  Version:   $Revision$
+
+
+  Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
+  See OTBCopyright.txt 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.
 
 =========================================================================*/
 #ifndef __otbJoinHistogramMIImageFilter_h
diff --git a/Code/ChangeDetection/otbLHMIChangeDetector.h b/Code/ChangeDetection/otbLHMIChangeDetector.h
index b148889d509d8a9ebab8cb20c674cd739f9287f1..92c47ba236149907b4a46594da81ce6a7e512ecc 100755
--- a/Code/ChangeDetection/otbLHMIChangeDetector.h
+++ b/Code/ChangeDetection/otbLHMIChangeDetector.h
@@ -1,12 +1,18 @@
 /*=========================================================================
 
-  Programme :   OTB (ORFEO ToolBox)
-  Auteurs   :   CNES - J.Inglada Rodriguez
-  Language  :   C++
-  Date      :   07 mars 2006
-  Version   :   
-  Role      :   Classe d'application du filtre LHMI 
-  $Id: $
+  Program:   ORFEO Toolbox
+  Language:  C++
+  Date:      $Date$
+  Version:   $Revision$
+
+
+  Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
+  See OTBCopyright.txt 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.
 
 =========================================================================*/
 #ifndef __otbLHMIChangeDetector_h
diff --git a/Code/ChangeDetection/otbMeanDifferenceImageFilter.h b/Code/ChangeDetection/otbMeanDifferenceImageFilter.h
index 930f585a63b00cdd655d5ce6236b36202dea901b..f839afd2b498480d0a375e828f13e720a8000c52 100755
--- a/Code/ChangeDetection/otbMeanDifferenceImageFilter.h
+++ b/Code/ChangeDetection/otbMeanDifferenceImageFilter.h
@@ -1,13 +1,18 @@
 /*=========================================================================
 
-  Programme :   OTB (ORFEO ToolBox)
-  Auteurs   :   CNES - J.Inglada Rodriguez
-  Language  :   C++
-  Date      :   07 mars 2006
-  Version   :   
-  Role      :   Classe d'application du filtre difference moyenne 
-  		(mean difference)
-  $Id: $
+  Program:   ORFEO Toolbox
+  Language:  C++
+  Date:      $Date$
+  Version:   $Revision$
+
+
+  Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
+  See OTBCopyright.txt 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.
 
 =========================================================================*/
 #ifndef __otbMeanDifferenceImageFilter_h
diff --git a/Code/ChangeDetection/otbMeanRatioImageFilter.h b/Code/ChangeDetection/otbMeanRatioImageFilter.h
index a84018ef6d3dba68d87d1aa256e8760bc3d75958..686fd03f4011528b70cbc43b52ff34167730b06a 100755
--- a/Code/ChangeDetection/otbMeanRatioImageFilter.h
+++ b/Code/ChangeDetection/otbMeanRatioImageFilter.h
@@ -1,13 +1,18 @@
 /*=========================================================================
 
-  Programme :   OTB (ORFEO ToolBox)
-  Auteurs   :   CNES - J.Inglada Rodriguez
-  Language  :   C++
-  Date      :   07 mars 2006
-  Version   :   
-  Role      :   Classe d'application du filtre rapport moyen 
-  		(mean ratio)
-  $Id: $
+  Program:   ORFEO Toolbox
+  Language:  C++
+  Date:      $Date$
+  Version:   $Revision$
+
+
+  Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
+  See OTBCopyright.txt 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.
 
 =========================================================================*/
 #ifndef __otbMeanRatioImageFilter_h
diff --git a/Code/Common/otbBonjour.h b/Code/Common/otbBonjour.h
index 3ebe851750f97549082a273edda01a4d8b2d4561..e9eec5c2bd786e4ab94369f8b6193356d809e53b 100644
--- a/Code/Common/otbBonjour.h
+++ b/Code/Common/otbBonjour.h
@@ -1,11 +1,18 @@
 /*=========================================================================
 
-  Programme :   OTB (ORFEO ToolBox)
-  Auteurs   :   CS - T.Feuvrier
-  Language  :   C++
-  Date      :   21 decembre 2005
-  Role      :  
-  $Id$ 
+  Program:   ORFEO Toolbox
+  Language:  C++
+  Date:      $Date$
+  Version:   $Revision$
+
+
+  Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
+  See OTBCopyright.txt 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.
 
 =========================================================================*/
 #ifndef __otbBonjour_h
diff --git a/Code/Common/otbCommandLineArgumentParser.cxx b/Code/Common/otbCommandLineArgumentParser.cxx
index fdf0268a6c75d7ed0ebf178c481a6df6d8c060ff..dcb1181ab00be8f777eabfc52c252a98b3376f8c 100755
--- a/Code/Common/otbCommandLineArgumentParser.cxx
+++ b/Code/Common/otbCommandLineArgumentParser.cxx
@@ -1,3 +1,20 @@
+/*=========================================================================
+
+  Program:   ORFEO Toolbox
+  Language:  C++
+  Date:      $Date$
+  Version:   $Revision$
+
+
+  Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
+  See OTBCopyright.txt 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.
+
+=========================================================================*/
 #include "otbCommandLineArgumentParser.h"
 #include "itkMacro.h"
 
diff --git a/Code/Common/otbCommandLineArgumentParser.h b/Code/Common/otbCommandLineArgumentParser.h
index 338d6ed4e281c9c274d799267391919167262cf2..cdcfeb8c2b9e676c69271007e810aa0fb3ccdac3 100755
--- a/Code/Common/otbCommandLineArgumentParser.h
+++ b/Code/Common/otbCommandLineArgumentParser.h
@@ -1,12 +1,18 @@
 /*=========================================================================
 
-  Programme :   OTB (ORFEO ToolBox)
-  Auteurs   :   CS - T.Feuvrier
-  Language  :   C++
-  Date      :   10 février 2006
-  Version   :   
-  Role      :   Classe permettant de géer les paramètres d'une ligne de commande d'un programme
-  $Id$
+  Program:   ORFEO Toolbox
+  Language:  C++
+  Date:      $Date$
+  Version:   $Revision$
+
+
+  Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
+  See OTBCopyright.txt 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.
 
 =========================================================================*/
 #ifndef __otbCommandLineArgumentParser_h_
diff --git a/Code/Common/otbCommandLineArgumentParser.txx b/Code/Common/otbCommandLineArgumentParser.txx
index cdfc8f15446f29395c7ca3a46947df6b768c3e9b..6bb311bd06a218a3c0d0c1966cbaac22c0199cec 100755
--- a/Code/Common/otbCommandLineArgumentParser.txx
+++ b/Code/Common/otbCommandLineArgumentParser.txx
@@ -1,3 +1,20 @@
+/*=========================================================================
+
+  Program:   ORFEO Toolbox
+  Language:  C++
+  Date:      $Date$
+  Version:   $Revision$
+
+
+  Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
+  See OTBCopyright.txt 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.
+
+=========================================================================*/
 #ifndef _otbCommandLineArgumentParser_txx
 #define _otbCommandLineArgumentParser_txx
 
diff --git a/Code/Common/otbDrawLineSpatialObjectFilter.h b/Code/Common/otbDrawLineSpatialObjectFilter.h
index 0b262b0006e420c08aff481387c7edff2c9a2aff..a2684edbe2d3a2d8f29334ff482cc12b0b26c8d0 100755
--- a/Code/Common/otbDrawLineSpatialObjectFilter.h
+++ b/Code/Common/otbDrawLineSpatialObjectFilter.h
@@ -1,11 +1,18 @@
 /*=========================================================================
 
-  Programme :   OTB (ORFEO ToolBox)
-  Auteurs   :   CS - C.Ruffel
-  Language  :   C++
-  Date      :   06 avril 2006
-  Role      :   Draw Line Spatial Object
-  $Id : $ 
+  Program:   ORFEO Toolbox
+  Language:  C++
+  Date:      $Date$
+  Version:   $Revision$
+
+
+  Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
+  See OTBCopyright.txt 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.
 
 =========================================================================*/
 #ifndef __otbDrawLineSpatialObjectFilter_h
diff --git a/Code/Common/otbDrawLineSpatialObjectFilter.txx b/Code/Common/otbDrawLineSpatialObjectFilter.txx
index 4edd3f8f8b4f60e4eaf5c1504fca72e30e54fdb0..76fb110b100d213a5ef2e84aeacf7408b48854bb 100755
--- a/Code/Common/otbDrawLineSpatialObjectFilter.txx
+++ b/Code/Common/otbDrawLineSpatialObjectFilter.txx
@@ -1,11 +1,18 @@
 /*=========================================================================
 
-  Programme :   OTB (ORFEO ToolBox)
-  Auteurs   :   CS - C.Ruffel
-  Language  :   C++
-  Date      :   06 avril 2006
-  Role      :   Draw Line Spatial Object
-  $Id : $ 
+  Program:   ORFEO Toolbox
+  Language:  C++
+  Date:      $Date$
+  Version:   $Revision$
+
+
+  Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
+  See OTBCopyright.txt 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.
 
 =========================================================================*/
 #ifndef __otbDrawLineSpatialObjectFilter_txx
diff --git a/Code/Common/otbDrawLineSpatialObjectListFilter.h b/Code/Common/otbDrawLineSpatialObjectListFilter.h
index 5ff123b628eb675fd1d84a0423300a49b1e47a19..b5e7967014dd1c79ab905c0496f87d1242559097 100755
--- a/Code/Common/otbDrawLineSpatialObjectListFilter.h
+++ b/Code/Common/otbDrawLineSpatialObjectListFilter.h
@@ -1,11 +1,18 @@
 /*=========================================================================
 
-  Programme :   OTB (ORFEO ToolBox)
-  Auteurs   :   CS - C.Ruffel
-  Language  :   C++
-  Date      :   06 avril 2006
-  Role      :   Draw Line Spatial Object List
-  $Id : $ 
+  Program:   ORFEO Toolbox
+  Language:  C++
+  Date:      $Date$
+  Version:   $Revision$
+
+
+  Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
+  See OTBCopyright.txt 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.
 
 =========================================================================*/
 #ifndef __otbDrawLineSpatialObjectListFilter_h
diff --git a/Code/Common/otbDrawLineSpatialObjectListFilter.txx b/Code/Common/otbDrawLineSpatialObjectListFilter.txx
index c9bf14cd9b35436f83fbeb1c21108e6a11f1cd1e..0a32501368fa38ffacd9d5a5c0c9f5dd34fd55a5 100755
--- a/Code/Common/otbDrawLineSpatialObjectListFilter.txx
+++ b/Code/Common/otbDrawLineSpatialObjectListFilter.txx
@@ -1,11 +1,18 @@
 /*=========================================================================
 
-  Programme :   OTB (ORFEO ToolBox)
-  Auteurs   :   CS - C.Ruffel
-  Language  :   C++
-  Date      :   06 avril 2006
-  Role      :   Draw Line Spatial Object List
-  $Id : $ 
+  Program:   ORFEO Toolbox
+  Language:  C++
+  Date:      $Date$
+  Version:   $Revision$
+
+
+  Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
+  See OTBCopyright.txt 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.
 
 =========================================================================*/
 #ifndef __otbDrawLineSpatialObjectListFilter_txx
diff --git a/Code/Common/otbDrawPathFilter.h b/Code/Common/otbDrawPathFilter.h
index f2f96252e6d5f1f4762912e30d2e7153be06b365..6fb4445cb03cbbcd6825a952ef23b5a49e5550e6 100644
--- a/Code/Common/otbDrawPathFilter.h
+++ b/Code/Common/otbDrawPathFilter.h
@@ -1,12 +1,18 @@
 /*=========================================================================
 
-  Programme :   OTB (ORFEO ToolBox)
-  Auteurs   :   CS - P. Imbo
-  Language  :   C++
-  Date      :   28 fevrier 2006
-  Version   :   
-  Role      :   Dessine des segments de Path sur une image
-  $Id:$
+  Program:   ORFEO Toolbox
+  Language:  C++
+  Date:      $Date$
+  Version:   $Revision$
+
+
+  Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
+  See OTBCopyright.txt 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.
 
 =========================================================================*/
 #ifndef __otbDrawPathFilter_h
diff --git a/Code/Common/otbDrawPathFilter.txx b/Code/Common/otbDrawPathFilter.txx
index 18cec1bc22fd9643b2578611aa7df2015a8fbba2..5ed07d580a7ea8bd91871303cc5c51c179b25161 100644
--- a/Code/Common/otbDrawPathFilter.txx
+++ b/Code/Common/otbDrawPathFilter.txx
@@ -1,12 +1,18 @@
 /*=========================================================================
 
-  Programme :   OTB (ORFEO ToolBox)
-  Auteurs   :   CS - P. Imbo
-  Language  :   C++
-  Date      :   28 fevrier 2006
-  Version   :   
-  Role      :   Classe de base d'une PathList 
-  $Id:$
+  Program:   ORFEO Toolbox
+  Language:  C++
+  Date:      $Date$
+  Version:   $Revision$
+
+
+  Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
+  See OTBCopyright.txt 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.
 
 =========================================================================*/
 
diff --git a/Code/Common/otbDrawPathListFilter.h b/Code/Common/otbDrawPathListFilter.h
index a037e272eb1f80fc2474945617f1330903c1a2b4..833129e53d89ff70bd5f5f01d0c8c067b34f0811 100644
--- a/Code/Common/otbDrawPathListFilter.h
+++ b/Code/Common/otbDrawPathListFilter.h
@@ -1,12 +1,18 @@
 /*=========================================================================
 
-  Programme :   OTB (ORFEO ToolBox)
-  Auteurs   :   CS - P. Imbo
-  Language  :   C++
-  Date      :   13 fevrier 2006
-  Version   :   
-  Role      :   Dessine les segmentss de lignes du Path sur une image
-  $Id:$
+  Program:   ORFEO Toolbox
+  Language:  C++
+  Date:      $Date$
+  Version:   $Revision$
+
+
+  Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
+  See OTBCopyright.txt 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.
 
 =========================================================================*/
 #ifndef __otbDrawPathListFilter_h
diff --git a/Code/Common/otbDrawPathListFilter.txx b/Code/Common/otbDrawPathListFilter.txx
index 6672500088cc1036af44d87f66752eccc305ed94..8ac738699882b4959181bc7eb4d8238ca163571d 100644
--- a/Code/Common/otbDrawPathListFilter.txx
+++ b/Code/Common/otbDrawPathListFilter.txx
@@ -1,12 +1,18 @@
 /*=========================================================================
 
-  Programme :   OTB (ORFEO ToolBox)
-  Auteurs   :   CS - P. Imbo
-  Language  :   C++
-  Date      :   13 fevrier 2006
-  Version   :   
-  Role      :   Classe de base d'une PathList 
-  $Id:$
+  Program:   ORFEO Toolbox
+  Language:  C++
+  Date:      $Date$
+  Version:   $Revision$
+
+
+  Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
+  See OTBCopyright.txt 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.
 
 =========================================================================*/
 
diff --git a/Code/Common/otbExtractROI.h b/Code/Common/otbExtractROI.h
index 0285ae7d04537d409d43e90d1a40b3cb602d4883..3f5bd0ace7c9ec0a81340125aa7fabc9b6a7dac6 100755
--- a/Code/Common/otbExtractROI.h
+++ b/Code/Common/otbExtractROI.h
@@ -1,12 +1,18 @@
 /*=========================================================================
 
-  Programme :   OTB (ORFEO ToolBox)
-  Auteurs   :   CS - T.Feuvrier
-  Language  :   C++
-  Date      :   18 janvier 2005
-  Version   :   
-  Role      :   Classe d'extraction d'une ROI d'une image mono-canal
-  $Id$
+  Program:   ORFEO Toolbox
+  Language:  C++
+  Date:      $Date$
+  Version:   $Revision$
+
+
+  Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
+  See OTBCopyright.txt 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.
 
 =========================================================================*/
 #ifndef __otbExtractROI_h
diff --git a/Code/Common/otbExtractROI.txx b/Code/Common/otbExtractROI.txx
index 7ca6fbd9371c421a88c9fc7f3c7b6b3158427b80..b09d8aaacbfa80d24a8ca723c7be23351d829308 100755
--- a/Code/Common/otbExtractROI.txx
+++ b/Code/Common/otbExtractROI.txx
@@ -1,3 +1,20 @@
+/*=========================================================================
+
+  Program:   ORFEO Toolbox
+  Language:  C++
+  Date:      $Date$
+  Version:   $Revision$
+
+
+  Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
+  See OTBCopyright.txt 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.
+
+=========================================================================*/
 #ifndef _otbExtractROI_txx
 #define _otbExtractROI_txx
 
diff --git a/Code/Common/otbExtractROIBase.h b/Code/Common/otbExtractROIBase.h
index cb86a1d6726b553933eadcd3381a25e8ed4088b0..a4f5a775d7c08d5455a0ae961126332e0807d18b 100755
--- a/Code/Common/otbExtractROIBase.h
+++ b/Code/Common/otbExtractROIBase.h
@@ -1,12 +1,18 @@
 /*=========================================================================
 
-  Programme :   OTB (ORFEO ToolBox)
-  Auteurs   :   CS - T.Feuvrier
-  Language  :   C++
-  Date      :   18 janvier 2005
-  Version   :   
-  Role      :   Classe de base d'extraction d'une ROI d'une image 
-  $Id$
+  Program:   ORFEO Toolbox
+  Language:  C++
+  Date:      $Date$
+  Version:   $Revision$
+
+
+  Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
+  See OTBCopyright.txt 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.
 
 =========================================================================*/
 #ifndef __otbExtractROIBase_h
diff --git a/Code/Common/otbExtractROIBase.txx b/Code/Common/otbExtractROIBase.txx
index 995600bd570dbfb44e94120ae19f10a72c7388e1..874ed0e56b19a858f8ceff3a185b9c30b4e62af0 100755
--- a/Code/Common/otbExtractROIBase.txx
+++ b/Code/Common/otbExtractROIBase.txx
@@ -1,13 +1,14 @@
 /*=========================================================================
 
-  Program:   Insight Segmentation & Registration Toolkit
-  Module:    $RCSfile: itkExtractROIBase.txx,v $
+  Program:   ORFEO Toolbox
   Language:  C++
-  Date:      $Date: 2005/09/07 21:23:01 $
-  Version:   $Revision: 1.19 $
+  Date:      $Date$
+  Version:   $Revision$
+
+
+  Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
+  See OTBCopyright.txt for details.
 
-  Copyright (c) Insight Software Consortium. All rights reserved.
-  See ITKCopyright.txt or http://www.itk.org/HTML/Copyright.htm for details.
 
      This software is distributed WITHOUT ANY WARRANTY; without even 
      the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR 
diff --git a/Code/Common/otbImageToLineSpatialObjectListFilter.h b/Code/Common/otbImageToLineSpatialObjectListFilter.h
index ab91c17b15ace35ef2f8111cb3dc4db138acacd0..de6f7b4b3556b355285b333a99dae63986a9873d 100755
--- a/Code/Common/otbImageToLineSpatialObjectListFilter.h
+++ b/Code/Common/otbImageToLineSpatialObjectListFilter.h
@@ -1,12 +1,18 @@
 /*=========================================================================
 
-  Programme :   OTB (ORFEO ToolBox)
-  Auteurs   :   CS - C.Ruffel
-  Language  :   C++
-  Date      :   11 avril 2006
-  Version   :   
-  Role      :   Image to Line Spatial Object List Filter
-  $Id$
+  Program:   ORFEO Toolbox
+  Language:  C++
+  Date:      $Date$
+  Version:   $Revision$
+
+
+  Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
+  See OTBCopyright.txt 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.
 
 =========================================================================*/
 #ifndef _otbImageToLineSpatialObjectListFilter_h
diff --git a/Code/Common/otbImageToLineSpatialObjectListFilter.txx b/Code/Common/otbImageToLineSpatialObjectListFilter.txx
index b0b315bd44e9543f571d81a72a602a0820918dcc..eead62871eee5d918e796b006883170e33bd8dd6 100755
--- a/Code/Common/otbImageToLineSpatialObjectListFilter.txx
+++ b/Code/Common/otbImageToLineSpatialObjectListFilter.txx
@@ -1,12 +1,18 @@
 /*=========================================================================
 
-  Programme :   OTB (ORFEO ToolBox)
-  Auteurs   :   CS - C.Ruffel
-  Language  :   C++
-  Date      :   11 avril 2006
-  Version   :   
-  Role      :   Image to Line Spatial Object List Filter
-  $Id: $
+  Program:   ORFEO Toolbox
+  Language:  C++
+  Date:      $Date$
+  Version:   $Revision$
+
+
+  Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
+  See OTBCopyright.txt 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.
 
 =========================================================================*/
 #ifndef _otbImageToLineSpatialObjectListFilter_txx
diff --git a/Code/Common/otbImageToPathListFilter.h b/Code/Common/otbImageToPathListFilter.h
index 9b74724f29c490f7a5fa77ec2c6646497b7fc730..daf0b8586d2e4a4732c1de534612f13503956034 100644
--- a/Code/Common/otbImageToPathListFilter.h
+++ b/Code/Common/otbImageToPathListFilter.h
@@ -1,12 +1,18 @@
 /*=========================================================================
 
-  Programme :   OTB (ORFEO ToolBox)
-  Auteurs   :   CS - P. Imbo
-  Language  :   C++
-  Date      :   13 fevrier 2006
-  Version   :   
-  Role      :   Classe de base d'une PathList 
-  $Id:$
+  Program:   ORFEO Toolbox
+  Language:  C++
+  Date:      $Date$
+  Version:   $Revision$
+
+
+  Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
+  See OTBCopyright.txt 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.
 
 =========================================================================*/
 #ifndef __otbImageToPathListFilter_h
diff --git a/Code/Common/otbImageToPathListFilter.txx b/Code/Common/otbImageToPathListFilter.txx
index 1d47473557da9e76fd19ea0e9817117cefb060a8..9a0a288465a37144a22df629b020aa10b4491947 100644
--- a/Code/Common/otbImageToPathListFilter.txx
+++ b/Code/Common/otbImageToPathListFilter.txx
@@ -1,12 +1,18 @@
 /*=========================================================================
 
-  Programme :   OTB (ORFEO ToolBox)
-  Auteurs   :   CS - P. Imbo
-  Language  :   C++
-  Date      :   13 fevrier 2006
-  Version   :   
-  Role      :   Classe de base d'une PathList 
-  $Id:$
+  Program:   ORFEO Toolbox
+  Language:  C++
+  Date:      $Date$
+  Version:   $Revision$
+
+
+  Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
+  See OTBCopyright.txt 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.
 
 =========================================================================*/
 
diff --git a/Code/Common/otbLineSpatialObjectList.h b/Code/Common/otbLineSpatialObjectList.h
index a1620493f6a8b08293e6d01e86aa6d9df8966383..98a0d15eb14e20de892facb2de1a1def98885c92 100644
--- a/Code/Common/otbLineSpatialObjectList.h
+++ b/Code/Common/otbLineSpatialObjectList.h
@@ -1,12 +1,18 @@
 /*=========================================================================
 
-  Programme :   OTB (ORFEO ToolBox)
-  Auteurs   :   CS - T.Feuvrier
-  Language  :   C++
-  Date      :   6 avril 2006
-  Version   :   
-  Role      :   Base class for a list of itk LineSpatialObject
-  $Id$
+  Program:   ORFEO Toolbox
+  Language:  C++
+  Date:      $Date$
+  Version:   $Revision$
+
+
+  Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
+  See OTBCopyright.txt 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.
 
 =========================================================================*/
 #ifndef _otbLineSpatialObjectList_h
diff --git a/Code/Common/otbMacro.h b/Code/Common/otbMacro.h
index 318f8f911a8e3b064fb3f7ef63f6c65ddc3e5966..453caab87ea34186191d8dbdfba5de35eb5c4f8c 100755
--- a/Code/Common/otbMacro.h
+++ b/Code/Common/otbMacro.h
@@ -1,12 +1,18 @@
 /*=========================================================================
 
-  Programme :   OTB (ORFEO ToolBox)
-  Auteurs   :   CS - P.Imbo
-  Language  :   C++
-  Date      :   25 avril 2006
-  Version   :   
-  Role      :   otbMacro defines standard system-wide macros
-  $Id$
+  Program:   ORFEO Toolbox
+  Language:  C++
+  Date:      $Date$
+  Version:   $Revision$
+
+
+  Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
+  See OTBCopyright.txt 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.
 
 =========================================================================*/
 
diff --git a/Code/Common/otbMultiChannelExtractROI.h b/Code/Common/otbMultiChannelExtractROI.h
index 14f81af4da4e222eadecac2d23bc9ebe8b89e977..331d162e04b6545b763b6b424745cea80649de39 100755
--- a/Code/Common/otbMultiChannelExtractROI.h
+++ b/Code/Common/otbMultiChannelExtractROI.h
@@ -1,12 +1,18 @@
 /*=========================================================================
 
-  Programme :   OTB (ORFEO ToolBox)
-  Auteurs   :   CS - T.Feuvrier
-  Language  :   C++
-  Date      :   18 janvier 2005
-  Version   :   
-  Role      :   Classe d'extraction d'une ROI d'une image multi-canal en précisant le(s) numéro(s) de canal a traiter
-  $Id$
+  Program:   ORFEO Toolbox
+  Language:  C++
+  Date:      $Date$
+  Version:   $Revision$
+
+
+  Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
+  See OTBCopyright.txt 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.
 
 =========================================================================*/
 #ifndef __otbMultiChannelExtractROI_h
diff --git a/Code/Common/otbMultiChannelExtractROI.txx b/Code/Common/otbMultiChannelExtractROI.txx
index 53bef3df0c4608ec0450b8ca30536ae7c1253366..fd807c518de32ca355299377a4916a3e571a2dcc 100755
--- a/Code/Common/otbMultiChannelExtractROI.txx
+++ b/Code/Common/otbMultiChannelExtractROI.txx
@@ -1,3 +1,20 @@
+/*=========================================================================
+
+  Program:   ORFEO Toolbox
+  Language:  C++
+  Date:      $Date$
+  Version:   $Revision$
+
+
+  Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
+  See OTBCopyright.txt 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.
+
+=========================================================================*/
 #ifndef _otbMultiChannelExtractROI_txx
 #define _otbMultiChannelExtractROI_txx
 
diff --git a/Code/Common/otbMultiToMonoChannelExtractROI.h b/Code/Common/otbMultiToMonoChannelExtractROI.h
index a66b4eb3486f74887ec3021d06695489ec38c315..944291f1d950a89bbf26790f6486e5a4a5594bb6 100755
--- a/Code/Common/otbMultiToMonoChannelExtractROI.h
+++ b/Code/Common/otbMultiToMonoChannelExtractROI.h
@@ -1,12 +1,18 @@
 /*=========================================================================
 
-  Programme :   OTB (ORFEO ToolBox)
-  Auteurs   :   CS - T.Feuvrier
-  Language  :   C++
-  Date      :   24 janvier 2005
-  Version   :   
-  Role      :   Classe d'extraction d'une ROI d'une image multi-canal en précisant le numéro de canal a traiter
-  $Id$
+  Program:   ORFEO Toolbox
+  Language:  C++
+  Date:      $Date$
+  Version:   $Revision$
+
+
+  Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
+  See OTBCopyright.txt 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.
 
 =========================================================================*/
 #ifndef __otbMultiToMonoChannelExtractROI_h
diff --git a/Code/Common/otbMultiToMonoChannelExtractROI.txx b/Code/Common/otbMultiToMonoChannelExtractROI.txx
index 77fa4176c4e0c473e0b081960bc80bd63b06b93c..642b23f3355a63ce44f6f7836f81455ef522c241 100755
--- a/Code/Common/otbMultiToMonoChannelExtractROI.txx
+++ b/Code/Common/otbMultiToMonoChannelExtractROI.txx
@@ -1,3 +1,20 @@
+/*=========================================================================
+
+  Program:   ORFEO Toolbox
+  Language:  C++
+  Date:      $Date$
+  Version:   $Revision$
+
+
+  Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
+  See OTBCopyright.txt 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.
+
+=========================================================================*/
 #ifndef _otbMultiToMonoChannelExtractROI_txx
 #define _otbMultiToMonoChannelExtractROI_txx
 
diff --git a/Code/Common/otbPathFunction.h b/Code/Common/otbPathFunction.h
index 39c6510b6a1c86619c9dcf925bf2060460c5edd3..ebc3ea1500c36c1b5a1f2963e00d0198b2fd746e 100644
--- a/Code/Common/otbPathFunction.h
+++ b/Code/Common/otbPathFunction.h
@@ -1,12 +1,18 @@
 /*=========================================================================
 
-  Programme :   OTB (ORFEO ToolBox)
-  Auteurs   :   CS - P. Imbo
-  Language  :   C++
-  Date      :   22 mars 2006
-  Version   :   
-  Role      :   Evaluate a function of an image over a specific path
-  $Id$
+  Program:   ORFEO Toolbox
+  Language:  C++
+  Date:      $Date$
+  Version:   $Revision$
+
+
+  Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
+  See OTBCopyright.txt 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.
 
 =========================================================================*/
 #ifndef _otbPathFunction_h
diff --git a/Code/Common/otbPathFunction.txx b/Code/Common/otbPathFunction.txx
index 4f224eede305520f67517ea7fe4a4ebf9164c2ee..3c049bb6a0d24d596e988185d9ed4f4909be4417 100644
--- a/Code/Common/otbPathFunction.txx
+++ b/Code/Common/otbPathFunction.txx
@@ -1,12 +1,18 @@
 /*=========================================================================
 
-  Programme :   OTB (ORFEO ToolBox)
-  Auteurs   :   CS - P. Imbo
-  Language  :   C++
-  Date      :   22 mars 2006
-  Version   :   
-  Role      :   Evaluate a function of an image over a specific path
-  $Id:$
+  Program:   ORFEO Toolbox
+  Language:  C++
+  Date:      $Date$
+  Version:   $Revision$
+
+
+  Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
+  See OTBCopyright.txt 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.
 
 =========================================================================*/
 #ifndef _otbPathFunction_txx
diff --git a/Code/Common/otbPathListSource.h b/Code/Common/otbPathListSource.h
index 8143e416137a5261b97aa255a1c1209d6134cee4..92f8759292539b7fb49441c986570d85089719ea 100644
--- a/Code/Common/otbPathListSource.h
+++ b/Code/Common/otbPathListSource.h
@@ -1,12 +1,18 @@
 /*=========================================================================
 
-  Programme :   OTB (ORFEO ToolBox)
-  Auteurs   :   CS - P. Imbo
-  Language  :   C++
-  Date      :   13 fevrier 2006
-  Version   :   
-  Role      :   Classe de base d'une PathList 
-  $Id:$
+  Program:   ORFEO Toolbox
+  Language:  C++
+  Date:      $Date$
+  Version:   $Revision$
+
+
+  Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
+  See OTBCopyright.txt 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.
 
 =========================================================================*/
 
diff --git a/Code/Common/otbPathListSource.txx b/Code/Common/otbPathListSource.txx
index c98503be507ea1a15d642a43f61b7c8b76ae1f84..708dc04d98a18666e044f85f4e0f9c10c8ea0ed9 100644
--- a/Code/Common/otbPathListSource.txx
+++ b/Code/Common/otbPathListSource.txx
@@ -1,12 +1,18 @@
 /*=========================================================================
 
-  Programme :   OTB (ORFEO ToolBox)
-  Auteurs   :   CS - P. Imbo
-  Language  :   C++
-  Date      :   13 fevrier 2006
-  Version   :   
-  Role      :   Classe de base d'une PathList 
-  $Id:$
+  Program:   ORFEO Toolbox
+  Language:  C++
+  Date:      $Date$
+  Version:   $Revision$
+
+
+  Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
+  See OTBCopyright.txt 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.
 
 =========================================================================*/
 
diff --git a/Code/Common/otbPointSetSource.h b/Code/Common/otbPointSetSource.h
index 415bfeaa6bbf27f15c2adfcf49248724c2f29f60..1de09d3f7401a621d0a4023af8dede94b037de0b 100644
--- a/Code/Common/otbPointSetSource.h
+++ b/Code/Common/otbPointSetSource.h
@@ -1,12 +1,18 @@
 /*=========================================================================
 
-  Programme :   OTB (ORFEO ToolBox)
-  Auteurs   :   CS - P. Imbo
-  Language  :   C++
-  Date      :   29 mars 2006
-  Version   :   
-  Role      :   PointSet Source Class
-  $Id$
+  Program:   ORFEO Toolbox
+  Language:  C++
+  Date:      $Date$
+  Version:   $Revision$
+
+
+  Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
+  See OTBCopyright.txt 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.
 
 =========================================================================*/
 
diff --git a/Code/Common/otbPointSetSource.txx b/Code/Common/otbPointSetSource.txx
index cb2ec28b239f2af13842f0c31de444cfc4920c53..b109eb0c737aa8d542f753727b4cfcc49ad3b1d7 100644
--- a/Code/Common/otbPointSetSource.txx
+++ b/Code/Common/otbPointSetSource.txx
@@ -1,12 +1,18 @@
 /*=========================================================================
 
-  Programme :   OTB (ORFEO ToolBox)
-  Auteurs   :   CS - P. Imbo
-  Language  :   C++
-  Date      :   29 mars 2006
-  Version   :   
-  Role      :   PointSet Source Class
-  $Id:$
+  Program:   ORFEO Toolbox
+  Language:  C++
+  Date:      $Date$
+  Version:   $Revision$
+
+
+  Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
+  See OTBCopyright.txt 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.
 
 =========================================================================*/
 #ifndef _otbPointSetSource_txx
diff --git a/Code/Common/otbSystem.cxx b/Code/Common/otbSystem.cxx
index 65feedd1b51b151b030529498734e81af4479d4b..0a21d8feba5d7bfd2ecb3059adbef35290bd7b07 100755
--- a/Code/Common/otbSystem.cxx
+++ b/Code/Common/otbSystem.cxx
@@ -1,12 +1,18 @@
 /*=========================================================================
 
-  Programme :   OTB (ORFEO ToolBox)
-  Auteurs   :   CS - T. Feuvrier
-  Language  :   C++
-  Date      :   28 juin 2006
-  Version   :   
-  Role      :   System operation
-  $Id$
+  Program:   ORFEO Toolbox
+  Language:  C++
+  Date:      $Date$
+  Version:   $Revision$
+
+
+  Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
+  See OTBCopyright.txt 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.
 
 =========================================================================*/
 
diff --git a/Code/Common/otbSystem.h b/Code/Common/otbSystem.h
index 5526b6ba0cae01dfc885633fb2240038bab45a8d..afbe7dc4e74b484e61bb9c0c27fa397f6ee4ceb7 100755
--- a/Code/Common/otbSystem.h
+++ b/Code/Common/otbSystem.h
@@ -1,12 +1,18 @@
 /*=========================================================================
 
-  Programme :   OTB (ORFEO ToolBox)
-  Auteurs   :   CS - T. Feuvrier
-  Language  :   C++
-  Date      :   28 juin 2006
-  Version   :   
-  Role      :   System operations
-  $Id$
+  Program:   ORFEO Toolbox
+  Language:  C++
+  Date:      $Date$
+  Version:   $Revision$
+
+
+  Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
+  See OTBCopyright.txt 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.
 
 =========================================================================*/
 #ifndef _otbSystem_h
diff --git a/Code/Common/otbTestMain.h b/Code/Common/otbTestMain.h
index 75801cb87fa002fc9e5fed965a6e8e9e9854577c..4a71d92cbe1d6bf5cc945983d0a0f3e0c3e28aa8 100644
--- a/Code/Common/otbTestMain.h
+++ b/Code/Common/otbTestMain.h
@@ -1,3 +1,20 @@
+/*=========================================================================
+
+  Program:   ORFEO Toolbox
+  Language:  C++
+  Date:      $Date$
+  Version:   $Revision$
+
+
+  Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
+  See OTBCopyright.txt 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.
+
+=========================================================================*/
 
 
 #include "itkWin32Header.h"
diff --git a/Code/Common/otbVectorImageToASImageAdaptor.h b/Code/Common/otbVectorImageToASImageAdaptor.h
index 3f8cf2d39eeca8a14ad32a8e4a4fc1b0082f953e..6332be3615466a690d6092b0edd77dcaf0cb3775 100644
--- a/Code/Common/otbVectorImageToASImageAdaptor.h
+++ b/Code/Common/otbVectorImageToASImageAdaptor.h
@@ -1,12 +1,18 @@
 /*=========================================================================
 
-  Program:   Orfeo Tool Box
-  Module:    $RCSfile: otbVectorImageToASImageAdaptor.h,v $
+  Program:   ORFEO Toolbox
   Language:  C++
-  Date:      $Date: 2006/16/05 17:55:25 $
-  Version:   $Revision: 1.0 $
+  Date:      $Date$
+  Version:   $Revision$
 
-  Copyright (c) R. Garrigues
+
+  Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
+  See OTBCopyright.txt 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.
 
 =========================================================================*/
 
diff --git a/Code/Common/otbVectorImageToASPixelAccessor.h b/Code/Common/otbVectorImageToASPixelAccessor.h
index d86d2465952617c6b39e435e8f6cac11c03fb2a7..858525ed741edb39bd2117e2905e68402c303518 100644
--- a/Code/Common/otbVectorImageToASPixelAccessor.h
+++ b/Code/Common/otbVectorImageToASPixelAccessor.h
@@ -1,12 +1,18 @@
 /*=========================================================================
 
-  Program:   Orfeo Tool Box
-  Module:    $RCSfile: otbVectorImageToASImageAdaptor.h,v $
+  Program:   ORFEO Toolbox
   Language:  C++
-  Date:      $Date: 2006/16/05 17:55:25 $
-  Version:   $Revision: 1.0 $
+  Date:      $Date$
+  Version:   $Revision$
 
-  Copyright (c) R. Garrigues
+
+  Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
+  See OTBCopyright.txt 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.
 
 =========================================================================*/
 
diff --git a/Code/FeatureExtraction/otbAssociativeSymmetricalSumImageFilter.h b/Code/FeatureExtraction/otbAssociativeSymmetricalSumImageFilter.h
index 949759ef8d008cec3f4abe8738ff2d301accd1e5..cde0318809824f6882db9436dfa5dd53e678f9de 100755
--- a/Code/FeatureExtraction/otbAssociativeSymmetricalSumImageFilter.h
+++ b/Code/FeatureExtraction/otbAssociativeSymmetricalSumImageFilter.h
@@ -1,12 +1,18 @@
 /*=========================================================================
 
-  Programme :   OTB (ORFEO ToolBox)
-  Auteurs   :   CS - C.Ruffel
-  Language  :   C++
-  Date      :   27 mars 2006
-  Version   :   
-  Role      :   Associative Symmetrical Sum Filter
-  $Id$
+  Program:   ORFEO Toolbox
+  Language:  C++
+  Date:      $Date$
+  Version:   $Revision$
+
+
+  Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
+  See OTBCopyright.txt 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.
 
 =========================================================================*/
 #ifndef __otbAssociativeSymmetricalSumImageFilter_h
diff --git a/Code/FeatureExtraction/otbAssymmetricFusionOfLineDetectorImageFilter.h b/Code/FeatureExtraction/otbAssymmetricFusionOfLineDetectorImageFilter.h
index d69e52c7e1903db77b602a946c3751b4eebb6bb0..c3673b3a11752423f6aa9aaff027860575243e4d 100755
--- a/Code/FeatureExtraction/otbAssymmetricFusionOfLineDetectorImageFilter.h
+++ b/Code/FeatureExtraction/otbAssymmetricFusionOfLineDetectorImageFilter.h
@@ -1,11 +1,18 @@
 /*=========================================================================
 
-  Programme :   OTB (ORFEO ToolBox)
-  Auteurs   :   CS - C.Ruffel
-  Language  :   C++
-  Date      :  29 mars 2006
-  Role      :  Associative Symetrical Sum of Line Detector Image Filter  
-  $Id$ 
+  Program:   ORFEO Toolbox
+  Language:  C++
+  Date:      $Date$
+  Version:   $Revision$
+
+
+  Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
+  See OTBCopyright.txt 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.
 
 =========================================================================*/
 #ifndef __otbAssymmetricFusionOfLineDetectorImageFilter_h
diff --git a/Code/FeatureExtraction/otbAssymmetricFusionOfLineDetectorImageFilter.txx b/Code/FeatureExtraction/otbAssymmetricFusionOfLineDetectorImageFilter.txx
index 112925c9fde1941f42da87c440798fee45cb100c..34922715f72e82c488dd4dc2494a90bf0cbd559a 100755
--- a/Code/FeatureExtraction/otbAssymmetricFusionOfLineDetectorImageFilter.txx
+++ b/Code/FeatureExtraction/otbAssymmetricFusionOfLineDetectorImageFilter.txx
@@ -1,11 +1,18 @@
 /*=========================================================================
 
-  Programme :   OTB (ORFEO ToolBox)
-  Auteurs   :   CS - C.Ruffel
-  Language  :   C++
-  Date      :   29 mars 2006
-  Role      :   Associative Symetrical Sum of Line Detector Image Filter 
-  $Id$ 
+  Program:   ORFEO Toolbox
+  Language:  C++
+  Date:      $Date$
+  Version:   $Revision$
+
+
+  Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
+  See OTBCopyright.txt 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.
 
 =========================================================================*/
 #ifndef __otbAssymmetricFusionOfLineDetectorImageFilter_txx
diff --git a/Code/FeatureExtraction/otbComplexMomentImageFunction.h b/Code/FeatureExtraction/otbComplexMomentImageFunction.h
index 528899ecf9ab4b790818d2474af6c8a3bbe088d5..30967cb947093fdc4fd40574d839aff3681b3df8 100644
--- a/Code/FeatureExtraction/otbComplexMomentImageFunction.h
+++ b/Code/FeatureExtraction/otbComplexMomentImageFunction.h
@@ -1,12 +1,18 @@
 /*=========================================================================
 
-  Programme :   OTB (ORFEO ToolBox)
-  Auteurs   :   CS - P. Imbo
-  Language  :   C++
-  Date      :   20 mars 2006
-  Version   :   
-  Role      :   Complex Geometric Moments Class of iamges 
-  $Id:$
+  Program:   ORFEO Toolbox
+  Language:  C++
+  Date:      $Date$
+  Version:   $Revision$
+
+
+  Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
+  See OTBCopyright.txt 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.
 
 =========================================================================*/
 #ifndef _otbComplexMomentImageFunction_h
diff --git a/Code/FeatureExtraction/otbComplexMomentImageFunction.txx b/Code/FeatureExtraction/otbComplexMomentImageFunction.txx
index a9ef0f2bc716303906fe1c92eac7586cb43bbe79..36fd25042c37c664efaa5cd6e365b315c8bdf8d6 100644
--- a/Code/FeatureExtraction/otbComplexMomentImageFunction.txx
+++ b/Code/FeatureExtraction/otbComplexMomentImageFunction.txx
@@ -1,19 +1,20 @@
 /*=========================================================================
 
-    Program:   Insight Segmentation & Registration Toolkit
-    Module:    $RCSfile: itkMeanImageFunction.txx,v $
-    Language:  C++
-    Date:      $Date: 2004/12/12 22:07:24 $
-    Version:   $Revision: 1.12 $
+  Program:   ORFEO Toolbox
+  Language:  C++
+  Date:      $Date$
+  Version:   $Revision$
 
-    Copyright (c) Insight Software Consortium. All rights reserved.
-    See ITKCopyright.txt or http://www.itk.org/HTML/Copyright.htm 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.
+  Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
+  See OTBCopyright.txt 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.
+
+=========================================================================*/
 #ifndef _otbComplexMomentImageFunction_txx
 #define _otbComplexMomentImageFunction_txx
 
diff --git a/Code/FeatureExtraction/otbComplexMomentPathFunction.h b/Code/FeatureExtraction/otbComplexMomentPathFunction.h
index 8498c9809480d28a747cde21af0c006f12d7d323..32bb336efebbbc52ff51b53f4d2a0f45d7c5a68a 100644
--- a/Code/FeatureExtraction/otbComplexMomentPathFunction.h
+++ b/Code/FeatureExtraction/otbComplexMomentPathFunction.h
@@ -1,12 +1,18 @@
 /*=========================================================================
 
-  Programme :   OTB (ORFEO ToolBox)
-  Auteurs   :   CS - P. Imbo
-  Language  :   C++
-  Date      :   22 mars 2006
-  Version   :   
-  Role      :   Complex Geometric Moments Class of paths 
-  $Id$
+  Program:   ORFEO Toolbox
+  Language:  C++
+  Date:      $Date$
+  Version:   $Revision$
+
+
+  Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
+  See OTBCopyright.txt 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.
 
 =========================================================================*/
 #ifndef _otbComplexMomentPathFunction_h
diff --git a/Code/FeatureExtraction/otbComplexMomentPathFunction.txx b/Code/FeatureExtraction/otbComplexMomentPathFunction.txx
index db28d6d271e52415d889daec4a1841f7bd65c082..24086b1a0897a093fe654fdce1afed2c12e7ee4a 100644
--- a/Code/FeatureExtraction/otbComplexMomentPathFunction.txx
+++ b/Code/FeatureExtraction/otbComplexMomentPathFunction.txx
@@ -1,12 +1,18 @@
 /*=========================================================================
 
-  Programme :   OTB (ORFEO ToolBox)
-  Auteurs   :   CS - P. Imbo
-  Language  :   C++
-  Date      :   22 mars 2006
-  Version   :   
-  Role      :   Geometric Moments Class of path 
-  $Id:$
+  Program:   ORFEO Toolbox
+  Language:  C++
+  Date:      $Date$
+  Version:   $Revision$
+
+
+  Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
+  See OTBCopyright.txt 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.
 
 =========================================================================*/
 #ifndef _otbComplexMomentPathFunction_txx
diff --git a/Code/FeatureExtraction/otbExtractSegmentsImageFilter.h b/Code/FeatureExtraction/otbExtractSegmentsImageFilter.h
index e928c6342dc58554a767bcdd63a6f597ed2f04af..5932a6ee883e7d84a33a3a5371a8f87bc3e70bdf 100755
--- a/Code/FeatureExtraction/otbExtractSegmentsImageFilter.h
+++ b/Code/FeatureExtraction/otbExtractSegmentsImageFilter.h
@@ -1,11 +1,18 @@
 /*=========================================================================
 
-  Programme :   OTB (ORFEO ToolBox)
-  Auteurs   :   CS - C.Ruffel
-  Language  :   C++
-  Date      :  19 avril 2006
-  Role      :  Extract Segments Composite Filter  
-  $Id$ 
+  Program:   ORFEO Toolbox
+  Language:  C++
+  Date:      $Date$
+  Version:   $Revision$
+
+
+  Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
+  See OTBCopyright.txt 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.
 
 =========================================================================*/
 #ifndef __otbExtractSegmentsImageFilter_h
diff --git a/Code/FeatureExtraction/otbExtractSegmentsImageFilter.txx b/Code/FeatureExtraction/otbExtractSegmentsImageFilter.txx
index 85af1623bb79eec16d5e2483a31c78665ebf0449..afc5eb99db93552f77bfe6e92e2c33a5ab783f90 100755
--- a/Code/FeatureExtraction/otbExtractSegmentsImageFilter.txx
+++ b/Code/FeatureExtraction/otbExtractSegmentsImageFilter.txx
@@ -1,11 +1,18 @@
 /*=========================================================================
 
-  Programme :   OTB (ORFEO ToolBox)
-  Auteurs   :   CS - C.Ruffel
-  Language  :   C++
-  Date      :   29 mars 2006
-  Role      :   Associative Symetrical Sum of Line Detector Image Filter 
-  $Id$ 
+  Program:   ORFEO Toolbox
+  Language:  C++
+  Date:      $Date$
+  Version:   $Revision$
+
+
+  Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
+  See OTBCopyright.txt 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.
 
 =========================================================================*/
 #ifndef __otbExtractSegmentsImageFilter_txx
diff --git a/Code/FeatureExtraction/otbFillGapsFilter.h b/Code/FeatureExtraction/otbFillGapsFilter.h
index cb5750af26052f168b9f896b2b0f3fca135c0b27..74e1ce0ab4c5053876f2ed984796eaabe90288bd 100644
--- a/Code/FeatureExtraction/otbFillGapsFilter.h
+++ b/Code/FeatureExtraction/otbFillGapsFilter.h
@@ -1,12 +1,18 @@
 /*=========================================================================
 
-  Programme :   OTB (ORFEO ToolBox)
-  Auteurs   :   CS - T.Feuvrier
-  Language  :   C++
-  Date      :   6 avril 2006
-  Version   :   
-  Role      :   Fill Gaps source Class
-  $Id$
+  Program:   ORFEO Toolbox
+  Language:  C++
+  Date:      $Date$
+  Version:   $Revision$
+
+
+  Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
+  See OTBCopyright.txt 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.
 
 =========================================================================*/
 #ifndef __otbFillGapsFilter_h
diff --git a/Code/FeatureExtraction/otbFillGapsFilter.txx b/Code/FeatureExtraction/otbFillGapsFilter.txx
index 78530ba22c94b32d926d94f7b9893a9083c666fd..f56f356b7e65a881a21bf4790352d7ad3debe9b7 100644
--- a/Code/FeatureExtraction/otbFillGapsFilter.txx
+++ b/Code/FeatureExtraction/otbFillGapsFilter.txx
@@ -1,12 +1,18 @@
 /*=========================================================================
 
-  Programme :   OTB (ORFEO ToolBox)
-  Auteurs   :   CS - T.Feuvrier
-  Language  :   C++
-  Date      :   6 avril 2006
-  Version   :   
-  Role      :   Fill Gaps source Class
-  $Id$
+  Program:   ORFEO Toolbox
+  Language:  C++
+  Date:      $Date$
+  Version:   $Revision$
+
+
+  Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
+  See OTBCopyright.txt 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.
 
 =========================================================================*/
 #ifndef __otbFillGapsFilter_txx
diff --git a/Code/FeatureExtraction/otbFlusserImageFunction.h b/Code/FeatureExtraction/otbFlusserImageFunction.h
index 4cc98db92c9f14b1fb3bc966015ce297a5f3045c..7875863543eacc4bd334b349644dbea9d595e08f 100644
--- a/Code/FeatureExtraction/otbFlusserImageFunction.h
+++ b/Code/FeatureExtraction/otbFlusserImageFunction.h
@@ -1,12 +1,18 @@
 /*=========================================================================
 
-  Programme :   OTB (ORFEO ToolBox)
-  Auteurs   :   CS - P. Imbo
-  Language  :   C++
-  Date      :   20 mars 2006
-  Version   :   
-  Role      :   Flusser's invariant Class of images 
-  $Id$
+  Program:   ORFEO Toolbox
+  Language:  C++
+  Date:      $Date$
+  Version:   $Revision$
+
+
+  Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
+  See OTBCopyright.txt 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.
 
 =========================================================================*/
 #ifndef _otbFlusserImageFunction_h
diff --git a/Code/FeatureExtraction/otbFlusserImageFunction.txx b/Code/FeatureExtraction/otbFlusserImageFunction.txx
index 3206b1d3c90ebaea02d779ab55058cadf3585ee9..f2dd987d7743caadada33434dc780e69f83683b7 100644
--- a/Code/FeatureExtraction/otbFlusserImageFunction.txx
+++ b/Code/FeatureExtraction/otbFlusserImageFunction.txx
@@ -1,12 +1,18 @@
 /*=========================================================================
 
-  Programme :   OTB (ORFEO ToolBox)
-  Auteurs   :   CS - P. Imbo
-  Language  :   C++
-  Date      :   20 mars 2006
-  Version   :   
-  Role      :   Flusser's invariant Class of images 
-  $Id:$
+  Program:   ORFEO Toolbox
+  Language:  C++
+  Date:      $Date$
+  Version:   $Revision$
+
+
+  Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
+  See OTBCopyright.txt 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.
 
 =========================================================================*/
 #ifndef _otbFlusserImageFunction_txx
diff --git a/Code/FeatureExtraction/otbFlusserPathFunction.h b/Code/FeatureExtraction/otbFlusserPathFunction.h
index 0a3ddcac4711fd2e15c027c70f30187eec5126d3..7ead22474479384af9cc1c61354127bcd9f62ae5 100644
--- a/Code/FeatureExtraction/otbFlusserPathFunction.h
+++ b/Code/FeatureExtraction/otbFlusserPathFunction.h
@@ -1,12 +1,18 @@
 /*=========================================================================
 
-  Programme :   OTB (ORFEO ToolBox)
-  Auteurs   :   CS - P. Imbo
-  Language  :   C++
-  Date      :   24 mars 2006
-  Version   :   
-  Role      :   Flusser's invariant Class of path 
-  $Id$
+  Program:   ORFEO Toolbox
+  Language:  C++
+  Date:      $Date$
+  Version:   $Revision$
+
+
+  Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
+  See OTBCopyright.txt 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.
 
 =========================================================================*/
 #ifndef _otbFlusserPathFunction_h
diff --git a/Code/FeatureExtraction/otbFlusserPathFunction.txx b/Code/FeatureExtraction/otbFlusserPathFunction.txx
index 3c5310cce68ad00283df85c00f2073e88f27b121..309922c00461589b100ac2b308e474cc0e854909 100644
--- a/Code/FeatureExtraction/otbFlusserPathFunction.txx
+++ b/Code/FeatureExtraction/otbFlusserPathFunction.txx
@@ -1,12 +1,18 @@
 /*=========================================================================
 
-  Programme :   OTB (ORFEO ToolBox)
-  Auteurs   :   CS - P. Imbo
-  Language  :   C++
-  Date      :   24 mars 2006
-  Version   :   
-  Role      :   Flusser's invariant Class of path 
-  $Id:$
+  Program:   ORFEO Toolbox
+  Language:  C++
+  Date:      $Date$
+  Version:   $Revision$
+
+
+  Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
+  See OTBCopyright.txt 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.
 
 =========================================================================*/
 #ifndef _otbFlusserPathFunction_txx
diff --git a/Code/FeatureExtraction/otbGeometricMomentImageFunction.h b/Code/FeatureExtraction/otbGeometricMomentImageFunction.h
index 95529ea33b95f13c71d1d0454e4fb824dcab2970..3c1e1ec261d1df91d9657e1b8a451fc0d4a6aa66 100644
--- a/Code/FeatureExtraction/otbGeometricMomentImageFunction.h
+++ b/Code/FeatureExtraction/otbGeometricMomentImageFunction.h
@@ -1,12 +1,18 @@
 /*=========================================================================
 
-  Programme :   OTB (ORFEO ToolBox)
-  Auteurs   :   CS - P. Imbo
-  Language  :   C++
-  Date      :   17 mars 2006
-  Version   :   
-  Role      :   Geometric Moments Class of images
-  $Id$
+  Program:   ORFEO Toolbox
+  Language:  C++
+  Date:      $Date$
+  Version:   $Revision$
+
+
+  Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
+  See OTBCopyright.txt 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.
 
 =========================================================================*/
 #ifndef _otbGeometricMomentImageFunction_h
diff --git a/Code/FeatureExtraction/otbGeometricMomentPathFunction.h b/Code/FeatureExtraction/otbGeometricMomentPathFunction.h
index ad65bccc5934667d55da65dd0b3f736887162a22..a1fcc7d20b2e61b9b9d9d703276f8b848497cb52 100644
--- a/Code/FeatureExtraction/otbGeometricMomentPathFunction.h
+++ b/Code/FeatureExtraction/otbGeometricMomentPathFunction.h
@@ -1,12 +1,18 @@
 /*=========================================================================
 
-  Programme :   OTB (ORFEO ToolBox)
-  Auteurs   :   CS - P. Imbo
-  Language  :   C++
-  Date      :   22 mars 2006
-  Version   :   
-  Role      :   Geometric Moments Class of path 
-  $Id$
+  Program:   ORFEO Toolbox
+  Language:  C++
+  Date:      $Date$
+  Version:   $Revision$
+
+
+  Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
+  See OTBCopyright.txt 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.
 
 =========================================================================*/
 #ifndef _otbGeometricMomentPathFunction_h
diff --git a/Code/FeatureExtraction/otbHarrisImageFilter.h b/Code/FeatureExtraction/otbHarrisImageFilter.h
index 8dfcd35a7343be383319d4b2f24fa2e8d3ae6aab..a9401cee298f71ae9b4ae85cbfcf590c7a71dae7 100644
--- a/Code/FeatureExtraction/otbHarrisImageFilter.h
+++ b/Code/FeatureExtraction/otbHarrisImageFilter.h
@@ -1,11 +1,18 @@
 /*=========================================================================
 
-  Programme :   OTB (ORFEO ToolBox)
-  Auteurs   :   CS - P.Imbo
-  Language  :   C++
-  Date      :  28 mars 2006
-  Role      :   Harris Filter 
-  $Id$ 
+  Program:   ORFEO Toolbox
+  Language:  C++
+  Date:      $Date$
+  Version:   $Revision$
+
+
+  Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
+  See OTBCopyright.txt 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.
 
 =========================================================================*/
 #ifndef __otbHarrisFilter_h
diff --git a/Code/FeatureExtraction/otbHarrisImageFilter.txx b/Code/FeatureExtraction/otbHarrisImageFilter.txx
index b3e571858787065eab96fba1db1f54713ebdcb76..40b812cb424eec0a54dc26a9f56a4841a20e11d8 100644
--- a/Code/FeatureExtraction/otbHarrisImageFilter.txx
+++ b/Code/FeatureExtraction/otbHarrisImageFilter.txx
@@ -1,11 +1,18 @@
 /*=========================================================================
 
-  Programme :   OTB (ORFEO ToolBox)
-  Auteurs   :   CS - P.Imbo
-  Language  :   C++
-  Date      :   28 mars 2006
-  Role      :   Harris image filter 
-  $Id$ 
+  Program:   ORFEO Toolbox
+  Language:  C++
+  Date:      $Date$
+  Version:   $Revision$
+
+
+  Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
+  See OTBCopyright.txt 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.
 
 =========================================================================*/
 #ifndef __otbHarrisImageFilter_txx
diff --git a/Code/FeatureExtraction/otbHarrisImageToPointSetFilter.h b/Code/FeatureExtraction/otbHarrisImageToPointSetFilter.h
index 5e40da4051010f93c79bec8c3c94519d72342201..f47ac3a203f659d45d970a540515ece3d7ae5c83 100644
--- a/Code/FeatureExtraction/otbHarrisImageToPointSetFilter.h
+++ b/Code/FeatureExtraction/otbHarrisImageToPointSetFilter.h
@@ -1,11 +1,18 @@
 /*=========================================================================
 
-  Programme :   OTB (ORFEO ToolBox)
-  Auteurs   :   CS - P.Imbo
-  Language  :   C++
-  Date      :   30 mars 2006
-  Role      :   Harris To PointSet Filter 
-  $Id$ 
+  Program:   ORFEO Toolbox
+  Language:  C++
+  Date:      $Date$
+  Version:   $Revision$
+
+
+  Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
+  See OTBCopyright.txt 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.
 
 =========================================================================*/
 #ifndef __otbHarrisImageToPointSetFilter_h
diff --git a/Code/FeatureExtraction/otbHarrisImageToPointSetFilter.txx b/Code/FeatureExtraction/otbHarrisImageToPointSetFilter.txx
index 8057581dec3d20b3c88a78925b28516ee8ff0be3..bb4e7134542fde075f2ec8e55f1deff9a12023e9 100644
--- a/Code/FeatureExtraction/otbHarrisImageToPointSetFilter.txx
+++ b/Code/FeatureExtraction/otbHarrisImageToPointSetFilter.txx
@@ -1,11 +1,18 @@
 /*=========================================================================
 
-  Programme :   OTB (ORFEO ToolBox)
-  Auteurs   :   CS - P.Imbo
-  Language  :   C++
-  Date      :   30 mars 2006
-  Role      :   Harris To PointSet Filter 
-  $Id$ 
+  Program:   ORFEO Toolbox
+  Language:  C++
+  Date:      $Date$
+  Version:   $Revision$
+
+
+  Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
+  See OTBCopyright.txt 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.
 
 =========================================================================*/
 #ifndef __otbHarrisImageToPointSetFilter_txx
diff --git a/Code/FeatureExtraction/otbHessianToScalarImageFilter.h b/Code/FeatureExtraction/otbHessianToScalarImageFilter.h
index 4f32d2c9b547ad37e6a1d8089806121e11965359..43b40472f75b0800eef85416c1cc0e1d7d69a36b 100644
--- a/Code/FeatureExtraction/otbHessianToScalarImageFilter.h
+++ b/Code/FeatureExtraction/otbHessianToScalarImageFilter.h
@@ -1,12 +1,18 @@
 /*=========================================================================
 
-  Programme :   OTB (ORFEO ToolBox)
-  Auteurs   :   CS - P. IMBO
-  Language  :   C++
-  Date      :   28 mars 2006
-  Version   :   
-  Role      :   
-  $Id$
+  Program:   ORFEO Toolbox
+  Language:  C++
+  Date:      $Date$
+  Version:   $Revision$
+
+
+  Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
+  See OTBCopyright.txt 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.
 
 =========================================================================*/
 #ifndef __otbHessianToScalarImageFilter_h
diff --git a/Code/FeatureExtraction/otbHuImageFunction.h b/Code/FeatureExtraction/otbHuImageFunction.h
index a4095572f2ab468928e0c6dca9dee7a1190eb6dc..b5bf0e55e3869f1e32691c2c3bac602d728859c5 100644
--- a/Code/FeatureExtraction/otbHuImageFunction.h
+++ b/Code/FeatureExtraction/otbHuImageFunction.h
@@ -1,12 +1,18 @@
 /*=========================================================================
 
-  Programme :   OTB (ORFEO ToolBox)
-  Auteurs   :   CS - P. Imbo
-  Language  :   C++
-  Date      :   20 mars 2006
-  Version   :   
-  Role      :   Hu's invariant Class of images 
-  $Id$
+  Program:   ORFEO Toolbox
+  Language:  C++
+  Date:      $Date$
+  Version:   $Revision$
+
+
+  Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
+  See OTBCopyright.txt 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.
 
 =========================================================================*/
 #ifndef _otbHuImageFunction_h
diff --git a/Code/FeatureExtraction/otbHuImageFunction.txx b/Code/FeatureExtraction/otbHuImageFunction.txx
index a4689aa4c5977e77e9feb9c263f4426878643e41..3c18fab248837cad89c5ce17d92d520d39f2761f 100644
--- a/Code/FeatureExtraction/otbHuImageFunction.txx
+++ b/Code/FeatureExtraction/otbHuImageFunction.txx
@@ -1,12 +1,18 @@
 /*=========================================================================
 
-  Programme :   OTB (ORFEO ToolBox)
-  Auteurs   :   CS - P. Imbo
-  Language  :   C++
-  Date      :   20 mars 2006
-  Version   :   
-  Role      :   Hu's invariant Class of images 
-  $Id:$
+  Program:   ORFEO Toolbox
+  Language:  C++
+  Date:      $Date$
+  Version:   $Revision$
+
+
+  Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
+  See OTBCopyright.txt 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.
 
 =========================================================================*/
 #ifndef _otbHuImageFunction_txx
diff --git a/Code/FeatureExtraction/otbHuPathFunction.h b/Code/FeatureExtraction/otbHuPathFunction.h
index 138adf30e240dd97be6ccb52f343f46c5237d5d6..94f2fed7437fa02d82b1e39d0f2f5f372c177037 100644
--- a/Code/FeatureExtraction/otbHuPathFunction.h
+++ b/Code/FeatureExtraction/otbHuPathFunction.h
@@ -1,12 +1,18 @@
 /*=========================================================================
 
-  Programme :   OTB (ORFEO ToolBox)
-  Auteurs   :   CS - P. Imbo
-  Language  :   C++
-  Date      :   24 mars 2006
-  Version   :   
-  Role      :   Hu's invariant Class of path 
-  $Id$
+  Program:   ORFEO Toolbox
+  Language:  C++
+  Date:      $Date$
+  Version:   $Revision$
+
+
+  Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
+  See OTBCopyright.txt 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.
 
 =========================================================================*/
 #ifndef _otbHuPathFunction_h
diff --git a/Code/FeatureExtraction/otbHuPathFunction.txx b/Code/FeatureExtraction/otbHuPathFunction.txx
index 15d15c871bf3d7778fb9b3752da07aec29bbffc5..e66c55e5957d5b2d3e940b3f140996f6439f71e5 100644
--- a/Code/FeatureExtraction/otbHuPathFunction.txx
+++ b/Code/FeatureExtraction/otbHuPathFunction.txx
@@ -1,12 +1,18 @@
 /*=========================================================================
 
-  Programme :   OTB (ORFEO ToolBox)
-  Auteurs   :   CS - P. Imbo
-  Language  :   C++
-  Date      :   24 mars 2006
-  Version   :   
-  Role      :   Hu's invariant Class of path 
-  $Id:$
+  Program:   ORFEO Toolbox
+  Language:  C++
+  Date:      $Date$
+  Version:   $Revision$
+
+
+  Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
+  See OTBCopyright.txt 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.
 
 =========================================================================*/
 #ifndef _otbHuPathFunction_txx
diff --git a/Code/FeatureExtraction/otbImageToPathListAlignFilter.h b/Code/FeatureExtraction/otbImageToPathListAlignFilter.h
index e1b9e369a58fa2a9022c19defa3c4a60ae447489..c30fa471d9d453a94f2a7a64ff595228ec5a5a6a 100644
--- a/Code/FeatureExtraction/otbImageToPathListAlignFilter.h
+++ b/Code/FeatureExtraction/otbImageToPathListAlignFilter.h
@@ -1,12 +1,18 @@
 /*=========================================================================
 
-  Programme :   OTB (ORFEO ToolBox)
-  Auteurs   :   CS - P.Imbo
-  Language  :   C++
-  Date      :   13 fevrier 2006
-  Version   :   
-  Role      :   
-  $Id: $
+  Program:   ORFEO Toolbox
+  Language:  C++
+  Date:      $Date$
+  Version:   $Revision$
+
+
+  Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
+  See OTBCopyright.txt 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.
 
 =========================================================================*/
 #ifndef __otbImageToPathListAlignFilter_h
diff --git a/Code/FeatureExtraction/otbImageToPathListAlignFilter.txx b/Code/FeatureExtraction/otbImageToPathListAlignFilter.txx
index cb04373b6404c51ac1c6f057d9ac95d6a6422ab4..05ebf7f134f1ae2acaf7dd41f9bbf8f60ea69ae6 100644
--- a/Code/FeatureExtraction/otbImageToPathListAlignFilter.txx
+++ b/Code/FeatureExtraction/otbImageToPathListAlignFilter.txx
@@ -1,12 +1,18 @@
 /*=========================================================================
 
-  Programme :   OTB (ORFEO ToolBox)
-  Auteurs   :   CS - P.Imbo
-  Language  :   C++
-  Date      :   08 fevrier 2006
-  Version   :   
-  Role      :   
-  $Id: $
+  Program:   ORFEO Toolbox
+  Language:  C++
+  Date:      $Date$
+  Version:   $Revision$
+
+
+  Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
+  See OTBCopyright.txt 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.
 
 =========================================================================*/
 #ifndef __otbImageToPathListAlignFilter_txx
@@ -225,7 +231,6 @@ ImageToPathListAlignFilter<TInputImage,TOutputPath>
 
   typename RealImageType::RegionType region;
   region.SetSize(InputImage->GetLargestPossibleRegion().GetSize());
-// OTB-FA-00012-CS  
   IndexOut[0] = 0;
   IndexOut[1] = 0;
 //  region.SetIndex(InputImage->GetLargestPossibleRegion().GetIndex());
@@ -329,7 +334,6 @@ ImageToPathListAlignFilter<TInputImage,TOutputPath>
 
 
   // Get the input and output pointers 
-// OTB-FA-00010-CS  
   const InputImageType  * InputImage   = this->GetInput();
   OutputPathListType *   OutputPath   = this->GetOutput();
   // Generate the image
diff --git a/Code/FeatureExtraction/otbImageToTreeFilter.h b/Code/FeatureExtraction/otbImageToTreeFilter.h
index 7f6ff5b20d47666fd6ece4d17e2a75087eabca72..4fbf81bf71929fa28dae3b98c3fbe3c06e0ce9e4 100644
--- a/Code/FeatureExtraction/otbImageToTreeFilter.h
+++ b/Code/FeatureExtraction/otbImageToTreeFilter.h
@@ -1,12 +1,18 @@
 /*=========================================================================
 
-  Programme :   OTB (ORFEO ToolBox)
-  Auteurs   :   CS - P. Imbo
-  Language  :   C++
-  Date      :   20 fevrier 2006
-  Version   :   
-  Role      :   Classe de base d'une TreeList 
-  $Id:$
+  Program:   ORFEO Toolbox
+  Language:  C++
+  Date:      $Date$
+  Version:   $Revision$
+
+
+  Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
+  See OTBCopyright.txt 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.
 
 =========================================================================*/
 #ifndef __otbImageToTreeFilter_h
diff --git a/Code/FeatureExtraction/otbImageToTreeFilter.txx b/Code/FeatureExtraction/otbImageToTreeFilter.txx
index fcffb6718db00ad1c0428fbd000a4a40f5a40355..4208f21036231eecc0caff1b0ed3372546272010 100644
--- a/Code/FeatureExtraction/otbImageToTreeFilter.txx
+++ b/Code/FeatureExtraction/otbImageToTreeFilter.txx
@@ -1,12 +1,18 @@
 /*=========================================================================
 
-  Programme :   OTB (ORFEO ToolBox)
-  Auteurs   :   CS - P. Imbo
-  Language  :   C++
-  Date      :   20 fevrier 2006
-  Version   :   
-  Role      :   Classe de base d'un filtre de "Tree" 
-  $Id:$
+  Program:   ORFEO Toolbox
+  Language:  C++
+  Date:      $Date$
+  Version:   $Revision$
+
+
+  Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
+  See OTBCopyright.txt 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.
 
 =========================================================================*/
 
diff --git a/Code/FeatureExtraction/otbLineCorrelationDetectorImageFilter.h b/Code/FeatureExtraction/otbLineCorrelationDetectorImageFilter.h
index 9b747979ec526e24bc96646770e2632a4da6aaa0..e9a836edfb8f88b1594d5eb1162c5610cb45e7fe 100755
--- a/Code/FeatureExtraction/otbLineCorrelationDetectorImageFilter.h
+++ b/Code/FeatureExtraction/otbLineCorrelationDetectorImageFilter.h
@@ -1,11 +1,18 @@
 /*=========================================================================
 
-  Programme :   OTB (ORFEO ToolBox)
-  Auteurs   :   CS - C.Ruffel
-  Language  :   C++
-  Date      :   14 mars 2006
-  Role      :   Filter of detection of linear features 
-  $Id$ 
+  Program:   ORFEO Toolbox
+  Language:  C++
+  Date:      $Date$
+  Version:   $Revision$
+
+
+  Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
+  See OTBCopyright.txt 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.
 
 =========================================================================*/
 #ifndef __otbLineCorrelationDetectorImageFilter_h
diff --git a/Code/FeatureExtraction/otbLineCorrelationDetectorImageFilter.txx b/Code/FeatureExtraction/otbLineCorrelationDetectorImageFilter.txx
index fd1d04e3ec9ee21b7d2b204c1d4035985271c854..a9fe38254495fb6c5e4c0e952cbc436d2ea3c255 100755
--- a/Code/FeatureExtraction/otbLineCorrelationDetectorImageFilter.txx
+++ b/Code/FeatureExtraction/otbLineCorrelationDetectorImageFilter.txx
@@ -1,11 +1,18 @@
 /*=========================================================================
 
-  Programme :   OTB (ORFEO ToolBox)
-  Auteurs   :   CS - C.Ruffel
-  Language  :   C++
-  Date      :   14 mars 2006
-  Role      :   Filter of detection of linear features 
-  $Id$ 
+  Program:   ORFEO Toolbox
+  Language:  C++
+  Date:      $Date$
+  Version:   $Revision$
+
+
+  Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
+  See OTBCopyright.txt 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.
 
 =========================================================================*/
 #ifndef __otbLineCorrelationDetectorImageFilter_txx
diff --git a/Code/FeatureExtraction/otbLineDetectorImageFilterBase.h b/Code/FeatureExtraction/otbLineDetectorImageFilterBase.h
index 449a443fe4d063297fd303fe3aae8b4cd5d92096..7503891c28f109595d9197b5e9cc34d962baed35 100755
--- a/Code/FeatureExtraction/otbLineDetectorImageFilterBase.h
+++ b/Code/FeatureExtraction/otbLineDetectorImageFilterBase.h
@@ -1,11 +1,18 @@
 /*=========================================================================
 
-  Programme :   OTB (ORFEO ToolBox)
-  Auteurs   :   CS - C.Ruffel
-  Language  :   C++
-  Date      :   14 mars 2006
-  Role      :   Filter of detection of linear features 
-  $Id: otbLineDetectorImageFilterBase.h 503 2006-04-20 09:42:58Z caroline $ 
+  Program:   ORFEO Toolbox
+  Language:  C++
+  Date:      $Date$
+  Version:   $Revision$
+
+
+  Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
+  See OTBCopyright.txt 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.
 
 =========================================================================*/
 #ifndef __otbLineDetectorImageFilterBase_h
diff --git a/Code/FeatureExtraction/otbLineDetectorImageFilterBase.txx b/Code/FeatureExtraction/otbLineDetectorImageFilterBase.txx
index b7b902e262bb5b22a35f788c0850cf8f8673b64a..66da4d9c17a22bfad0274a25211a36808a417713 100755
--- a/Code/FeatureExtraction/otbLineDetectorImageFilterBase.txx
+++ b/Code/FeatureExtraction/otbLineDetectorImageFilterBase.txx
@@ -1,11 +1,18 @@
 /*=========================================================================
 
-  Programme :   OTB (ORFEO ToolBox)
-  Auteurs   :   CS - C.Ruffel
-  Language  :   C++
-  Date      :   14 mars 2006
-  Role      :   Filter of detection of linear features 
-  $Id$ 
+  Program:   ORFEO Toolbox
+  Language:  C++
+  Date:      $Date$
+  Version:   $Revision$
+
+
+  Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
+  See OTBCopyright.txt 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.
 
 =========================================================================*/
 #ifndef __otbLineDetectorImageFilterBase_txx
diff --git a/Code/FeatureExtraction/otbLineRatioDetectorImageFilter.h b/Code/FeatureExtraction/otbLineRatioDetectorImageFilter.h
index eea869ff9fab19574bc0ca27aa315bf25dc4af75..6021f282961d5de7deac676e1c9e0e7817d4660a 100755
--- a/Code/FeatureExtraction/otbLineRatioDetectorImageFilter.h
+++ b/Code/FeatureExtraction/otbLineRatioDetectorImageFilter.h
@@ -1,11 +1,18 @@
 /*=========================================================================
 
-  Programme :   OTB (ORFEO ToolBox)
-  Auteurs   :   
-  Language  :   C++
-  Date      :   14 mars 2006
-  Role      :   Filter of detection of linear features 
-  $Id$
+  Program:   ORFEO Toolbox
+  Language:  C++
+  Date:      $Date$
+  Version:   $Revision$
+
+
+  Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
+  See OTBCopyright.txt 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.
 
 =========================================================================*/
 #ifndef __otbLineRatioDetectorImageFilter_h
diff --git a/Code/FeatureExtraction/otbLineRatioDetectorImageFilter.txx b/Code/FeatureExtraction/otbLineRatioDetectorImageFilter.txx
index dc79d6afc58f732bac81b3b64f0e88303a9bd546..db347253ec4f733ca03e793ddd81989edd5bcff9 100755
--- a/Code/FeatureExtraction/otbLineRatioDetectorImageFilter.txx
+++ b/Code/FeatureExtraction/otbLineRatioDetectorImageFilter.txx
@@ -1,11 +1,18 @@
 /*=========================================================================
 
-  Programme :   OTB (ORFEO ToolBox)
-  Auteurs   :   CS - C.Ruffel
-  Language  :   C++
-  Date      :   14 mars 2006
-  Role      :   Filter of detection of linear features 
-  $Id$ 
+  Program:   ORFEO Toolbox
+  Language:  C++
+  Date:      $Date$
+  Version:   $Revision$
+
+
+  Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
+  See OTBCopyright.txt 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.
 
 =========================================================================*/
 #ifndef __otbLineRatioDetectorImageFilter_txx
diff --git a/Code/FeatureExtraction/otbLocalHoughFilter.h b/Code/FeatureExtraction/otbLocalHoughFilter.h
index ffc96c4326e28bc88b9d99fe960d7cab26ae75ea..c92b4e2bb0225bbda0f6847696bb98884762cc3a 100644
--- a/Code/FeatureExtraction/otbLocalHoughFilter.h
+++ b/Code/FeatureExtraction/otbLocalHoughFilter.h
@@ -1,12 +1,18 @@
 /*=========================================================================
 
-  Programme :   OTB (ORFEO ToolBox)
-  Auteurs   :   CS - C.Ruffel
-  Language  :   C++
-  Date      :   11 avril 2006
-  Version   :   
-  Role      :   Local Hough Filter
-  $Id$
+  Program:   ORFEO Toolbox
+  Language:  C++
+  Date:      $Date$
+  Version:   $Revision$
+
+
+  Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
+  See OTBCopyright.txt 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.
 
 =========================================================================*/
 #ifndef _otbLocalHoughFilter_h
diff --git a/Code/FeatureExtraction/otbLocalHoughFilter.txx b/Code/FeatureExtraction/otbLocalHoughFilter.txx
index 7ab3c643454f09ed9db85fd295e5f171da4a5005..45046c0f36d537590b26d29098b228070eacaea5 100755
--- a/Code/FeatureExtraction/otbLocalHoughFilter.txx
+++ b/Code/FeatureExtraction/otbLocalHoughFilter.txx
@@ -1,12 +1,18 @@
 /*=========================================================================
 
-  Programme :   OTB (ORFEO ToolBox)
-  Auteurs   :   CS - C.Ruffel
-  Language  :   C++
-  Date      :   11 avril 2006
-  Version   :   
-  Role      :    Local Hough Filter
-  $Id: $
+  Program:   ORFEO Toolbox
+  Language:  C++
+  Date:      $Date$
+  Version:   $Revision$
+
+
+  Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
+  See OTBCopyright.txt 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.
 
 =========================================================================*/
 #ifndef _otbLocalHoughFilter_txx
diff --git a/Code/FeatureExtraction/otbMultiplyByScalarImageFilter.h b/Code/FeatureExtraction/otbMultiplyByScalarImageFilter.h
index a2518749acabc541ff2ccb7fda68912eeff21737..b9d478a643551e0d9f80eee57ac436b5da1ed386 100644
--- a/Code/FeatureExtraction/otbMultiplyByScalarImageFilter.h
+++ b/Code/FeatureExtraction/otbMultiplyByScalarImageFilter.h
@@ -1,12 +1,18 @@
 /*=========================================================================
 
-  Programme :   OTB (ORFEO ToolBox)
-  Auteurs   :   CS - P. IMBO
-  Language  :   C++
-  Date      :   28 mars 2006
-  Version   :   
-  Role      :   
-  $Id$
+  Program:   ORFEO Toolbox
+  Language:  C++
+  Date:      $Date$
+  Version:   $Revision$
+
+
+  Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
+  See OTBCopyright.txt 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.
 
 =========================================================================*/
 #ifndef __otbMultiplyByScalarImageFilter_h
diff --git a/Code/FeatureExtraction/otbPixelSuppressionByDirectionImageFilter.h b/Code/FeatureExtraction/otbPixelSuppressionByDirectionImageFilter.h
index 90fa29fb6b89596922a226d2188e1ab9efbf24c4..bb21d00ef8b05f6db97d739dd6228bcec060fa8e 100755
--- a/Code/FeatureExtraction/otbPixelSuppressionByDirectionImageFilter.h
+++ b/Code/FeatureExtraction/otbPixelSuppressionByDirectionImageFilter.h
@@ -1,11 +1,18 @@
 /*=========================================================================
 
-  Programme :   OTB (ORFEO ToolBox)
-  Auteurs   :   CS - C.Ruffel
-  Language  :   C++
-  Date      :   30 mars 2006
-  Role      :   Filtre de suppression des pixels isoles par direction  
-  $Id$ 
+  Program:   ORFEO Toolbox
+  Language:  C++
+  Date:      $Date$
+  Version:   $Revision$
+
+
+  Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
+  See OTBCopyright.txt 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.
 
 =========================================================================*/
 #ifndef __otbPixelSuppressionByDirectionImageFilter_h
diff --git a/Code/FeatureExtraction/otbPixelSuppressionByDirectionImageFilter.txx b/Code/FeatureExtraction/otbPixelSuppressionByDirectionImageFilter.txx
index 3b58b1217d9ef81a1e54bc5eaba36cd42c07daa8..062197f2f45c35020c0f93b74afa85834e5b0726 100755
--- a/Code/FeatureExtraction/otbPixelSuppressionByDirectionImageFilter.txx
+++ b/Code/FeatureExtraction/otbPixelSuppressionByDirectionImageFilter.txx
@@ -1,11 +1,18 @@
 /*=========================================================================
 
-  Programme :   OTB (ORFEO ToolBox)
-  Auteurs   :   CS - C.Ruffel
-  Language  :   C++
-  Date      :   30 mars 2006
-  Role      :   Filtre de suppression des pixels isoles par direction  
-  $Id: $ 
+  Program:   ORFEO Toolbox
+  Language:  C++
+  Date:      $Date$
+  Version:   $Revision$
+
+
+  Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
+  See OTBCopyright.txt 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.
 
 =========================================================================*/
 #ifndef __otbPixelSuppressionByDirectionImageFilter_txx
diff --git a/Code/FeatureExtraction/otbRealMomentImageFunction.h b/Code/FeatureExtraction/otbRealMomentImageFunction.h
index 7d33c7a8180a06c1db7cb305f02b38b1052ba362..7dbd6e860351cd8deca9ca96695c3d558d052398 100644
--- a/Code/FeatureExtraction/otbRealMomentImageFunction.h
+++ b/Code/FeatureExtraction/otbRealMomentImageFunction.h
@@ -1,12 +1,18 @@
 /*=========================================================================
 
-  Programme :   OTB (ORFEO ToolBox)
-  Auteurs   :   CS - P. Imbo
-  Language  :   C++
-  Date      :   17 mars 2006
-  Version   :   
-  Role      :   Real Geometric Moments Class of iamges 
-  $Id$
+  Program:   ORFEO Toolbox
+  Language:  C++
+  Date:      $Date$
+  Version:   $Revision$
+
+
+  Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
+  See OTBCopyright.txt 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.
 
 =========================================================================*/
 #ifndef _otbRealMomentImageFunction_h
diff --git a/Code/FeatureExtraction/otbRealMomentPathFunction.h b/Code/FeatureExtraction/otbRealMomentPathFunction.h
index a4c64864fcc31833611efabac1046fd8b5f94cca..6756263acc2abf176c790c2037fa5bf73239668a 100644
--- a/Code/FeatureExtraction/otbRealMomentPathFunction.h
+++ b/Code/FeatureExtraction/otbRealMomentPathFunction.h
@@ -1,12 +1,18 @@
 /*=========================================================================
 
-  Programme :   OTB (ORFEO ToolBox)
-  Auteurs   :   CS - P. Imbo
-  Language  :   C++
-  Date      :   22 mars 2006
-  Version   :   
-  Role      :   Real Geometric Moments Class of Path 
-  $Id$
+  Program:   ORFEO Toolbox
+  Language:  C++
+  Date:      $Date$
+  Version:   $Revision$
+
+
+  Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
+  See OTBCopyright.txt 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.
 
 =========================================================================*/
 #ifndef _otbRealMomentPathFunction_h
diff --git a/Code/FeatureExtraction/otbShape.h b/Code/FeatureExtraction/otbShape.h
index 4151c42dedfb90d2ca72afe5206de50c264bba8b..de4f73eda1b656afe384c0b6312d7c88423ca352 100644
--- a/Code/FeatureExtraction/otbShape.h
+++ b/Code/FeatureExtraction/otbShape.h
@@ -1,12 +1,18 @@
 /*=========================================================================
 
-  Programme :   OTB (ORFEO ToolBox)
-  Auteurs   :   CS - P.Imbo
-  Language  :   C++
-  Date      :   04 avril 2006
-  Version   :   
-  Role      :   
-  $Id$
+  Program:   ORFEO Toolbox
+  Language:  C++
+  Date:      $Date$
+  Version:   $Revision$
+
+
+  Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
+  See OTBCopyright.txt 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.
 
 =========================================================================*/
 #ifndef __otbShape_h
diff --git a/Code/FeatureExtraction/otbShape.txx b/Code/FeatureExtraction/otbShape.txx
index 0c006692e4296a93ee9f2bc803b61da8d4a2904e..5ab8ba41fc40c5d54094ee21695845d2891cfe50 100644
--- a/Code/FeatureExtraction/otbShape.txx
+++ b/Code/FeatureExtraction/otbShape.txx
@@ -1,12 +1,18 @@
 /*=========================================================================
 
-  Programme :   OTB (ORFEO ToolBox)
-  Auteurs   :   CS - P.Imbo
-  Language  :   C++
-  Date      :   04 avril 2006
-  Version   :   
-  Role      :   Basic memory routines for the Point_plane, Shape and Shapes structures
-  $Id: $
+  Program:   ORFEO Toolbox
+  Language:  C++
+  Date:      $Date$
+  Version:   $Revision$
+
+
+  Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
+  See OTBCopyright.txt 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.
 
 =========================================================================*/
 
diff --git a/Code/FeatureExtraction/otbThresholdImageToPointSetFilter.h b/Code/FeatureExtraction/otbThresholdImageToPointSetFilter.h
index bd531da029f69e72ef0a16706335c0594fc41587..41c84859fd93391cae062c52679ccb35fc8e1efa 100644
--- a/Code/FeatureExtraction/otbThresholdImageToPointSetFilter.h
+++ b/Code/FeatureExtraction/otbThresholdImageToPointSetFilter.h
@@ -1,11 +1,18 @@
 /*=========================================================================
 
-  Programme :   OTB (ORFEO ToolBox)
-  Auteurs   :   CS - P.Imbo
-  Language  :   C++
-  Date      :   30 mars 2006
-  Role      :   Threshold To PointSet Filter 
-  $Id$ 
+  Program:   ORFEO Toolbox
+  Language:  C++
+  Date:      $Date$
+  Version:   $Revision$
+
+
+  Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
+  See OTBCopyright.txt 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.
 
 =========================================================================*/
 #ifndef __otbThresholdImageToPointSetFilter_h
diff --git a/Code/FeatureExtraction/otbThresholdImageToPointSetFilter.txx b/Code/FeatureExtraction/otbThresholdImageToPointSetFilter.txx
index 84107f12a47895f871b8c0338ffb8726dd3627ce..0fb0f1a382625fb8fca32cacbb9004660f09a6ea 100644
--- a/Code/FeatureExtraction/otbThresholdImageToPointSetFilter.txx
+++ b/Code/FeatureExtraction/otbThresholdImageToPointSetFilter.txx
@@ -1,11 +1,18 @@
 /*=========================================================================
 
-  Programme :   OTB (ORFEO ToolBox)
-  Auteurs   :   CS - P.Imbo
-  Language  :   C++
-  Date      :   30 mars 2006
-  Role      :   ThresholdImage To PointSet Filter  
-  $Id$ 
+  Program:   ORFEO Toolbox
+  Language:  C++
+  Date:      $Date$
+  Version:   $Revision$
+
+
+  Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
+  See OTBCopyright.txt 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.
 
 =========================================================================*/
 #ifndef __otbThresholdImageToPointSetFilter_txx
diff --git a/Code/FeatureExtraction/otbTouziEdgeDetectorImageFilter.h b/Code/FeatureExtraction/otbTouziEdgeDetectorImageFilter.h
index b623df2c412e9c2aa3efd5db4a882ac0acc6c8c5..c9d8ecd95f9ba670ea8fa34cb32206840edb727c 100755
--- a/Code/FeatureExtraction/otbTouziEdgeDetectorImageFilter.h
+++ b/Code/FeatureExtraction/otbTouziEdgeDetectorImageFilter.h
@@ -1,11 +1,18 @@
 /*=========================================================================
 
-  Programme :   OTB (ORFEO ToolBox)
-  Auteurs   :   CS - C.Ruffel
-  Language  :   C++
-  Date      :   09 mars 2006
-  Role      :   Filter of detection of contours 
-  $Id$ 
+  Program:   ORFEO Toolbox
+  Language:  C++
+  Date:      $Date$
+  Version:   $Revision$
+
+
+  Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
+  See OTBCopyright.txt 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.
 
 =========================================================================*/
 #ifndef __otbTouziEdgeDetectorImageFilter_h
diff --git a/Code/FeatureExtraction/otbTouziEdgeDetectorImageFilter.txx b/Code/FeatureExtraction/otbTouziEdgeDetectorImageFilter.txx
index eae92682dd8728b2c7828b782d6fc2068d8888bb..ee68b4f1e951d25110d642f7216f9381940e8fe7 100755
--- a/Code/FeatureExtraction/otbTouziEdgeDetectorImageFilter.txx
+++ b/Code/FeatureExtraction/otbTouziEdgeDetectorImageFilter.txx
@@ -1,11 +1,18 @@
 /*=========================================================================
 
-  Programme :   OTB (ORFEO ToolBox)
-  Auteurs   :   CS - C.Ruffel
-  Language  :   C++
-  Date      :   09 mars 2006
-  Role      :   Filter detection of contours 
-  $Id$ 
+  Program:   ORFEO Toolbox
+  Language:  C++
+  Date:      $Date$
+  Version:   $Revision$
+
+
+  Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
+  See OTBCopyright.txt 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.
 
 =========================================================================*/
 #ifndef __otbTouziEdgeDetectorImageFilter_txx
diff --git a/Code/FeatureExtraction/otbTreeNeighborhood.h b/Code/FeatureExtraction/otbTreeNeighborhood.h
index f3dacfd57fb879d49a39d3358825b555404f1661..93737d5a29b7d56a38ccab8990b6e797df267433 100644
--- a/Code/FeatureExtraction/otbTreeNeighborhood.h
+++ b/Code/FeatureExtraction/otbTreeNeighborhood.h
@@ -1,11 +1,18 @@
 /*=========================================================================
 
-  Programme :   OTB (ORFEO ToolBox)
-  Auteurs   :   CS - P.Imbo
-  Language  :   C++
-  Date      :   20 fevrier 2006
-  Role      :  Definition de la classe TreeNeighborhood
-  $Id$ 
+  Program:   ORFEO Toolbox
+  Language:  C++
+  Date:      $Date$
+  Version:   $Revision$
+
+
+  Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
+  See OTBCopyright.txt 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.
 
 =========================================================================*/
  
diff --git a/Code/FeatureExtraction/otbTreeNeighborhood.txx b/Code/FeatureExtraction/otbTreeNeighborhood.txx
index 58dfc9f86f69870aee1c6fce4630d04a0be8b89a..d573930fadaa690e4d2765e486ed66a82c4686af 100644
--- a/Code/FeatureExtraction/otbTreeNeighborhood.txx
+++ b/Code/FeatureExtraction/otbTreeNeighborhood.txx
@@ -1,11 +1,18 @@
 /*=========================================================================
 
-  Programme :   OTB (ORFEO ToolBox)
-  Auteurs   :   CS - P.Imbo
-  Language  :   C++
-  Date      :   20 fevrier 2006
-  Role      :  Definition de la classe TreeSource 
-  $Id$ 
+  Program:   ORFEO Toolbox
+  Language:  C++
+  Date:      $Date$
+  Version:   $Revision$
+
+
+  Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
+  See OTBCopyright.txt 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.
 
 =========================================================================*/
  
diff --git a/Code/FeatureExtraction/otbTreeSource.h b/Code/FeatureExtraction/otbTreeSource.h
index fa03751ab0a86c4cff51f409443c8fcd9362f936..e903756b91c35a43b79a895e59440ed0ca01a44c 100644
--- a/Code/FeatureExtraction/otbTreeSource.h
+++ b/Code/FeatureExtraction/otbTreeSource.h
@@ -1,11 +1,18 @@
 /*=========================================================================
 
-  Programme :   OTB (ORFEO ToolBox)
-  Auteurs   :   CS - P.Imbo
-  Language  :   C++
-  Date      :   20 fevrier 2006
-  Role      :  Definition de la classe TreeSource 
-  $Id$ 
+  Program:   ORFEO Toolbox
+  Language:  C++
+  Date:      $Date$
+  Version:   $Revision$
+
+
+  Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
+  See OTBCopyright.txt 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.
 
 =========================================================================*/
 #ifndef __otbTreeSource_h
diff --git a/Code/FeatureExtraction/otbTreeSource.txx b/Code/FeatureExtraction/otbTreeSource.txx
index 32682b488d1b492ba58451932dd2066964b381ac..a55eb1f8af3109966c3275930375272574508336 100644
--- a/Code/FeatureExtraction/otbTreeSource.txx
+++ b/Code/FeatureExtraction/otbTreeSource.txx
@@ -1,11 +1,18 @@
 /*=========================================================================
 
-  Programme :   OTB (ORFEO ToolBox)
-  Auteurs   :   CS - P.Imbo
-  Language  :   C++
-  Date      :   20 fevrier 2006
-  Role      :  Definition de la classe TreeSource 
-  $Id$ 
+  Program:   ORFEO Toolbox
+  Language:  C++
+  Date:      $Date$
+  Version:   $Revision$
+
+
+  Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
+  See OTBCopyright.txt 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.
 
 =========================================================================*/
 #ifndef _otbTreeSource_txx
diff --git a/Code/IO/otbCAIImageIO.cxx b/Code/IO/otbCAIImageIO.cxx
index 69902a37153a566b1d5f2644e310eccc8d215c60..15e62eea38ffcb8366011951713fd42ba9bcec9b 100755
--- a/Code/IO/otbCAIImageIO.cxx
+++ b/Code/IO/otbCAIImageIO.cxx
@@ -1,3 +1,20 @@
+/*=========================================================================
+
+  Program:   ORFEO Toolbox
+  Language:  C++
+  Date:      $Date$
+  Version:   $Revision$
+
+
+  Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
+  See OTBCopyright.txt 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.
+
+=========================================================================*/
 #include "otbCAIImageIO.h"
 
 // Pour CAI
diff --git a/Code/IO/otbCAIImageIO.h b/Code/IO/otbCAIImageIO.h
index 67873c05388d2a7c9ae7cf54eff238e5dedca894..44aa6a0fb45da9c2bac7cdfbc13dcf0c90997591 100755
--- a/Code/IO/otbCAIImageIO.h
+++ b/Code/IO/otbCAIImageIO.h
@@ -1,12 +1,18 @@
 /*=========================================================================
 
-  Programme :   OTB (ORFEO ToolBox)
-  Auteurs   :   CS - T.Feuvrier
-  Language  :   C++
-  Date      :   11 janvier 2005
-  Version   :   
-  Role      :   Classe IO image pour le format CAI
-  $Id$
+  Program:   ORFEO Toolbox
+  Language:  C++
+  Date:      $Date$
+  Version:   $Revision$
+
+
+  Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
+  See OTBCopyright.txt 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.
 
 =========================================================================*/
 #ifndef __otbCAIImageIO_h
diff --git a/Code/IO/otbCAIImageIOFactory.cxx b/Code/IO/otbCAIImageIOFactory.cxx
index 83b02a3b0d13d8518702b634a4d37588b720e25b..03b16aa7bc3513a04f39f9b752d400cb56ff05b1 100755
--- a/Code/IO/otbCAIImageIOFactory.cxx
+++ b/Code/IO/otbCAIImageIOFactory.cxx
@@ -1,3 +1,20 @@
+/*=========================================================================
+
+  Program:   ORFEO Toolbox
+  Language:  C++
+  Date:      $Date$
+  Version:   $Revision$
+
+
+  Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
+  See OTBCopyright.txt 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.
+
+=========================================================================*/
 #include "otbCAIImageIOFactory.h"
 #include "itkCreateObjectFunction.h"
 #include "otbCAIImageIO.h"
diff --git a/Code/IO/otbCAIImageIOFactory.h b/Code/IO/otbCAIImageIOFactory.h
index fe04ce184eca7eb5c7e044efd119ebe531d44823..b34ea963b73674de885e8fb02d8514b11d88c655 100755
--- a/Code/IO/otbCAIImageIOFactory.h
+++ b/Code/IO/otbCAIImageIOFactory.h
@@ -1,12 +1,18 @@
 /*=========================================================================
 
-  Programme :   OTB (ORFEO ToolBox)
-  Auteurs   :   CS - T.Feuvrier
-  Language  :   C++
-  Date      :   11 janvier 2005
-  Version   :   
-  Role      :   Création d'instances d'objet ImageIO utilisant les object factory
-  $Id$
+  Program:   ORFEO Toolbox
+  Language:  C++
+  Date:      $Date$
+  Version:   $Revision$
+
+
+  Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
+  See OTBCopyright.txt 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.
 
 =========================================================================*/
 #ifndef __otbCAIImageIOFactory_h
diff --git a/Code/IO/otbGDALImageIO.cxx b/Code/IO/otbGDALImageIO.cxx
index a6c21f573035d7d510e475e838321292361ec141..cb46d4265dc9cc15b0b880a82c0f37436a001cbf 100755
--- a/Code/IO/otbGDALImageIO.cxx
+++ b/Code/IO/otbGDALImageIO.cxx
@@ -1,3 +1,21 @@
+/*=========================================================================
+
+  Program:   ORFEO Toolbox
+  Language:  C++
+  Date:      $Date$
+  Version:   $Revision$
+
+
+  Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
+  See OTBCopyright.txt 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.
+
+=========================================================================*/
+
 #include "itkExceptionObject.h"
 #include "itkMacro.h"
 #include "itkByteSwapper.h"
@@ -397,7 +415,6 @@ void GDALImageIO::InternalReadImageInformation()
       {
       SetComponentType(INT);
       }
-// OTB-FA-00005-CS
     else if((m_PxType == GDT_Float32) || (m_PxType == GDT_CFloat32) )
       {
       SetComponentType(FLOAT);
diff --git a/Code/IO/otbGDALImageIO.h b/Code/IO/otbGDALImageIO.h
index d11e250c752a8bfdea1d19171a810a22093a5141..a9de3fc8aafe5d84d26ace197b00612c9a95600a 100755
--- a/Code/IO/otbGDALImageIO.h
+++ b/Code/IO/otbGDALImageIO.h
@@ -1,12 +1,18 @@
 /*=========================================================================
 
-  Programme :   OTB (ORFEO ToolBox)
-  Auteurs   :   CS - T.Feuvrier
-  Language  :   C++
-  Date      :   17 janvier 2005
-  Version   :   
-  Role      :   Classe IO image pour le format GDAL
-  $Id$
+  Program:   ORFEO Toolbox
+  Language:  C++
+  Date:      $Date$
+  Version:   $Revision$
+
+
+  Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
+  See OTBCopyright.txt 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.
 
 =========================================================================*/
 #ifndef __otbGDALImageIO_h
diff --git a/Code/IO/otbGDALImageIOFactory.cxx b/Code/IO/otbGDALImageIOFactory.cxx
index 8f4a710a03132621470e0783699c5a12441dcdc7..d47382082809aabcab042688e0ee384ad6c59f02 100755
--- a/Code/IO/otbGDALImageIOFactory.cxx
+++ b/Code/IO/otbGDALImageIOFactory.cxx
@@ -1,3 +1,20 @@
+/*=========================================================================
+
+  Program:   ORFEO Toolbox
+  Language:  C++
+  Date:      $Date$
+  Version:   $Revision$
+
+
+  Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
+  See OTBCopyright.txt 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.
+
+=========================================================================*/
 #include "otbGDALImageIOFactory.h"
 
 #include "itkCreateObjectFunction.h"
diff --git a/Code/IO/otbGDALImageIOFactory.h b/Code/IO/otbGDALImageIOFactory.h
index 156149488a5a8369e476af78722c4374538ea953..ba4d17973b68e5dda8dedd5ea403067f909f6883 100755
--- a/Code/IO/otbGDALImageIOFactory.h
+++ b/Code/IO/otbGDALImageIOFactory.h
@@ -1,14 +1,21 @@
 /*=========================================================================
 
-  Programme :   OTB (ORFEO ToolBox)
-  Auteurs   :   CS - T.Feuvrier
-  Language  :   C++
-  Date      :   11 janvier 2005
-  Version   :   
-  Role      :   Création d'instances d'objet GDALImageIO utilisant les object factory
-  $Id$
+  Program:   ORFEO Toolbox
+  Language:  C++
+  Date:      $Date$
+  Version:   $Revision$
+
+
+  Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
+  See OTBCopyright.txt 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.
 
 =========================================================================*/
+
 #ifndef __otbGDALImageIOFactory_h
 #define __otbGDALImageIOFactory_h
 
diff --git a/Code/IO/otbImage.h b/Code/IO/otbImage.h
index 63ca740b2aa609b03c8d0b84c9f3f67f49c28bcc..7a751a27a75419d72455732990f1088c977bfd11 100755
--- a/Code/IO/otbImage.h
+++ b/Code/IO/otbImage.h
@@ -1,12 +1,18 @@
 /*=========================================================================
 
-  Programme :   OTB (ORFEO ToolBox)
-  Auteurs   :   CS - C.Ruffel
-  Language  :   C++
-  Date      :   21 avril 2006
-  Version   :   
-  Role      :   Création d'une otb::Image
-  $Id$
+  Program:   ORFEO Toolbox
+  Language:  C++
+  Date:      $Date$
+  Version:   $Revision$
+
+
+  Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
+  See OTBCopyright.txt 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.
 
 =========================================================================*/
 #ifndef __otbImage_h
diff --git a/Code/IO/otbImage.txx b/Code/IO/otbImage.txx
index cc1fd1f1bc15bfee394e9186caa33b0dbb904780..0c3c4c083cae0f372f3c204daf7b351ae2de5570 100755
--- a/Code/IO/otbImage.txx
+++ b/Code/IO/otbImage.txx
@@ -1,12 +1,18 @@
 /*=========================================================================
 
-  Programme :   OTB (ORFEO ToolBox)
-  Auteurs   :   CS - C.Ruffel
-  Language  :   C++
-  Date      :   21 avril 2006
-  Version   :   
-  Role      :   Création d'une otb::Image
-  $Id: $
+  Program:   ORFEO Toolbox
+  Language:  C++
+  Date:      $Date$
+  Version:   $Revision$
+
+
+  Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
+  See OTBCopyright.txt 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.
 
 =========================================================================*/
 #ifndef __otbImage_txx
diff --git a/Code/IO/otbImageBase.cxx b/Code/IO/otbImageBase.cxx
index 79f05c74c51cc1722b2a666ca13df2fe939a0157..015b1bbb5b171c55eb6e80d1a3cf4b374ac28780 100755
--- a/Code/IO/otbImageBase.cxx
+++ b/Code/IO/otbImageBase.cxx
@@ -1,12 +1,18 @@
 /*=========================================================================
 
-  Programme :   OTB (ORFEO ToolBox)
-  Auteurs   :   CS - C.Ruffel
-  Language  :   C++
-  Date      :   21 avril 2006
-  Version   :   
-  Role      :   Création d'une otb::Image
-  $Id: $
+  Program:   ORFEO Toolbox
+  Language:  C++
+  Date:      $Date$
+  Version:   $Revision$
+
+
+  Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
+  See OTBCopyright.txt 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.
 
 =========================================================================*/
 
diff --git a/Code/IO/otbImageBase.h b/Code/IO/otbImageBase.h
index 63c3abe6730df49261cb98aa82754b2deabe4bd2..bcbed9f464b784b69369f24b387229e4670b74d1 100755
--- a/Code/IO/otbImageBase.h
+++ b/Code/IO/otbImageBase.h
@@ -1,12 +1,18 @@
 /*=========================================================================
 
-  Programme :   OTB (ORFEO ToolBox)
-  Auteurs   :   CS - C.Ruffel
-  Language  :   C++
-  Date      :   21 avril 2006
-  Version   :   
-  Role      :   Création d'une otb::ImageBase
-  $Id$
+  Program:   ORFEO Toolbox
+  Language:  C++
+  Date:      $Date$
+  Version:   $Revision$
+
+
+  Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
+  See OTBCopyright.txt 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.
 
 =========================================================================*/
 #ifndef __otbImageBase_h
diff --git a/Code/IO/otbImageFileReader.h b/Code/IO/otbImageFileReader.h
index a2e62607d0c16c41d809f0dd04d9f2230b441bf8..0eb7178e8728eeb61e732dff2c637467777d691d 100755
--- a/Code/IO/otbImageFileReader.h
+++ b/Code/IO/otbImageFileReader.h
@@ -1,12 +1,18 @@
 /*=========================================================================
 
-  Programme :   OTB (ORFEO ToolBox)
-  Auteurs   :   CS - T.Feuvrier
-  Language  :   C++
-  Date      :   16 janvier 2005
-  Version   :   
-  Role      :   Ressource de lecture d'une image dans OTB
-  $Id$
+  Program:   ORFEO Toolbox
+  Language:  C++
+  Date:      $Date$
+  Version:   $Revision$
+
+
+  Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
+  See OTBCopyright.txt 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.
 
 =========================================================================*/
 #ifndef __otbImageFileReader_h
@@ -33,7 +39,6 @@ namespace otb
  * \ingroup IOFilters
  *
  */
-// OTB-FA-00008-CS
 template <class TOutputImage>
 class ITK_EXPORT ImageFileReader : public itk::ImageFileReader<TOutputImage>
 {
diff --git a/Code/IO/otbImageFileReader.txx b/Code/IO/otbImageFileReader.txx
index 18b109b00d700674bbb5a03d16f17a15beb1b21d..c097c17056ccd71f71f030bef4dd86acdc1fe5dd 100755
--- a/Code/IO/otbImageFileReader.txx
+++ b/Code/IO/otbImageFileReader.txx
@@ -1,3 +1,20 @@
+/*=========================================================================
+
+  Program:   ORFEO Toolbox
+  Language:  C++
+  Date:      $Date$
+  Version:   $Revision$
+
+
+  Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
+  See OTBCopyright.txt 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.
+
+=========================================================================*/
 #ifndef _otbImageFileReader_txx
 #define _otbImageFileReader_txx
 #include "otbImageFileReader.h"
diff --git a/Code/IO/otbImageFileWriter.h b/Code/IO/otbImageFileWriter.h
index fae97b24550f2cfc813df97b343a6ec4def75908..6724abac86b798d7582d7a3cd6bd0f12f467b855 100755
--- a/Code/IO/otbImageFileWriter.h
+++ b/Code/IO/otbImageFileWriter.h
@@ -1,12 +1,18 @@
 /*=========================================================================
 
-  Programme :   OTB (ORFEO ToolBox)
-  Auteurs   :   CS - T.Feuvrier
-  Language  :   C++
-  Date      :   17 janvier 2005
-  Version   :   
-  Role      :   Ressource d'ecriture d'une image dans OTB
-  $Id$
+  Program:   ORFEO Toolbox
+  Language:  C++
+  Date:      $Date$
+  Version:   $Revision$
+
+
+  Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
+  See OTBCopyright.txt 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.
 
 =========================================================================*/
 #ifndef __otbImageFileWriter_h
diff --git a/Code/IO/otbImageFileWriter.txx b/Code/IO/otbImageFileWriter.txx
index 22ae6f6f8bf73021e99b0cf6d1b95e3c8192f154..6c634c0f8d48490182a4468d7842dcd744cd97b9 100755
--- a/Code/IO/otbImageFileWriter.txx
+++ b/Code/IO/otbImageFileWriter.txx
@@ -1,3 +1,20 @@
+/*=========================================================================
+
+  Program:   ORFEO Toolbox
+  Language:  C++
+  Date:      $Date$
+  Version:   $Revision$
+
+
+  Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
+  See OTBCopyright.txt 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.
+
+=========================================================================*/
 #ifndef _otbImageFileWriter_txx
 #define _otbImageFileWriter_txx
 
diff --git a/Code/IO/otbImageIOFactory.cxx b/Code/IO/otbImageIOFactory.cxx
index 6695a74d57e61315b84c864fc9860452dc257075..75a20c9b8a1edd6dce7fe35fcea06d9a05b5d230 100755
--- a/Code/IO/otbImageIOFactory.cxx
+++ b/Code/IO/otbImageIOFactory.cxx
@@ -1,3 +1,20 @@
+/*=========================================================================
+
+  Program:   ORFEO Toolbox
+  Language:  C++
+  Date:      $Date$
+  Version:   $Revision$
+
+
+  Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
+  See OTBCopyright.txt 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.
+
+=========================================================================*/
 #ifdef _MSC_VER
 #pragma warning ( disable : 4786 )
 #endif
diff --git a/Code/IO/otbImageIOFactory.h b/Code/IO/otbImageIOFactory.h
index a8313c2ae1db195cce2be322bf2bb8e38e374c17..04fae5a3bca735c045477efe2fccfc4c40d69294 100755
--- a/Code/IO/otbImageIOFactory.h
+++ b/Code/IO/otbImageIOFactory.h
@@ -1,12 +1,18 @@
 /*=========================================================================
 
-  Programme :   OTB (ORFEO ToolBox)
-  Auteurs   :   CS - T.Feuvrier
-  Language  :   C++
-  Date      :   11 janvier 2005
-  Version   :   
-  Role      :   Création d'instances d'objet ImageIO utilisant les object factory
-  $Id$
+  Program:   ORFEO Toolbox
+  Language:  C++
+  Date:      $Date$
+  Version:   $Revision$
+
+
+  Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
+  See OTBCopyright.txt 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.
 
 =========================================================================*/
 #ifndef __otbImageIOFactory_h
diff --git a/Code/IO/otbMSTARImageIO.cxx b/Code/IO/otbMSTARImageIO.cxx
index 64fafdc6850d332b481e3a4ede0afb987f50b933..e8db15f2488823beab0caab9d11f525c9c4ce289 100755
--- a/Code/IO/otbMSTARImageIO.cxx
+++ b/Code/IO/otbMSTARImageIO.cxx
@@ -1,3 +1,20 @@
+/*=========================================================================
+
+  Program:   ORFEO Toolbox
+  Language:  C++
+  Date:      $Date$
+  Version:   $Revision$
+
+
+  Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
+  See OTBCopyright.txt 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.
+
+=========================================================================*/
 #include "otbMSTARImageIO.h"
 
 // Pour MSTAR
diff --git a/Code/IO/otbMSTARImageIO.h b/Code/IO/otbMSTARImageIO.h
index b35d80e4eed93f321c9c36d5826a8dd12ee276a8..6110c84862d16c0c34932bc19e84ad742b9d9c3c 100755
--- a/Code/IO/otbMSTARImageIO.h
+++ b/Code/IO/otbMSTARImageIO.h
@@ -1,8 +1,18 @@
 /*=========================================================================
 
-  Programm  :   OTB (ORFEO ToolBox)
-  Language  :   C++
-  Date      :   7 june 2006
+  Program:   ORFEO Toolbox
+  Language:  C++
+  Date:      $Date$
+  Version:   $Revision$
+
+
+  Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
+  See OTBCopyright.txt 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.
 
 =========================================================================*/
 #ifndef __otbMSTARImageIO_h
diff --git a/Code/IO/otbMSTARImageIOFactory.cxx b/Code/IO/otbMSTARImageIOFactory.cxx
index 86fc110e5bb7d572183e4daca1af87c58777be44..e3b8495a41877979a1e74be383aec6ca6785d33e 100755
--- a/Code/IO/otbMSTARImageIOFactory.cxx
+++ b/Code/IO/otbMSTARImageIOFactory.cxx
@@ -1,3 +1,20 @@
+/*=========================================================================
+
+  Program:   ORFEO Toolbox
+  Language:  C++
+  Date:      $Date$
+  Version:   $Revision$
+
+
+  Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
+  See OTBCopyright.txt 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.
+
+=========================================================================*/
 #include "otbMSTARImageIOFactory.h"
 #include "itkCreateObjectFunction.h"
 #include "otbMSTARImageIO.h"
diff --git a/Code/IO/otbMSTARImageIOFactory.h b/Code/IO/otbMSTARImageIOFactory.h
index bee00e514a6250af67d5f3bbc279e9e38b7e1cc0..cc596fbb2c7ab3ec711e1d795d439075143a4a29 100755
--- a/Code/IO/otbMSTARImageIOFactory.h
+++ b/Code/IO/otbMSTARImageIOFactory.h
@@ -1,8 +1,18 @@
 /*=========================================================================
 
-  Programm  :   OTB (ORFEO ToolBox)
-  Language  :   C++
-  Date      :   7 june 2006
+  Program:   ORFEO Toolbox
+  Language:  C++
+  Date:      $Date$
+  Version:   $Revision$
+
+
+  Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
+  See OTBCopyright.txt 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.
 
 =========================================================================*/
 #ifndef __otbMSTARImageIOFactory_h
diff --git a/Code/IO/otbMetaDataKey.cxx b/Code/IO/otbMetaDataKey.cxx
index 12b7f44393970d1bcf701066aa1622f4eefad4f7..a199b92ff57c2c750da75644f138b5161071ca9f 100755
--- a/Code/IO/otbMetaDataKey.cxx
+++ b/Code/IO/otbMetaDataKey.cxx
@@ -1,12 +1,18 @@
 /*=========================================================================
 
-  Programme :   OTB (ORFEO ToolBox)
-  Auteurs   :   CS - C.Ruffel
-  Language  :   C++
-  Date      :   21 avril 2006
-  Version   :   
-  Role      :   Création d'une otb::MetaDataKey
-  $Id$
+  Program:   ORFEO Toolbox
+  Language:  C++
+  Date:      $Date$
+  Version:   $Revision$
+
+
+  Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
+  See OTBCopyright.txt 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.
 
 =========================================================================*/
 
diff --git a/Code/IO/otbMetaDataKey.h b/Code/IO/otbMetaDataKey.h
index 5e2aa7df4f09733cde958ee6a0ac7cdb5563a581..b99c04217c445f72268a307cba12cd8214ebae54 100755
--- a/Code/IO/otbMetaDataKey.h
+++ b/Code/IO/otbMetaDataKey.h
@@ -1,13 +1,18 @@
 /*=========================================================================
 
-  Programme :   OTB (ORFEO ToolBox)
-  Auteurs   :   CS - C.Ruffel
-  Language  :   C++
-  Date      :   21 avril 2006
-  Version   :   
-  Role      :   Création d'une classe contenant la définition des clefs
-  		permettant d'accéder aux métadonnées du dictionnaire
-  $Id$
+  Program:   ORFEO Toolbox
+  Language:  C++
+  Date:      $Date$
+  Version:   $Revision$
+
+
+  Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
+  See OTBCopyright.txt 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.
 
 =========================================================================*/
 #ifndef __otbMetaDataKey_h
diff --git a/Code/IO/otbONERAImageIO.cxx b/Code/IO/otbONERAImageIO.cxx
index 3c54f746e24aacb51e264ff05b86e783a7ec55f4..86e1a7b10ab18266ce8b6910b56c3b470a152f69 100644
--- a/Code/IO/otbONERAImageIO.cxx
+++ b/Code/IO/otbONERAImageIO.cxx
@@ -1,12 +1,18 @@
 /*=========================================================================
 
-  Programme :   OTB (ORFEO ToolBox)
-  Auteurs   :   CS - P.Imbo
-  Language  :   C++
-  Date      :   17 mai 2006
-  Version   :   
-  Role      :   Read/Write ONERA format data
-  $Id$
+  Program:   ORFEO Toolbox
+  Language:  C++
+  Date:      $Date$
+  Version:   $Revision$
+
+
+  Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
+  See OTBCopyright.txt 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.
 
 =========================================================================*/
 #include "otbONERAImageIO.h"
diff --git a/Code/IO/otbONERAImageIO.h b/Code/IO/otbONERAImageIO.h
index 0610d4a7f8b3fe46ac15b7e0f09984de2cc09f57..fe155d806f9f00c9af8008d3449f9df49c0b820e 100644
--- a/Code/IO/otbONERAImageIO.h
+++ b/Code/IO/otbONERAImageIO.h
@@ -1,12 +1,18 @@
 /*=========================================================================
 
-  Programme :   OTB (ORFEO ToolBox)
-  Auteurs   :   CS - P. Imbo
-  Language  :   C++
-  Date      :   16 mai 2006
-  Version   :   
-  Role      :   Classe IO image pour le format ONERA
-  $Id$
+  Program:   ORFEO Toolbox
+  Language:  C++
+  Date:      $Date$
+  Version:   $Revision$
+
+
+  Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
+  See OTBCopyright.txt 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.
 
 =========================================================================*/
 #ifndef __otbONERAImageIO_h
diff --git a/Code/IO/otbONERAImageIOFactory.cxx b/Code/IO/otbONERAImageIOFactory.cxx
index 5cadef0810dc4d192514bf6431a9554a8fd112ac..daee00012aeeacfe8a6d1198eea38c7b6c52e446 100644
--- a/Code/IO/otbONERAImageIOFactory.cxx
+++ b/Code/IO/otbONERAImageIOFactory.cxx
@@ -1,12 +1,18 @@
 /*=========================================================================
 
-  Programme :   OTB (ORFEO ToolBox)
-  Auteurs   :   CS - P.Imbo
-  Language  :   C++
-  Date      :   17 mai 2006
-  Version   :   
-  Role      :   Read/Write ONERA format data
-  $Id$
+  Program:   ORFEO Toolbox
+  Language:  C++
+  Date:      $Date$
+  Version:   $Revision$
+
+
+  Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
+  See OTBCopyright.txt 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.
 
 =========================================================================*/
 #include "otbONERAImageIOFactory.h"
diff --git a/Code/IO/otbONERAImageIOFactory.h b/Code/IO/otbONERAImageIOFactory.h
index a0954b8962d11577299a92115d695d72b1ae49b0..5810438e000432b69d08da0e5ae8af1f018ad9a0 100644
--- a/Code/IO/otbONERAImageIOFactory.h
+++ b/Code/IO/otbONERAImageIOFactory.h
@@ -1,12 +1,18 @@
 /*=========================================================================
 
-  Programme :   OTB (ORFEO ToolBox)
-  Auteurs   :   CS - P.Imbo
-  Language  :   C++
-  Date      :   17 mai 2006
-  Version   :   
-  Role      :   Read/Write ONERA format data
-  $Id$
+  Program:   ORFEO Toolbox
+  Language:  C++
+  Date:      $Date$
+  Version:   $Revision$
+
+
+  Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
+  See OTBCopyright.txt 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.
 
 =========================================================================*/
 #ifndef __otbONERAImageIOFactory_h
diff --git a/Code/IO/otbStreamingImageFileWriter.h b/Code/IO/otbStreamingImageFileWriter.h
index 9937165f3bfc614ab01ee64ad4e768bda1a27bf3..07d97d3a4a66b83b688e6e37e9011668a76bf571 100755
--- a/Code/IO/otbStreamingImageFileWriter.h
+++ b/Code/IO/otbStreamingImageFileWriter.h
@@ -1,3 +1,20 @@
+/*=========================================================================
+
+  Program:   ORFEO Toolbox
+  Language:  C++
+  Date:      $Date$
+  Version:   $Revision$
+
+
+  Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
+  See OTBCopyright.txt 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.
+
+=========================================================================*/
 #ifndef __otbStreamingImageFileWriter_h
 #define __otbStreamingImageFileWriter_h
 
diff --git a/Code/IO/otbStreamingImageFileWriter.txx b/Code/IO/otbStreamingImageFileWriter.txx
index b9d540e5cba2a6c29b94cc3aa37d64bd2d9e1377..1f3c5fe8f4c39417035dfe6cf0261acb396c69a1 100755
--- a/Code/IO/otbStreamingImageFileWriter.txx
+++ b/Code/IO/otbStreamingImageFileWriter.txx
@@ -1,3 +1,20 @@
+/*=========================================================================
+
+  Program:   ORFEO Toolbox
+  Language:  C++
+  Date:      $Date$
+  Version:   $Revision$
+
+
+  Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
+  See OTBCopyright.txt 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.
+
+=========================================================================*/
 #ifndef _otbStreamingImageFileWriter_txx
 #define _otbStreamingImageFileWriter_txx
 #include "otbStreamingImageFileWriter.h"
diff --git a/Code/IO/otbVectorImage.h b/Code/IO/otbVectorImage.h
index 971b4e50b53fa83217a311c75a512f2d2aa75bf9..46f806411a6fd01e909065424697a4b7f5ae94c7 100644
--- a/Code/IO/otbVectorImage.h
+++ b/Code/IO/otbVectorImage.h
@@ -1,12 +1,18 @@
 /*=========================================================================
 
-  Programme :   OTB (ORFEO ToolBox)
-  Auteurs   :   CS - C.Ruffel
-  Language  :   C++
-  Date      :   09 mai 2006
-  Version   :   
-  Role      :   Création d'une otb::VectorImage
-  $Id$
+  Program:   ORFEO Toolbox
+  Language:  C++
+  Date:      $Date$
+  Version:   $Revision$
+
+
+  Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
+  See OTBCopyright.txt 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.
 
 =========================================================================*/
 #ifndef __otbVectorImage_h
diff --git a/Code/IO/otbVectorImage.txx b/Code/IO/otbVectorImage.txx
index 60ec0bcb548b3a49608364f94a1f408c5339a07b..2a0ee1cc2bffdac7464b5210ade90b473cb29f87 100644
--- a/Code/IO/otbVectorImage.txx
+++ b/Code/IO/otbVectorImage.txx
@@ -1,12 +1,18 @@
 /*=========================================================================
 
-  Programme :   OTB (ORFEO ToolBox)
-  Auteurs   :   CS - C.Ruffel
-  Language  :   C++
-  Date      :   09 mai 2006
-  Version   :   
-  Role      :   Création d'une otb::VectorImage
-  $Id:  $
+  Program:   ORFEO Toolbox
+  Language:  C++
+  Date:      $Date$
+  Version:   $Revision$
+
+
+  Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
+  See OTBCopyright.txt 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.
 
 =========================================================================*/
 #ifndef __otbVectorImage_txx
diff --git a/Code/Learning/otbSVMClassifier.h b/Code/Learning/otbSVMClassifier.h
index c7ebe461ad2f53098a14a98ff2068768a35731dc..f23fb9b039338b024ac0216d9f9710cd6a27e1ea 100644
--- a/Code/Learning/otbSVMClassifier.h
+++ b/Code/Learning/otbSVMClassifier.h
@@ -1,14 +1,19 @@
 /*=========================================================================
 
-  Program :   OTB (ORFEO ToolBox)
-  Authors   :   CNES - J. Inglada
-  Language  :   C++
-  Date      :   26 April 2006
-  Version   :   
-  Role      :   SVM Classifier
-  $Id$
+  Program:   ORFEO Toolbox
+  Language:  C++
+  Date:      $Date$
+  Version:   $Revision$
 
 
+  Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
+  See OTBCopyright.txt 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.
+
 =========================================================================*/
 #ifndef __otbSVMClassifier_h
 #define __otbSVMClassifier_h
diff --git a/Code/Learning/otbSVMClassifier.txx b/Code/Learning/otbSVMClassifier.txx
index fe8e2bf773ae77fc6762484a2e20667ceeb26bf2..52c341319ff691eab5d01740f5c11588af99341d 100644
--- a/Code/Learning/otbSVMClassifier.txx
+++ b/Code/Learning/otbSVMClassifier.txx
@@ -9,6 +9,23 @@
   $Id$
 
 
+=========================================================================*/
+/*=========================================================================
+
+  Program:   ORFEO Toolbox
+  Language:  C++
+  Date:      $Date$
+  Version:   $Revision$
+
+
+  Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
+  See OTBCopyright.txt 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.
+
 =========================================================================*/
 #ifndef __otbSVMClassifier_txx
 #define __otbSVMClassifier_txx
diff --git a/Code/Learning/otbSVMImageModelEstimator.h b/Code/Learning/otbSVMImageModelEstimator.h
index a79017b77695d93e50a50829e25eb20324b16724..20b84631dea4544b2ed5d510d046c452625a4e46 100644
--- a/Code/Learning/otbSVMImageModelEstimator.h
+++ b/Code/Learning/otbSVMImageModelEstimator.h
@@ -1,14 +1,19 @@
 /*=========================================================================
 
-  Program :   OTB (ORFEO ToolBox)
-  Authors   :   CNES - J. Inglada
-  Language  :   C++
-  Date      :   26 April 2006
-  Version   :   
-  Role      :   SVM Image Model Estimator
-  $Id$
+  Program:   ORFEO Toolbox
+  Language:  C++
+  Date:      $Date$
+  Version:   $Revision$
 
 
+  Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
+  See OTBCopyright.txt 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.
+
 =========================================================================*/
 #ifndef _otbSVMImageModelEstimator_h
 #define _otbSVMImageModelEstimator_h
diff --git a/Code/Learning/otbSVMImageModelEstimator.txx b/Code/Learning/otbSVMImageModelEstimator.txx
index 970ea9cec94249500ca748ae8bc142df1c2ec3cb..b625ae12f9e73e49eb54d67bbfe7e4020d80edb3 100644
--- a/Code/Learning/otbSVMImageModelEstimator.txx
+++ b/Code/Learning/otbSVMImageModelEstimator.txx
@@ -1,14 +1,19 @@
 /*=========================================================================
 
-  Program :   OTB (ORFEO ToolBox)
-  Authors   :   CNES - J. Inglada
-  Language  :   C++
-  Date      :   26 April 2006
-  Version   :   
-  Role      :   SVM Image Model Estimator
-  $Id$
+  Program:   ORFEO Toolbox
+  Language:  C++
+  Date:      $Date$
+  Version:   $Revision$
 
 
+  Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
+  See OTBCopyright.txt 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.
+
 =========================================================================*/
 #ifndef _otbSVMImageModelEstimator_txx
 #define _otbSVMImageModelEstimator_txx
diff --git a/Code/Learning/otbSVMModel.h b/Code/Learning/otbSVMModel.h
index d4fc25084be21eb6af02a9d54b6cbf71c202719a..7eeffee902ab3c7f0b7ac4de2ee7824954c2af81 100644
--- a/Code/Learning/otbSVMModel.h
+++ b/Code/Learning/otbSVMModel.h
@@ -1,14 +1,19 @@
 /*=========================================================================
 
-  Program :   OTB (ORFEO ToolBox)
-  Authors   :   CNES - J. Inglada
-  Language  :   C++
-  Date      :   26 April 2006
-  Version   :   
-  Role      :   SVM Model
-  $Id$
+  Program:   ORFEO Toolbox
+  Language:  C++
+  Date:      $Date$
+  Version:   $Revision$
 
 
+  Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
+  See OTBCopyright.txt 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.
+
 =========================================================================*/
 #ifndef _otbSVMModel_h
 #define _otbSVMModel_h
diff --git a/Code/Learning/otbSVMModel.txx b/Code/Learning/otbSVMModel.txx
index 7696f46f665bbf4ded9accea7b4d3b9ecaf6c965..cdbb2206b4f1c8db75380d0533f7bbc3e9151781 100644
--- a/Code/Learning/otbSVMModel.txx
+++ b/Code/Learning/otbSVMModel.txx
@@ -1,14 +1,19 @@
 /*=========================================================================
 
-  Program :   OTB (ORFEO ToolBox)
-  Authors   :   CNES - J. Inglada
-  Language  :   C++
-  Date      :   26 April 2006
-  Version   :   
-  Role      :   SVM Model
-  $Id$
+  Program:   ORFEO Toolbox
+  Language:  C++
+  Date:      $Date$
+  Version:   $Revision$
 
 
+  Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
+  See OTBCopyright.txt 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.
+
 =========================================================================*/
 #ifndef __otbSVMModel_txx
 #define __otbSVMModel_txx
diff --git a/Code/Learning/otbSVMModelEstimator.h b/Code/Learning/otbSVMModelEstimator.h
index e1cd129bc2b7686263f1fdd8f3bb206d1b392cca..6dea161247540f4469b49c129a0f6876e3a4c0c4 100644
--- a/Code/Learning/otbSVMModelEstimator.h
+++ b/Code/Learning/otbSVMModelEstimator.h
@@ -1,14 +1,19 @@
 /*=========================================================================
 
-  Program :   OTB (ORFEO ToolBox)
-  Authors   :   CNES - J. Inglada
-  Language  :   C++
-  Date      :   4 May 2006
-  Version   :   
-  Role      :   SVM Model Estimator
-  $Id$
+  Program:   ORFEO Toolbox
+  Language:  C++
+  Date:      $Date$
+  Version:   $Revision$
 
 
+  Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
+  See OTBCopyright.txt 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.
+
 =========================================================================*/
 #ifndef _otbSVMModelEstimator_h
 #define _otbSVMModelEstimator_h
diff --git a/Code/Learning/otbSVMModelEstimator.txx b/Code/Learning/otbSVMModelEstimator.txx
index 745a2abf6d4a40cf05917fddc51fb64b3eba6ac5..91dd061c1d6c130ea76e894c9bf17f226a3e98aa 100644
--- a/Code/Learning/otbSVMModelEstimator.txx
+++ b/Code/Learning/otbSVMModelEstimator.txx
@@ -1,14 +1,19 @@
 /*=========================================================================
 
-  Program :   OTB (ORFEO ToolBox)
-  Authors   :   CNES - J. Inglada
-  Language  :   C++
-  Date      :   4 May 2006
-  Version   :   
-  Role      :   SVM Model Estimator
-  $Id$
+  Program:   ORFEO Toolbox
+  Language:  C++
+  Date:      $Date$
+  Version:   $Revision$
 
 
+  Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
+  See OTBCopyright.txt 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.
+
 =========================================================================*/
 #ifndef _otbSVMModelEstimator_txx
 #define _otbSVMModelEstimator_txx
diff --git a/Code/Learning/otbSVMPointSetModelEstimator.h b/Code/Learning/otbSVMPointSetModelEstimator.h
index 16befee09be8c8e684031a66d01ac8870beda9a1..ed9978f0b8c1179d25092204608861cb0d29c231 100644
--- a/Code/Learning/otbSVMPointSetModelEstimator.h
+++ b/Code/Learning/otbSVMPointSetModelEstimator.h
@@ -1,14 +1,19 @@
 /*=========================================================================
 
-  Program :   OTB (ORFEO ToolBox)
-  Authors   :   CNES - J. Inglada
-  Language  :   C++
-  Date      :   4 May 2006
-  Version   :   
-  Role      :   SVM PointSet Model Estimator
-  $Id$
+  Program:   ORFEO Toolbox
+  Language:  C++
+  Date:      $Date$
+  Version:   $Revision$
 
 
+  Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
+  See OTBCopyright.txt 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.
+
 =========================================================================*/
 #ifndef _otbSVMPointSetModelEstimator_h
 #define _otbSVMPointSetModelEstimator_h
diff --git a/Code/Learning/otbSVMPointSetModelEstimator.txx b/Code/Learning/otbSVMPointSetModelEstimator.txx
index d7e9d0ee9d8cb0990a353f825f762576e6dd995c..49d69881cfb5c07ecdd68737a858007c2c15c583 100644
--- a/Code/Learning/otbSVMPointSetModelEstimator.txx
+++ b/Code/Learning/otbSVMPointSetModelEstimator.txx
@@ -1,14 +1,19 @@
 /*=========================================================================
 
-  Program :   OTB (ORFEO ToolBox)
-  Authors   :   CNES - J. Inglada
-  Language  :   C++
-  Date      :   4 May 2006
-  Version   :   
-  Role      :   SVM PointSet Model Estimator
-  $Id$
+  Program:   ORFEO Toolbox
+  Language:  C++
+  Date:      $Date$
+  Version:   $Revision$
 
 
+  Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
+  See OTBCopyright.txt 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.
+
 =========================================================================*/
 #ifndef _otbSVMPointSetModelEstimator_txx
 #define _otbSVMPointSetModelEstimator_txx
diff --git a/Code/Learning/otbSVMSampleListModelEstimator.h b/Code/Learning/otbSVMSampleListModelEstimator.h
index eb19a1c6f0990f1d82ac3ac44165adacdf5bd9a7..649999ed4f9fc53461de85422bd2e085497d0b17 100644
--- a/Code/Learning/otbSVMSampleListModelEstimator.h
+++ b/Code/Learning/otbSVMSampleListModelEstimator.h
@@ -1,14 +1,19 @@
 /*=========================================================================
 
-  Program :   OTB (ORFEO ToolBox)
-  Authors   :   CNES - J. Inglada
-  Language  :   C++
-  Date      :   12 June 2006
-  Version   :   
-  Role      :   SVM SampleList Model Estimator
-  $Id$
+  Program:   ORFEO Toolbox
+  Language:  C++
+  Date:      $Date$
+  Version:   $Revision$
 
 
+  Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
+  See OTBCopyright.txt 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.
+
 =========================================================================*/
 #ifndef _otbSVMSampleListModelEstimator_h
 #define _otbSVMSampleListModelEstimator_h
diff --git a/Code/Learning/otbSVMSampleListModelEstimator.txx b/Code/Learning/otbSVMSampleListModelEstimator.txx
index af4459dc77acc78b4802823ae6922fa088e4bf44..90df8a9bbb92bea8c7693bb4e7d5a8fcd88046ac 100644
--- a/Code/Learning/otbSVMSampleListModelEstimator.txx
+++ b/Code/Learning/otbSVMSampleListModelEstimator.txx
@@ -1,14 +1,19 @@
 /*=========================================================================
 
-  Program :   OTB (ORFEO ToolBox)
-  Authors   :   CNES - J. Inglada
-  Language  :   C++
-  Date      :   4 May 2006
-  Version   :   
-  Role      :   SVM SampleList Model Estimator
-  $Id$
+  Program:   ORFEO Toolbox
+  Language:  C++
+  Date:      $Date$
+  Version:   $Revision$
 
 
+  Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
+  See OTBCopyright.txt 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.
+
 =========================================================================*/
 #ifndef _otbSVMSampleListModelEstimator_txx
 #define _otbSVMSampleListModelEstimator_txx
diff --git a/Code/Learning/svm.cxx b/Code/Learning/svm.cxx
index ad8225af746a38c82b80978c2c780c0db70be7fc..66dcb92ffb7ab0a591f9d95dcf3c4b3a3d35a476 100644
--- a/Code/Learning/svm.cxx
+++ b/Code/Learning/svm.cxx
@@ -1,3 +1,20 @@
+/*=========================================================================
+
+  Program:   ORFEO Toolbox
+  Language:  C++
+  Date:      $Date$
+  Version:   $Revision$
+
+
+  Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
+  See OTBCopyright.txt 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.
+
+=========================================================================*/
 #ifndef _LIBSVM_CXX
 #define _LIBSVM_CXX
 
diff --git a/Code/Learning/svm.h b/Code/Learning/svm.h
index c03dba9567e06ea489cc0138ee6264443964654c..df1d4e2dd7d34d9a4c6d349d4af862f4ab033918 100644
--- a/Code/Learning/svm.h
+++ b/Code/Learning/svm.h
@@ -1,3 +1,20 @@
+/*=========================================================================
+
+  Program:   ORFEO Toolbox
+  Language:  C++
+  Date:      $Date$
+  Version:   $Revision$
+
+
+  Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
+  See OTBCopyright.txt 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.
+
+=========================================================================*/
 #ifndef _LIBSVM_H
 #define _LIBSVM_H
 
diff --git a/Code/Visu/CMakeLists.txt b/Code/Visu/CMakeLists.txt
index b1ccaa6b24b287e764fe0b6ff1c2a1d94070614e..0c99405c4ade796ec80e48c74a82ec04863ef12c 100755
--- a/Code/Visu/CMakeLists.txt
+++ b/Code/Visu/CMakeLists.txt
@@ -1,4 +1,3 @@
-# OTB-FA-00015-CS
 
 #FILE(GLOB OTBVisu_SRCS "*.cxx" )
 SET ( OTBVisu_SRCS 
diff --git a/Code/Visu/otbGLVectorImageViewBase.h b/Code/Visu/otbGLVectorImageViewBase.h
index fa7b795465f56b21d2354bd12811bd9b7be788c5..a27d0a73edaa760b129ef9615f1831df5065af73 100755
--- a/Code/Visu/otbGLVectorImageViewBase.h
+++ b/Code/Visu/otbGLVectorImageViewBase.h
@@ -1,15 +1,20 @@
 /*=========================================================================
 
-  Programme :   OTB (ORFEO ToolBox)
-  Auteurs   :   CS - T.Feuvrier
-  Language  :   C++
-  Date      :   4 avril 2005
-  Version   :   
-  Role      :   Classe de base, contenant quelques algorithmes, utilises pour visualiser une image
-  $Id$
+  Program:   ORFEO Toolbox
+  Language:  C++
+  Date:      $Date$
+  Version:   $Revision$
+
+
+  Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
+  See OTBCopyright.txt 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.
 
 =========================================================================*/
-// OTB-FA-00026-CS
 #ifndef otbGLVectorImageViewBase_h
 #define otbGLVectorImageViewBase_h
 
diff --git a/Code/Visu/otbGLVectorImageViewBase.txx b/Code/Visu/otbGLVectorImageViewBase.txx
index 4a5017df28d9da0728e3369e121063203320ff40..6089432c5f614bd6c12ed5685dc7b9db941434ad 100755
--- a/Code/Visu/otbGLVectorImageViewBase.txx
+++ b/Code/Visu/otbGLVectorImageViewBase.txx
@@ -1,7 +1,23 @@
+/*=========================================================================
+
+  Program:   ORFEO Toolbox
+  Language:  C++
+  Date:      $Date$
+  Version:   $Revision$
+
+
+  Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
+  See OTBCopyright.txt 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.
+
+=========================================================================*/
 #ifndef otbGLVectorImageViewBase_txx
 #define otbGLVectorImageViewBase_txx
 
-// OTB-FA-00026-CS
 #include "itkExceptionObject.h"
 #include "itkImageRegionConstIterator.h"
 
diff --git a/Code/Visu/otbGLVectorImageViewClick.h b/Code/Visu/otbGLVectorImageViewClick.h
index caf3f6e1124049f4add26abba47b9530a4773cd5..4a45a7cbd24de1556fe389b65d7b5c5e0a6cf4e7 100755
--- a/Code/Visu/otbGLVectorImageViewClick.h
+++ b/Code/Visu/otbGLVectorImageViewClick.h
@@ -1,13 +1,18 @@
 /*=========================================================================
 
-  Programme :   OTB (ORFEO ToolBox)
-  Auteurs   :   CS - R.Garrigues
-  Language  :   C++
-  Date      :   27 avril 2006
-  Version   :   
-  Role      :   Classe de base, contenant quelques algorithmes, utilises pour visualiser une image
-  			    Gère les événements hardware, clic souris notamment
-  $Id$
+  Program:   ORFEO Toolbox
+  Language:  C++
+  Date:      $Date$
+  Version:   $Revision$
+
+
+  Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
+  See OTBCopyright.txt 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.
 
 =========================================================================*/
 
diff --git a/Code/Visu/otbGLVectorImageViewClick.txx b/Code/Visu/otbGLVectorImageViewClick.txx
index 83ea34924205afefc8c09071bba3caf9d728253d..6862164053888f13e99c7d3b80f662798a699622 100755
--- a/Code/Visu/otbGLVectorImageViewClick.txx
+++ b/Code/Visu/otbGLVectorImageViewClick.txx
@@ -1,3 +1,20 @@
+/*=========================================================================
+
+  Program:   ORFEO Toolbox
+  Language:  C++
+  Date:      $Date$
+  Version:   $Revision$
+
+
+  Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
+  See OTBCopyright.txt 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.
+
+=========================================================================*/
 #ifndef otbGLVectorImageViewClick_txx
 #define otbGLVectorImageViewClick_txx
 
diff --git a/Code/Visu/otbImageViewer.h b/Code/Visu/otbImageViewer.h
index 33e3a32d6f0c0163582f39cac59f823485dca6e7..da78c9bf78d3781e550378a8981fcfd0d14d44b1 100755
--- a/Code/Visu/otbImageViewer.h
+++ b/Code/Visu/otbImageViewer.h
@@ -1,15 +1,20 @@
 /*=========================================================================
 
-  Programme :   OTB (ORFEO ToolBox)
-  Auteurs   :   CS - T.Feuvrier
-  Language  :   C++
-  Date      :   4 avril 2005
-  Version   :   
-  Role      :   Classe de type Viewer, permettant de visualiser une image
-  $Id$
+  Program:   ORFEO Toolbox
+  Language:  C++
+  Date:      $Date$
+  Version:   $Revision$
+
+
+  Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
+  See OTBCopyright.txt 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.
 
 =========================================================================*/
-// OTB-FA-00026-CS
 #ifndef __otbImageViewer_h
 #define __otbImageViewer_h
 
diff --git a/Code/Visu/otbImageViewer.txx b/Code/Visu/otbImageViewer.txx
index 8e68a241ca620fd1d2a51644bf75d89cdc1956ed..40f587327230b1549a2803743be9f9cb16da805e 100755
--- a/Code/Visu/otbImageViewer.txx
+++ b/Code/Visu/otbImageViewer.txx
@@ -1,8 +1,23 @@
+/*=========================================================================
+
+  Program:   ORFEO Toolbox
+  Language:  C++
+  Date:      $Date$
+  Version:   $Revision$
+
+
+  Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
+  See OTBCopyright.txt 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.
+
+=========================================================================*/
 #ifndef _otbImageViewer_txx
 #define _otbImageViewer_txx
 
-// OTB-FA-00026-CS
-
 #include "otbImageViewer.h"
 
 #define MAXI(_A,_B) ((_A) > (_B) ? (_A) : (_B))
diff --git a/Code/Visu/otbImageViewerAS.h b/Code/Visu/otbImageViewerAS.h
index 444d0c613d640cc642c11cabacc02cdde2b8fcf6..f919ea5e422370929a1ecfcc03dfef7eac9fbf4f 100755
--- a/Code/Visu/otbImageViewerAS.h
+++ b/Code/Visu/otbImageViewerAS.h
@@ -1,15 +1,20 @@
 /*=========================================================================
 
-  Programme :   OTB (ORFEO ToolBox)
-  Auteurs   :   CS - R.Garrigues
-  Language  :   C++
-  Date      :   27 avril 2006
-  Version   :   
-  Role      :   Classe de type Viewer, permettant de visualiser une image
-  $Id$
+  Program:   ORFEO Toolbox
+  Language:  C++
+  Date:      $Date$
+  Version:   $Revision$
+
+
+  Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
+  See OTBCopyright.txt 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.
 
 =========================================================================*/
-// OTB-FA-00026-CS
 #ifndef __otbImageViewerAS_h
 #define __otbImageViewerAS_h
 
diff --git a/Code/Visu/otbImageViewerAS.txx b/Code/Visu/otbImageViewerAS.txx
index 5ff0a52c94e3c8030d81a40f7d85d6c97d3d29e1..56dc3adca91c33adb9353dfca759e665f85e3fcd 100755
--- a/Code/Visu/otbImageViewerAS.txx
+++ b/Code/Visu/otbImageViewerAS.txx
@@ -1,3 +1,20 @@
+/*=========================================================================
+
+  Program:   ORFEO Toolbox
+  Language:  C++
+  Date:      $Date$
+  Version:   $Revision$
+
+
+  Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
+  See OTBCopyright.txt 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.
+
+=========================================================================*/
 #ifndef _otbImageViewerAS_txx
 #define _otbImageViewerAS_txx
 
diff --git a/Code/Visu/otbPrincipalImageView.h b/Code/Visu/otbPrincipalImageView.h
index c54e6037b8e9e34e5b0f74eddb786bcd65f1e8d8..c2da94cd0e77568590de55b8ee5e7d29b3125f26 100755
--- a/Code/Visu/otbPrincipalImageView.h
+++ b/Code/Visu/otbPrincipalImageView.h
@@ -1,15 +1,20 @@
 /*=========================================================================
 
-  Programme :   OTB (ORFEO ToolBox)
-  Auteurs   :   CS - T.Feuvrier
-  Language  :   C++
-  Date      :   4 avril 2005
-  Version   :   
-  Role      :   Classe permettant de gérer l'affichage de la fenetre "Principal"
-  $Id$
+  Program:   ORFEO Toolbox
+  Language:  C++
+  Date:      $Date$
+  Version:   $Revision$
+
+
+  Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
+  See OTBCopyright.txt 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.
 
 =========================================================================*/
-// OTB-FA-00026-CS
 #ifndef otbPrincipalImageView_h
 #define otbPrincipalImageView_h
 
diff --git a/Code/Visu/otbPrincipalImageView.txx b/Code/Visu/otbPrincipalImageView.txx
index 968eb871d519b43b1921114c569d3f6835dd04cf..5fe5847c1ffc4773fe3ca3ca7ecd34b798185ac5 100755
--- a/Code/Visu/otbPrincipalImageView.txx
+++ b/Code/Visu/otbPrincipalImageView.txx
@@ -1,6 +1,22 @@
+/*=========================================================================
+
+  Program:   ORFEO Toolbox
+  Language:  C++
+  Date:      $Date$
+  Version:   $Revision$
+
+
+  Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
+  See OTBCopyright.txt 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.
+
+=========================================================================*/
 #ifndef otbPrincipalImageView_txx
 #define otbPrincipalImageView_txx
-// OTB-FA-00026-CS
 
 #include "otbPrincipalImageView.h"
 
diff --git a/Code/Visu/otbPrincipalImageViewAS.h b/Code/Visu/otbPrincipalImageViewAS.h
index b50dce2de5c59c3fb24d3d6f37607950553bb48f..bbd542e44c001fed446a461ae34a618d1f325ffa 100755
--- a/Code/Visu/otbPrincipalImageViewAS.h
+++ b/Code/Visu/otbPrincipalImageViewAS.h
@@ -1,12 +1,18 @@
 /*=========================================================================
 
-  Programme :   OTB (ORFEO ToolBox)
-  Auteurs   :   CS - R.Garrigues
-  Language  :   C++
-  Date      :   27 avril 2006
-  Version   :   
-  Role      :   Classe permettant de gérer l'affichage de la fenetre "Principal"
-  $Id$
+  Program:   ORFEO Toolbox
+  Language:  C++
+  Date:      $Date$
+  Version:   $Revision$
+
+
+  Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
+  See OTBCopyright.txt 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.
 
 =========================================================================*/
 
diff --git a/Code/Visu/otbPrincipalImageViewAS.txx b/Code/Visu/otbPrincipalImageViewAS.txx
index e86e11ba8f287fc88ceb9f06e0ecdd23852ec2bf..8983d6719e2164e4e8fcaef6703eafa00b107ee7 100755
--- a/Code/Visu/otbPrincipalImageViewAS.txx
+++ b/Code/Visu/otbPrincipalImageViewAS.txx
@@ -1,6 +1,22 @@
+/*=========================================================================
+
+  Program:   ORFEO Toolbox
+  Language:  C++
+  Date:      $Date$
+  Version:   $Revision$
+
+
+  Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
+  See OTBCopyright.txt 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.
+
+=========================================================================*/
 #ifndef otbPrincipalImageViewAS_txx
 #define otbPrincipalImageViewAS_txx
-// OTB-FA-00026-CS
 
 #include "otbPrincipalImageViewAS.h"
 #include "itkPointSet.h"
diff --git a/Code/Visu/otbScrollImageView.h b/Code/Visu/otbScrollImageView.h
index 6f3b9b4c050c375583745754354d5072772a8aff..7bb15a59bd6201a9e76c5ec2a23e6653ff92b326 100755
--- a/Code/Visu/otbScrollImageView.h
+++ b/Code/Visu/otbScrollImageView.h
@@ -1,15 +1,20 @@
 /*=========================================================================
 
-  Programme :   OTB (ORFEO ToolBox)
-  Auteurs   :   CS - T.Feuvrier
-  Language  :   C++
-  Date      :   4 avril 2005
-  Version   :   
-  Role      :   Classe permettant de gérer l'affichage de la fenetre "Scroll"
-  $Id$
+  Program:   ORFEO Toolbox
+  Language:  C++
+  Date:      $Date$
+  Version:   $Revision$
+
+
+  Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
+  See OTBCopyright.txt 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.
 
 =========================================================================*/
-// OTB-FA-00026-CS
 #ifndef otbScrollImageView_h
 #define otbScrollImageView_h
 
diff --git a/Code/Visu/otbScrollImageView.txx b/Code/Visu/otbScrollImageView.txx
index d189e50c3cf024f549f3464c79530125527f0049..79977fb92b061981b7d9d0ae6554d7728d4a3ab2 100755
--- a/Code/Visu/otbScrollImageView.txx
+++ b/Code/Visu/otbScrollImageView.txx
@@ -1,7 +1,23 @@
+/*=========================================================================
+
+  Program:   ORFEO Toolbox
+  Language:  C++
+  Date:      $Date$
+  Version:   $Revision$
+
+
+  Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
+  See OTBCopyright.txt 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.
+
+=========================================================================*/
 #ifndef otbScrollImageView_txx
 #define otbScrollImageView_txx
 
-// OTB-FA-00026-CS
 #include "otbScrollImageView.h"
 
 
diff --git a/Code/Visu/otbVectorImageView.h b/Code/Visu/otbVectorImageView.h
index 1d2523a9721d4d8fec51c26bb4eb793748845b51..c1e602545b404a191ff33b94a24a0f6554d58617 100755
--- a/Code/Visu/otbVectorImageView.h
+++ b/Code/Visu/otbVectorImageView.h
@@ -1,14 +1,21 @@
 /*=========================================================================
 
-  Programme :   OTB (ORFEO ToolBox)
-  Auteurs   :   CS - T.Feuvrier
-  Language  :   C++
-  Date      :   4 avril 2005
-  Version   :   
-  Role      :   Classe de base, utilisee pour l'affichage d'une image dans une fenetre.
-  $Id$
+  Program:   ORFEO Toolbox
+  Language:  C++
+  Date:      $Date$
+  Version:   $Revision$
+
+
+  Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
+  See OTBCopyright.txt 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.
 
 =========================================================================*/
+
 #ifndef _otbVectorImageView_h
 #define _otbVectorImageView_h
 
diff --git a/Code/Visu/otbVectorImageView.txx b/Code/Visu/otbVectorImageView.txx
index a21c146bfe035e025f7cf1d79594ce295997eb54..e76d1acc7bbe64604f2677a8aaa87224b01bb42f 100755
--- a/Code/Visu/otbVectorImageView.txx
+++ b/Code/Visu/otbVectorImageView.txx
@@ -1,3 +1,20 @@
+/*=========================================================================
+
+  Program:   ORFEO Toolbox
+  Language:  C++
+  Date:      $Date$
+  Version:   $Revision$
+
+
+  Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
+  See OTBCopyright.txt 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.
+
+=========================================================================*/
 #ifndef _otbVectorImageView_txx
 #define _otbVectorImageView_txx
 
diff --git a/Code/Visu/otbZoomImageView.h b/Code/Visu/otbZoomImageView.h
index d27a2c5bb27a8f9c8d2a301df4f7fa88767d25c4..de976f0713c229de3d8d0ec1aed438d879eb4427 100755
--- a/Code/Visu/otbZoomImageView.h
+++ b/Code/Visu/otbZoomImageView.h
@@ -1,15 +1,20 @@
 /*=========================================================================
 
-  Programme :   OTB (ORFEO ToolBox)
-  Auteurs   :   CS - T.Feuvrier
-  Language  :   C++
-  Date      :   4 avril 2005
-  Version   :   
-  Role      :   Classe permettant de gérer l'affichage de la fenetre "Zoom"
-  $Id$
+  Program:   ORFEO Toolbox
+  Language:  C++
+  Date:      $Date$
+  Version:   $Revision$
+
+
+  Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
+  See OTBCopyright.txt 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.
 
 =========================================================================*/
-// OTB-FA-00026-CS
 #ifndef otbZoomImageView_h
 #define otbZoomImageView_h
 
diff --git a/Code/Visu/otbZoomImageView.txx b/Code/Visu/otbZoomImageView.txx
index de7604c7436da9b5386cedb7f05a5ec9311b9e72..aadb0d78a4e85690f6bb8982e1b955580b65685a 100755
--- a/Code/Visu/otbZoomImageView.txx
+++ b/Code/Visu/otbZoomImageView.txx
@@ -1,3 +1,20 @@
+/*=========================================================================
+
+  Program:   ORFEO Toolbox
+  Language:  C++
+  Date:      $Date$
+  Version:   $Revision$
+
+
+  Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
+  See OTBCopyright.txt 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.
+
+=========================================================================*/
 #ifndef otbZoomImageView_txx
 #define otbZoomImageView_txx