From b8552a94d666efe1a04f1382bfb779ab4d020326 Mon Sep 17 00:00:00 2001
From: Patrick Imbo <patrick.imbo@c-s.fr>
Date: Thu, 29 Jun 2006 09:37:16 +0000
Subject: [PATCH] nomsg

---
 .../otbBinaryFunctorNeighborhoodImageFilter.h | 21 ++++++++++-------
 ...tbBinaryFunctorNeighborhoodImageFilter.txx | 21 ++++++++++-------
 ...ctorNeighborhoodJoinHistogramImageFilter.h | 21 ++++++++++-------
 ...orNeighborhoodJoinHistogramImageFilter.txx | 21 ++++++++++-------
 Code/ChangeDetection/otbCBAMIChangeDetector.h | 21 ++++++++++-------
 .../otbCommandProgressUpdate.h                | 20 ++++++++++------
 .../otbCommandProgressUpdate.txx              | 20 ++++++++++------
 .../otbCorrelationChangeDetector.h            | 21 ++++++++++-------
 .../otbJoinHistogramMIImageFilter.h           | 21 ++++++++++-------
 Code/ChangeDetection/otbLHMIChangeDetector.h  | 20 ++++++++++------
 .../otbMeanDifferenceImageFilter.h            | 21 ++++++++++-------
 .../ChangeDetection/otbMeanRatioImageFilter.h | 21 ++++++++++-------
 Code/Common/otbBonjour.h                      | 19 ++++++++++-----
 Code/Common/otbCommandLineArgumentParser.cxx  | 17 ++++++++++++++
 Code/Common/otbCommandLineArgumentParser.h    | 20 ++++++++++------
 Code/Common/otbCommandLineArgumentParser.txx  | 17 ++++++++++++++
 Code/Common/otbDrawLineSpatialObjectFilter.h  | 19 ++++++++++-----
 .../Common/otbDrawLineSpatialObjectFilter.txx | 19 ++++++++++-----
 .../otbDrawLineSpatialObjectListFilter.h      | 19 ++++++++++-----
 .../otbDrawLineSpatialObjectListFilter.txx    | 19 ++++++++++-----
 Code/Common/otbDrawPathFilter.h               | 20 ++++++++++------
 Code/Common/otbDrawPathFilter.txx             | 20 ++++++++++------
 Code/Common/otbDrawPathListFilter.h           | 20 ++++++++++------
 Code/Common/otbDrawPathListFilter.txx         | 20 ++++++++++------
 Code/Common/otbExtractROI.h                   | 20 ++++++++++------
 Code/Common/otbExtractROI.txx                 | 17 ++++++++++++++
 Code/Common/otbExtractROIBase.h               | 20 ++++++++++------
 Code/Common/otbExtractROIBase.txx             | 13 ++++++-----
 .../otbImageToLineSpatialObjectListFilter.h   | 20 ++++++++++------
 .../otbImageToLineSpatialObjectListFilter.txx | 20 ++++++++++------
 Code/Common/otbImageToPathListFilter.h        | 20 ++++++++++------
 Code/Common/otbImageToPathListFilter.txx      | 20 ++++++++++------
 Code/Common/otbLineSpatialObjectList.h        | 20 ++++++++++------
 Code/Common/otbMacro.h                        | 20 ++++++++++------
 Code/Common/otbMultiChannelExtractROI.h       | 20 ++++++++++------
 Code/Common/otbMultiChannelExtractROI.txx     | 17 ++++++++++++++
 Code/Common/otbMultiToMonoChannelExtractROI.h | 20 ++++++++++------
 .../otbMultiToMonoChannelExtractROI.txx       | 17 ++++++++++++++
 Code/Common/otbPathFunction.h                 | 20 ++++++++++------
 Code/Common/otbPathFunction.txx               | 20 ++++++++++------
 Code/Common/otbPathListSource.h               | 20 ++++++++++------
 Code/Common/otbPathListSource.txx             | 20 ++++++++++------
 Code/Common/otbPointSetSource.h               | 20 ++++++++++------
 Code/Common/otbPointSetSource.txx             | 20 ++++++++++------
 Code/Common/otbSystem.cxx                     | 20 ++++++++++------
 Code/Common/otbSystem.h                       | 20 ++++++++++------
 Code/Common/otbTestMain.h                     | 17 ++++++++++++++
 Code/Common/otbVectorImageToASImageAdaptor.h  | 16 +++++++++----
 Code/Common/otbVectorImageToASPixelAccessor.h | 16 +++++++++----
 .../otbAssociativeSymmetricalSumImageFilter.h | 20 ++++++++++------
 ...symmetricFusionOfLineDetectorImageFilter.h | 19 ++++++++++-----
 ...mmetricFusionOfLineDetectorImageFilter.txx | 19 ++++++++++-----
 .../otbComplexMomentImageFunction.h           | 20 ++++++++++------
 .../otbComplexMomentImageFunction.txx         | 23 ++++++++++---------
 .../otbComplexMomentPathFunction.h            | 20 ++++++++++------
 .../otbComplexMomentPathFunction.txx          | 20 ++++++++++------
 .../otbExtractSegmentsImageFilter.h           | 19 ++++++++++-----
 .../otbExtractSegmentsImageFilter.txx         | 19 ++++++++++-----
 Code/FeatureExtraction/otbFillGapsFilter.h    | 20 ++++++++++------
 Code/FeatureExtraction/otbFillGapsFilter.txx  | 20 ++++++++++------
 .../otbFlusserImageFunction.h                 | 20 ++++++++++------
 .../otbFlusserImageFunction.txx               | 20 ++++++++++------
 .../otbFlusserPathFunction.h                  | 20 ++++++++++------
 .../otbFlusserPathFunction.txx                | 20 ++++++++++------
 .../otbGeometricMomentImageFunction.h         | 20 ++++++++++------
 .../otbGeometricMomentPathFunction.h          | 20 ++++++++++------
 Code/FeatureExtraction/otbHarrisImageFilter.h | 19 ++++++++++-----
 .../otbHarrisImageFilter.txx                  | 19 ++++++++++-----
 .../otbHarrisImageToPointSetFilter.h          | 19 ++++++++++-----
 .../otbHarrisImageToPointSetFilter.txx        | 19 ++++++++++-----
 .../otbHessianToScalarImageFilter.h           | 20 ++++++++++------
 Code/FeatureExtraction/otbHuImageFunction.h   | 20 ++++++++++------
 Code/FeatureExtraction/otbHuImageFunction.txx | 20 ++++++++++------
 Code/FeatureExtraction/otbHuPathFunction.h    | 20 ++++++++++------
 Code/FeatureExtraction/otbHuPathFunction.txx  | 20 ++++++++++------
 .../otbImageToPathListAlignFilter.h           | 20 ++++++++++------
 .../otbImageToPathListAlignFilter.txx         | 22 ++++++++++--------
 Code/FeatureExtraction/otbImageToTreeFilter.h | 20 ++++++++++------
 .../otbImageToTreeFilter.txx                  | 20 ++++++++++------
 .../otbLineCorrelationDetectorImageFilter.h   | 19 ++++++++++-----
 .../otbLineCorrelationDetectorImageFilter.txx | 19 ++++++++++-----
 .../otbLineDetectorImageFilterBase.h          | 19 ++++++++++-----
 .../otbLineDetectorImageFilterBase.txx        | 19 ++++++++++-----
 .../otbLineRatioDetectorImageFilter.h         | 19 ++++++++++-----
 .../otbLineRatioDetectorImageFilter.txx       | 19 ++++++++++-----
 Code/FeatureExtraction/otbLocalHoughFilter.h  | 20 ++++++++++------
 .../FeatureExtraction/otbLocalHoughFilter.txx | 20 ++++++++++------
 .../otbMultiplyByScalarImageFilter.h          | 20 ++++++++++------
 ...tbPixelSuppressionByDirectionImageFilter.h | 19 ++++++++++-----
 ...PixelSuppressionByDirectionImageFilter.txx | 19 ++++++++++-----
 .../otbRealMomentImageFunction.h              | 20 ++++++++++------
 .../otbRealMomentPathFunction.h               | 20 ++++++++++------
 Code/FeatureExtraction/otbShape.h             | 20 ++++++++++------
 Code/FeatureExtraction/otbShape.txx           | 20 ++++++++++------
 .../otbThresholdImageToPointSetFilter.h       | 19 ++++++++++-----
 .../otbThresholdImageToPointSetFilter.txx     | 19 ++++++++++-----
 .../otbTouziEdgeDetectorImageFilter.h         | 19 ++++++++++-----
 .../otbTouziEdgeDetectorImageFilter.txx       | 19 ++++++++++-----
 Code/FeatureExtraction/otbTreeNeighborhood.h  | 19 ++++++++++-----
 .../FeatureExtraction/otbTreeNeighborhood.txx | 19 ++++++++++-----
 Code/FeatureExtraction/otbTreeSource.h        | 19 ++++++++++-----
 Code/FeatureExtraction/otbTreeSource.txx      | 19 ++++++++++-----
 Code/IO/otbCAIImageIO.cxx                     | 17 ++++++++++++++
 Code/IO/otbCAIImageIO.h                       | 20 ++++++++++------
 Code/IO/otbCAIImageIOFactory.cxx              | 17 ++++++++++++++
 Code/IO/otbCAIImageIOFactory.h                | 20 ++++++++++------
 Code/IO/otbGDALImageIO.cxx                    | 19 ++++++++++++++-
 Code/IO/otbGDALImageIO.h                      | 20 ++++++++++------
 Code/IO/otbGDALImageIOFactory.cxx             | 17 ++++++++++++++
 Code/IO/otbGDALImageIOFactory.h               | 21 +++++++++++------
 Code/IO/otbImage.h                            | 20 ++++++++++------
 Code/IO/otbImage.txx                          | 20 ++++++++++------
 Code/IO/otbImageBase.cxx                      | 20 ++++++++++------
 Code/IO/otbImageBase.h                        | 20 ++++++++++------
 Code/IO/otbImageFileReader.h                  | 21 ++++++++++-------
 Code/IO/otbImageFileReader.txx                | 17 ++++++++++++++
 Code/IO/otbImageFileWriter.h                  | 20 ++++++++++------
 Code/IO/otbImageFileWriter.txx                | 17 ++++++++++++++
 Code/IO/otbImageIOFactory.cxx                 | 17 ++++++++++++++
 Code/IO/otbImageIOFactory.h                   | 20 ++++++++++------
 Code/IO/otbMSTARImageIO.cxx                   | 17 ++++++++++++++
 Code/IO/otbMSTARImageIO.h                     | 16 ++++++++++---
 Code/IO/otbMSTARImageIOFactory.cxx            | 17 ++++++++++++++
 Code/IO/otbMSTARImageIOFactory.h              | 16 ++++++++++---
 Code/IO/otbMetaDataKey.cxx                    | 20 ++++++++++------
 Code/IO/otbMetaDataKey.h                      | 21 ++++++++++-------
 Code/IO/otbONERAImageIO.cxx                   | 20 ++++++++++------
 Code/IO/otbONERAImageIO.h                     | 20 ++++++++++------
 Code/IO/otbONERAImageIOFactory.cxx            | 20 ++++++++++------
 Code/IO/otbONERAImageIOFactory.h              | 20 ++++++++++------
 Code/IO/otbStreamingImageFileWriter.h         | 17 ++++++++++++++
 Code/IO/otbStreamingImageFileWriter.txx       | 17 ++++++++++++++
 Code/IO/otbVectorImage.h                      | 20 ++++++++++------
 Code/IO/otbVectorImage.txx                    | 20 ++++++++++------
 Code/Learning/otbSVMClassifier.h              | 19 +++++++++------
 Code/Learning/otbSVMClassifier.txx            | 17 ++++++++++++++
 Code/Learning/otbSVMImageModelEstimator.h     | 19 +++++++++------
 Code/Learning/otbSVMImageModelEstimator.txx   | 19 +++++++++------
 Code/Learning/otbSVMModel.h                   | 19 +++++++++------
 Code/Learning/otbSVMModel.txx                 | 19 +++++++++------
 Code/Learning/otbSVMModelEstimator.h          | 19 +++++++++------
 Code/Learning/otbSVMModelEstimator.txx        | 19 +++++++++------
 Code/Learning/otbSVMPointSetModelEstimator.h  | 19 +++++++++------
 .../Learning/otbSVMPointSetModelEstimator.txx | 19 +++++++++------
 .../Learning/otbSVMSampleListModelEstimator.h | 19 +++++++++------
 .../otbSVMSampleListModelEstimator.txx        | 19 +++++++++------
 Code/Learning/svm.cxx                         | 17 ++++++++++++++
 Code/Learning/svm.h                           | 17 ++++++++++++++
 Code/Visu/CMakeLists.txt                      |  1 -
 Code/Visu/otbGLVectorImageViewBase.h          | 21 ++++++++++-------
 Code/Visu/otbGLVectorImageViewBase.txx        | 18 ++++++++++++++-
 Code/Visu/otbGLVectorImageViewClick.h         | 21 ++++++++++-------
 Code/Visu/otbGLVectorImageViewClick.txx       | 17 ++++++++++++++
 Code/Visu/otbImageViewer.h                    | 21 ++++++++++-------
 Code/Visu/otbImageViewer.txx                  | 19 +++++++++++++--
 Code/Visu/otbImageViewerAS.h                  | 21 ++++++++++-------
 Code/Visu/otbImageViewerAS.txx                | 17 ++++++++++++++
 Code/Visu/otbPrincipalImageView.h             | 21 ++++++++++-------
 Code/Visu/otbPrincipalImageView.txx           | 18 ++++++++++++++-
 Code/Visu/otbPrincipalImageViewAS.h           | 20 ++++++++++------
 Code/Visu/otbPrincipalImageViewAS.txx         | 18 ++++++++++++++-
 Code/Visu/otbScrollImageView.h                | 21 ++++++++++-------
 Code/Visu/otbScrollImageView.txx              | 18 ++++++++++++++-
 Code/Visu/otbVectorImageView.h                | 21 +++++++++++------
 Code/Visu/otbVectorImageView.txx              | 17 ++++++++++++++
 Code/Visu/otbZoomImageView.h                  | 21 ++++++++++-------
 Code/Visu/otbZoomImageView.txx                | 17 ++++++++++++++
 167 files changed, 2255 insertions(+), 949 deletions(-)

diff --git a/Code/ChangeDetection/otbBinaryFunctorNeighborhoodImageFilter.h b/Code/ChangeDetection/otbBinaryFunctorNeighborhoodImageFilter.h
index bb3ee9b750..42de947450 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 743a9f46d0..3776864e49 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 b8b315c0b4..1c76ddccbe 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 5294fbc4b4..3c68aa4e3b 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 a21d48ce3d..68fbbce1c5 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 cc90ff23f1..dd1ddb4e65 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 359e244d86..ba8fe1943a 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 3ed1abfe60..772031a3d8 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 0de4dc2104..7ee7283745 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 b148889d50..92c47ba236 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 930f585a63..f839afd2b4 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 a84018ef6d..686fd03f40 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 3ebe851750..e9eec5c2bd 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 fdf0268a6c..dcb1181ab0 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 338d6ed4e2..cdcfeb8c2b 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 cdfc8f1544..6bb311bd06 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 0b262b0006..a2684edbe2 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 4edd3f8f8b..76fb110b10 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 5ff123b628..b5e7967014 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 c9bf14cd9b..0a32501368 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 f2f96252e6..6fb4445cb0 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 18cec1bc22..5ed07d580a 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 a037e272eb..833129e53d 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 6672500088..8ac7386998 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 0285ae7d04..3f5bd0ace7 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 7ca6fbd937..b09d8aaacb 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 cb86a1d672..a4f5a775d7 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 995600bd57..874ed0e56b 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 ab91c17b15..de6f7b4b35 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 b0b315bd44..eead62871e 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 9b74724f29..daf0b8586d 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 1d47473557..9a0a288465 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 a1620493f6..98a0d15eb1 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 318f8f911a..453caab87e 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 14f81af4da..331d162e04 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 53bef3df0c..fd807c518d 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 a66b4eb348..944291f1d9 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 77fa4176c4..642b23f335 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 39c6510b6a..ebc3ea1500 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 4f224eede3..3c049bb6a0 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 8143e41613..92f8759292 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 c98503be50..708dc04d98 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 415bfeaa6b..1de09d3f74 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 cb2ec28b23..b109eb0c73 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 65feedd1b5..0a21d8feba 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 5526b6ba0c..afbe7dc4e7 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 75801cb87f..4a71d92cbe 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 3f8cf2d39e..6332be3615 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 d86d246595..858525ed74 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 949759ef8d..cde0318809 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 d69e52c7e1..c3673b3a11 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 112925c9fd..34922715f7 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 528899ecf9..30967cb947 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 a9ef0f2bc7..36fd25042c 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 8498c98094..32bb336efe 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 db28d6d271..24086b1a08 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 e928c6342d..5932a6ee88 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 85af1623bb..afc5eb99db 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 cb5750af26..74e1ce0ab4 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 78530ba22c..f56f356b7e 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 4cc98db92c..7875863543 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 3206b1d3c9..f2dd987d77 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 0a3ddcac47..7ead224744 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 3c5310cce6..309922c004 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 95529ea33b..3c1e1ec261 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 ad65bccc59..a1fcc7d20b 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 8dfcd35a73..a9401cee29 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 b3e5718587..40b812cb42 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 5e40da4051..f47ac3a203 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 8057581dec..bb4e713454 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 4f32d2c9b5..43b40472f7 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 a4095572f2..b5bf0e55e3 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 a4689aa4c5..3c18fab248 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 138adf30e2..94f2fed743 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 15d15c871b..e66c55e595 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 e1b9e369a5..c30fa471d9 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 cb04373b64..05ebf7f134 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 7f6ff5b20d..4fbf81bf71 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 fcffb6718d..4208f21036 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 9b747979ec..e9a836edfb 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 fd1d04e3ec..a9fe382544 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 449a443fe4..7503891c28 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 b7b902e262..66da4d9c17 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 eea869ff9f..6021f28296 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 dc79d6afc5..db347253ec 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 ffc96c4326..c92b4e2bb0 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 7ab3c64345..45046c0f36 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 a2518749ac..b9d478a643 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 90fa29fb6b..bb21d00ef8 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 3b58b1217d..062197f2f4 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 7d33c7a818..7dbd6e8603 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 a4c64864fc..6756263acc 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 4151c42ded..de4f73eda1 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 0c006692e4..5ab8ba41fc 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 bd531da029..41c84859fd 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 84107f12a4..0fb0f1a382 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 b623df2c41..c9d8ecd95f 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 eae92682dd..ee68b4f1e9 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 f3dacfd57f..93737d5a29 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 58dfc9f86f..d573930fad 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 fa03751ab0..e903756b91 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 32682b488d..a55eb1f8af 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 69902a3715..15e62eea38 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 67873c0538..44aa6a0fb4 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 83b02a3b0d..03b16aa7bc 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 fe04ce184e..b34ea963b7 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 a6c21f5730..cb46d4265d 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 d11e250c75..a9de3fc8aa 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 8f4a710a03..d473820828 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 156149488a..ba4d17973b 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 63ca740b2a..7a751a27a7 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 cc1fd1f1bc..0c3c4c083c 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 79f05c74c5..015b1bbb5b 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 63c3abe673..bcbed9f464 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 a2e62607d0..0eb7178e87 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 18b109b00d..c097c17056 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 fae97b2455..6724abac86 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 22ae6f6f8b..6c634c0f8d 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 6695a74d57..75a20c9b8a 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 a8313c2ae1..04fae5a3bc 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 64fafdc685..e8db15f248 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 b35d80e4ee..6110c84862 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 86fc110e5b..e3b8495a41 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 bee00e514a..cc596fbb2c 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 12b7f44393..a199b92ff5 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 5e2aa7df4f..b99c04217c 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 3c54f746e2..86e1a7b10a 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 0610d4a7f8..fe155d806f 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 5cadef0810..daee00012a 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 a0954b8962..5810438e00 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 9937165f3b..07d97d3a4a 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 b9d540e5cb..1f3c5fe8f4 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 971b4e50b5..46f806411a 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 60ec0bcb54..2a0ee1cc2b 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 c7ebe461ad..f23fb9b039 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 fe8e2bf773..52c341319f 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 a79017b776..20b84631de 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 970ea9cec9..b625ae12f9 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 d4fc25084b..7eeffee902 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 7696f46f66..cdbb2206b4 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 e1cd129bc2..6dea161247 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 745a2abf6d..91dd061c1d 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 16befee09b..ed9978f0b8 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 d7e9d0ee9d..49d69881cf 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 eb19a1c6f0..649999ed4f 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 af4459dc77..90df8a9bbb 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 ad8225af74..66dcb92ffb 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 c03dba9567..df1d4e2dd7 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 b1ccaa6b24..0c99405c4a 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 fa7b795465..a27d0a73ed 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 4a5017df28..6089432c5f 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 caf3f6e112..4a45a7cbd2 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 83ea349242..6862164053 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 33e3a32d6f..da78c9bf78 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 8e68a241ca..40f5873272 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 444d0c613d..f919ea5e42 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 5ff0a52c94..56dc3adca9 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 c54e6037b8..c2da94cd0e 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 968eb871d5..5fe5847c1f 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 b50dce2de5..bbd542e44c 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 e86e11ba8f..8983d6719e 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 6f3b9b4c05..7bb15a59bd 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 d189e50c3c..79977fb92b 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 1d2523a972..c1e602545b 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 a21c146bfe..e76d1acc7b 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 d27a2c5bb2..de976f0713 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 de7604c743..aadb0d78a4 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
 
-- 
GitLab