diff --git a/Code/BasicFilters/otbBinaryImageDensityFunction.txx b/Code/BasicFilters/otbBinaryImageDensityFunction.txx
index c7ac76aab57ec88ff46c8ec8070f5b1fa79cea8c..8301b5f062384a9a25355e92f04e608349dfa27f 100644
--- a/Code/BasicFilters/otbBinaryImageDensityFunction.txx
+++ b/Code/BasicFilters/otbBinaryImageDensityFunction.txx
@@ -94,7 +94,7 @@ BinaryImageDensityFunction<TInputImage,TCoordRep>
      }
 
    const RealType  num = static_cast<RealType>( size );
-   var =  sum/num  ;
+   var =  sum/num ;
   
    return var;
 }
diff --git a/Code/BasicFilters/otbBinaryImageMinimalBoundingRegionCalculator.txx b/Code/BasicFilters/otbBinaryImageMinimalBoundingRegionCalculator.txx
index 3bbb3b7a35c149e3c6699c54173ebcda606457f4..f372f2948085a287a6b9bdff80a4b59bebbe2add 100644
--- a/Code/BasicFilters/otbBinaryImageMinimalBoundingRegionCalculator.txx
+++ b/Code/BasicFilters/otbBinaryImageMinimalBoundingRegionCalculator.txx
@@ -70,7 +70,7 @@ BinaryImageMinimalBoundingRegionCalculator<TInputImage>
     fit.SetFirstDirection( !axis );
     fit.SetSecondDirection( axis );
     fit.GoToBegin();
-   ;
+  ;
     // Walk through the two images line by line
     while (!fit.IsAtEnd())
     {
diff --git a/Code/BasicFilters/otbEdgeDetectorImageFilter.h b/Code/BasicFilters/otbEdgeDetectorImageFilter.h
index 3ab70edbe444570c757285f67422ed1ede5a425d..4cfb221879df5373d691743f6831c1f4889e8c7b 100644
--- a/Code/BasicFilters/otbEdgeDetectorImageFilter.h
+++ b/Code/BasicFilters/otbEdgeDetectorImageFilter.h
@@ -42,7 +42,7 @@ public:
 
   /** Standard class typedefs. */
   typedef EdgeDetectorImageFilter                                     Self;
-  typedef itk::ImageToImageFilter<TInputImage,TOutputImage>           Superclass ;
+  typedef itk::ImageToImageFilter<TInputImage,TOutputImage>           Superclass;
   typedef itk::SmartPointer<Self>                                     Pointer;
   typedef itk::SmartPointer<const Self>                               ConstPointer;
 
diff --git a/Code/BasicFilters/otbEstimateInnerProductPCAImageFilter.txx b/Code/BasicFilters/otbEstimateInnerProductPCAImageFilter.txx
index 3ea3157e6f1e10178d1b1d4b36d8e0d694f27933..774e1b14c5171b0c215ec1fa0867f2ba10e7ef6f 100644
--- a/Code/BasicFilters/otbEstimateInnerProductPCAImageFilter.txx
+++ b/Code/BasicFilters/otbEstimateInnerProductPCAImageFilter.txx
@@ -116,7 +116,7 @@ EstimateInnerProductPCAImageFilter<TInputImage,TOutputImage>
     for(unsigned int img_number = 0; img_number < numberOfTrainingImages; img_number++ )
     {
       unsigned int indexNumberOfTrainingImages = numberOfTrainingImages-1;
-      for( unsigned int vec_number = 0 ; vec_number < m_NumberOfPrincipalComponentsRequired; vec_number++, indexNumberOfTrainingImages-- )
+      for( unsigned int vec_number = 0; vec_number < m_NumberOfPrincipalComponentsRequired; vec_number++, indexNumberOfTrainingImages-- )
       {
         outputPixel[vec_number] += static_cast<OutputInternalPixelType>( static_cast<double>(inputPixel[img_number]) *  static_cast<double>(m_EigenVectorsOfInnerProductMatrix[img_number][indexNumberOfTrainingImages]));
       }
diff --git a/Code/Common/otbDrawLineSpatialObjectListFilter.txx b/Code/Common/otbDrawLineSpatialObjectListFilter.txx
index d0937e11599a21e1440cf7ffa0bf2466b56aec9e..166296d9a4749d148f37fb8d9a25ab68a88694b8 100644
--- a/Code/Common/otbDrawLineSpatialObjectListFilter.txx
+++ b/Code/Common/otbDrawLineSpatialObjectListFilter.txx
@@ -83,7 +83,7 @@ DrawLineSpatialObjectListFilter<TInputImage, TOutputImage>
   outputIt.GoToBegin();
   inputIt.GoToBegin();
 
-  for (outputIt.GoToBegin(); !outputIt.IsAtEnd() ; ++outputIt,++inputIt)
+  for (outputIt.GoToBegin(); !outputIt.IsAtEnd(); ++outputIt,++inputIt)
       outputIt.Set( static_cast<OutputPixelType>(inputIt.Get()) );
   
   /** Draw the lines in the output image using lineIterator*/
diff --git a/Code/FeatureExtraction/otbLineSegmentDetector.txx b/Code/FeatureExtraction/otbLineSegmentDetector.txx
index 3d4796a4d0ccb5b356e07f21a61aabb8d3265802..856076bf4fb3811711d7546dbc2320e434b20301 100644
--- a/Code/FeatureExtraction/otbLineSegmentDetector.txx
+++ b/Code/FeatureExtraction/otbLineSegmentDetector.txx
@@ -165,7 +165,7 @@ LineSegmentDetector<TInputImage,TPrecision >
 
   /** Computing the length of the bins*/  
   unsigned int NbBin = 10;  
-  double lengthBin = static_cast<double>((max - min))/static_cast<double>(NbBin-1) ;
+  double lengthBin = static_cast<double>((max - min))/static_cast<double>(NbBin-1);
   CoordinateHistogramType  tempHisto(NbBin);  /** Initializing the histogram */
 
   
@@ -498,7 +498,7 @@ LineSegmentDetector<TInputImage, TPrecision>
   /** 
    * Loop for searching regions 
    */
-  for (unsigned int cpt = 0; cpt < reg.size() ; cpt++ )
+  for (unsigned int cpt = 0; cpt < reg.size(); cpt++ )
     {
       itNeigh.SetLocation(reg[cpt]);
       itNeighDir.SetLocation(reg[cpt]);
@@ -591,8 +591,8 @@ LineSegmentDetector<TInputImage, TPrecision>
     }
   else
     {
-      x/= sumWeight ;
-      y/= sumWeight ;
+      x/= sumWeight;
+      y/= sumWeight;
     }
   
   /** Compute the orientation of the region*/
@@ -632,7 +632,7 @@ LineSegmentDetector<TInputImage, TPrecision>
   double s = 0.;
   int i = 0;
   
-  for( s=0.0,i = static_cast<int>(l_min); s<sum_th && i<=static_cast<int>(l_max) ; i++) 
+  for( s=0.0,i = static_cast<int>(l_min); s<sum_th && i<=static_cast<int>(l_max); i++) 
     s += sum_l[ Diagonal + i];
   
   double lb = (static_cast<double>(i-1) - 0.5 );
@@ -732,7 +732,7 @@ LineSegmentDetector<TInputImage, TPrecision>
   Inertie[1][0] =Ixy;
   
   typedef itk::SymmetricEigenAnalysis<MatrixType,MatrixEigenType>   EigenAnalysisType;
-  EigenAnalysisType eigenFilter(2) ;
+  EigenAnalysisType eigenFilter(2);
   eigenFilter.ComputeEigenValuesAndVectors(Inertie,eigenMatrix,eigenVector  );
   theta = vcl_atan2(eigenVector[1][1], -eigenVector[1][0]);
   
@@ -791,14 +791,14 @@ LineSegmentDetector<TInputImage, TPrecision>
 
 //   RectangleType        X(4,0.) , Y(4,0.);
   
-//   X[0] = rec[0] + dy* halfWidth ;
-//   Y[0] = rec[1] - dx* halfWidth ;
-//   X[1] = rec[0] - dy* halfWidth ;
-//   Y[1] = rec[1] + dx* halfWidth ;
-//   X[2] = rec[2] + dy* halfWidth ;
-//   Y[2] = rec[3] - dx* halfWidth ;
-//   X[3] = rec[2] - dy* halfWidth ;
-//   Y[3] = rec[3] + dx* halfWidth ;
+//   X[0] = rec[0] + dy* halfWidth;
+//   Y[0] = rec[1] - dx* halfWidth;
+//   X[1] = rec[0] - dy* halfWidth;
+//   Y[1] = rec[1] + dx* halfWidth;
+//   X[2] = rec[2] + dy* halfWidth;
+//   Y[2] = rec[3] - dx* halfWidth;
+//   X[3] = rec[2] - dy* halfWidth;
+//   Y[3] = rec[3] + dx* halfWidth;
 
 
   /** Compute the NFA of the rectangle  
diff --git a/Code/FeatureExtraction/otbRegionImageToRectangularPathListFilter.txx b/Code/FeatureExtraction/otbRegionImageToRectangularPathListFilter.txx
index 2267329ac18f90f2dfbe54fd95b1a92c50a68230..8f03e4d12e89bc60654a4846c98943c7fe89ae7a 100644
--- a/Code/FeatureExtraction/otbRegionImageToRectangularPathListFilter.txx
+++ b/Code/FeatureExtraction/otbRegionImageToRectangularPathListFilter.txx
@@ -140,7 +140,7 @@ RegionImageToRectangularPathListFilter<TInputImage,TOutputPath>
   try {
   OutputPath->Clear();
 
-  for (nit.GoToBegin(), pixelCount = 0; ! nit.IsAtEnd() ; ++nit) {
+  for (nit.GoToBegin(), pixelCount = 0; ! nit.IsAtEnd(); ++nit) {
     pixelCount++;
     if (pixelCount <= pixelDebugNumber) {
       std::cout << "Pixel #" << pixelCount << " : " << nit.GetCenterPixel() << std::endl;
@@ -225,7 +225,7 @@ RegionImageToRectangularPathListFilter<TInputImage,TOutputPath>
         y1, y2, /* eigenvectors y coordinate, for x = 1*/
         x1 = 1, /* first eigenvector x coordinate */
         x2 = 1, /* second eigenvector x coordinate, 1 except in special case when covarXY == 0 */
-        alpha /* main direction */ ;
+        alpha /* main direction */;
       delta = (varX - varY) * (varX - varY) + 4 * covarXY * covarXY;
       l1 = (varX + varY + vcl_sqrt(delta)) / 2;
       l2 = (varX + varY - vcl_sqrt(delta)) / 2;
@@ -323,16 +323,16 @@ RegionImageToRectangularPathListFilter<TInputImage,TOutputPath>
 
       if (regionCount <= regionDebugNumber) {
         std::cout << std::endl << "Region " << regionCount << " (area = " << n << " pixels)" << std::endl;
-        std::cout << "sumX = " << sumX << " ; sumY = " << sumY << " ; sumX2 = " << sumX2 << " ; sumY2 = " << sumY2 << " ; sumXY = " << sumXY << std::endl;
-        std::cout << "avgX = " << avgX << " ; avgY = " << avgY << std::endl;
-        std::cout << "varX = " << varX << " ; varY = " << varY << " ; covarXY = " << covarXY << std::endl;
-        std::cout << "adevX = " << adevX << " ; adevY = " << adevY << " ; adevXY = " << adevXY << std::endl;
+        std::cout << "sumX = " << sumX << "; sumY = " << sumY << "; sumX2 = " << sumX2 << "; sumY2 = " << sumY2 << "; sumXY = " << sumXY << std::endl;
+        std::cout << "avgX = " << avgX << "; avgY = " << avgY << std::endl;
+        std::cout << "varX = " << varX << "; varY = " << varY << "; covarXY = " << covarXY << std::endl;
+        std::cout << "adevX = " << adevX << "; adevY = " << adevY << "; adevXY = " << adevXY << std::endl;
         std::cout << "crossTermAXY = " << crossTermAXY << std::endl;
-        std::cout << "eigenvalue 1 = " << l1 << " ; eigenvalue 2 = " << l2 << std::endl;
-        std::cout << "eigenvector 1 = [" << x1 << ", " << y1 << "] ; eigenvector 2 = [" << x2 << ", " << y2 << "]" << std::endl;
-        std::cout << "A-eigenvalue 1 = " << al1 << " ; A-eigenvalue 2 = " << al2 << std::endl;
-        std::cout << "A-eigenvector 1 = [" << ax1 << ", " << ay1 << "] ; A-eigenvector 2 = [" << ax2 << ", " << ay2 << "]" << std::endl;
-        std::cout << "length = " << length << " ; width = " << width << std::endl;
+        std::cout << "eigenvalue 1 = " << l1 << "; eigenvalue 2 = " << l2 << std::endl;
+        std::cout << "eigenvector 1 = [" << x1 << ", " << y1 << "]; eigenvector 2 = [" << x2 << ", " << y2 << "]" << std::endl;
+        std::cout << "A-eigenvalue 1 = " << al1 << "; A-eigenvalue 2 = " << al2 << std::endl;
+        std::cout << "A-eigenvector 1 = [" << ax1 << ", " << ay1 << "]; A-eigenvector 2 = [" << ax2 << ", " << ay2 << "]" << std::endl;
+        std::cout << "length = " << length << "; width = " << width << std::endl;
         std::cout << "main direction = " << alpha << "�" << std::endl;
         std::cout << "rectangular fit = " << (float) countWithin / n << std::endl;
       }
diff --git a/Code/MultiScale/otbSplineBiOrthogonalOperator.h b/Code/MultiScale/otbSplineBiOrthogonalOperator.h
index 99dc9d354cb0202c64af48c459a0561c0dac1b32..d268a46f9b2de6a1bf7f95c7a24d6a0d687bbba9 100644
--- a/Code/MultiScale/otbSplineBiOrthogonalOperator.h
+++ b/Code/MultiScale/otbSplineBiOrthogonalOperator.h
@@ -69,7 +69,7 @@ public:
   typedef InverseOrForwardTransformationEnum DirectionOfTransformationEnumType;
   itkStaticConstMacro(DirectionOfTransformation,DirectionOfTransformationEnumType,TDirectionOfTransformation);
 
-  LowPassSplineBiOrthogonalOperator() ;
+  LowPassSplineBiOrthogonalOperator();
   LowPassSplineBiOrthogonalOperator(const Self& other);
 
   /**
@@ -80,7 +80,7 @@ public:
   /**
    * Prints some debugging information
    */
-  virtual void PrintSelf(std::ostream &os, itk::Indent i) const ; 
+  virtual void PrintSelf(std::ostream &os, itk::Indent i) const; 
 
 protected:
   /**
@@ -137,7 +137,7 @@ public:
   typedef InverseOrForwardTransformationEnum DirectionOfTransformationEnumType;
   itkStaticConstMacro(DirectionOfTransformation,DirectionOfTransformationEnumType,TDirectionOfTransformation);
 
-  HighPassSplineBiOrthogonalOperator () ;
+  HighPassSplineBiOrthogonalOperator ();
   HighPassSplineBiOrthogonalOperator(const Self& other);
 
   /**
@@ -148,7 +148,7 @@ public:
   /**
    * Prints some debugging information
    */
-  virtual void PrintSelf(std::ostream &os, itk::Indent i) const ;
+  virtual void PrintSelf(std::ostream &os, itk::Indent i) const;
 
 protected:
   /**
diff --git a/Code/MultiScale/otbWaveletFilterBank.h b/Code/MultiScale/otbWaveletFilterBank.h
index 2ab4ce986f2adc19ebca40853f3ec3d0dee93ef2..70ba28f9109bdc36dda963eed2e15ff64a88860b 100644
--- a/Code/MultiScale/otbWaveletFilterBank.h
+++ b/Code/MultiScale/otbWaveletFilterBank.h
@@ -284,7 +284,7 @@ private:
    * size ImageDimension-1 and each InternalImagesTabular contains intermediate 
    * images
    */
-  typedef std::vector< OutputImagePointerType > InternalImagesTabular ;
+  typedef std::vector< OutputImagePointerType > InternalImagesTabular;
   std::vector< InternalImagesTabular > m_InternalImages;
 }; // end of class
   
diff --git a/Code/MultiScale/otbWaveletFilterBank.txx b/Code/MultiScale/otbWaveletFilterBank.txx
index 0bcb64f93a3ac1fc27b8d615d4603dcf03fc5d8d..e814638ad1961e884870f4aaa8f9c1eceb094cbb 100644
--- a/Code/MultiScale/otbWaveletFilterBank.txx
+++ b/Code/MultiScale/otbWaveletFilterBank.txx
@@ -219,8 +219,8 @@ WaveletFilterBank< TInputImage, TOutputImage,
       }
       else
       {
-        destIndex[i] = srcIndex[i] ;
-        destSize[i] = srcSize[i] ;
+        destIndex[i] = srcIndex[i];
+        destSize[i] = srcSize[i];
       }
     }
 
@@ -288,8 +288,8 @@ WaveletFilterBank< TInputImage, TOutputImage,
       }
       else
       {
-        destIndex[i] = srcIndex[i] ;
-        destSize[i] = srcSize[i] ;
+        destIndex[i] = srcIndex[i];
+        destSize[i] = srcSize[i];
       }
     }
 
diff --git a/Code/Visualization/otbWidgetManager.h b/Code/Visualization/otbWidgetManager.h
index 78db931071baf53cfee08a2f3bd248bb230b11bd..5a4111ac4bbb7d0efca6ada6a4f1b9434e625ce6 100644
--- a/Code/Visualization/otbWidgetManager.h
+++ b/Code/Visualization/otbWidgetManager.h
@@ -51,11 +51,11 @@ public:
   typedef WidgetType::Pointer                                       WidgetPointerType;
 
   /** Register Wigets*/
-  virtual void RegisterFullWidget(WidgetType* fullWidget) = 0 ;
-  virtual void RegisterScrollWidget(WidgetType* scrollWidget) = 0 ;
-  virtual void RegisterZoomWidget(WidgetType* zoomWidget) = 0 ;
-  virtual void RegisterHistogramWidget(WidgetType* curveWidget) = 0 ;
-  virtual void RegisterPixelInformationWidget(Fl_Output * pixelWidget) = 0 ;
+  virtual void RegisterFullWidget(WidgetType* fullWidget) = 0;
+  virtual void RegisterScrollWidget(WidgetType* scrollWidget) = 0;
+  virtual void RegisterZoomWidget(WidgetType* zoomWidget) = 0;
+  virtual void RegisterHistogramWidget(WidgetType* curveWidget) = 0;
+  virtual void RegisterPixelInformationWidget(Fl_Output * pixelWidget) = 0;
   virtual void Show() = 0;
   virtual void Hide() = 0;
   virtual void Refresh() = 0;
diff --git a/Testing/Code/BasicFilters/otbContinuousMinimumMaximumImageCalculatorTest.cxx b/Testing/Code/BasicFilters/otbContinuousMinimumMaximumImageCalculatorTest.cxx
index 6a264783aad9edf9651c29d805dc3615236d4c97..122b7f0a922a90782a65156cbcf82b42c50ba894 100644
--- a/Testing/Code/BasicFilters/otbContinuousMinimumMaximumImageCalculatorTest.cxx
+++ b/Testing/Code/BasicFilters/otbContinuousMinimumMaximumImageCalculatorTest.cxx
@@ -95,7 +95,7 @@ otbContinuousMinimumMaximumImageCalculatorTest(int ,char *[] )
 
   if (minimumResult != minimum)
   {
-    std::cout << "Minimum Value is wrong : " << minimumResult ;
+    std::cout << "Minimum Value is wrong : " << minimumResult;
     std::cout << " != " << minimum << std::endl;
     flag = 1;
   }
@@ -107,7 +107,7 @@ otbContinuousMinimumMaximumImageCalculatorTest(int ,char *[] )
 
   if (maximumResult != maximum)
   {
-    std::cout << "Maximum Value is wrong : " << maximumResult ;
+    std::cout << "Maximum Value is wrong : " << maximumResult;
     std::cout << " != " << maximum << std::endl;
     flag = 2;
   }
diff --git a/Testing/Code/BasicFilters/otbEuclideanDistanceWithMissingValue.cxx b/Testing/Code/BasicFilters/otbEuclideanDistanceWithMissingValue.cxx
index aa83f89a7c799b509052a82d342eb637d35cf629..fef2bbad9d70d358cbb0b248c926280e51b7bf7e 100644
--- a/Testing/Code/BasicFilters/otbEuclideanDistanceWithMissingValue.cxx
+++ b/Testing/Code/BasicFilters/otbEuclideanDistanceWithMissingValue.cxx
@@ -9,7 +9,7 @@ Version:   $Revision$
 Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
 See OTBCopyright.txt for details.
 
-Copyright (c) Institut Telecom ; Telecom Bretagne. All rights reserved.
+Copyright (c) Institut Telecom; Telecom Bretagne. All rights reserved.
 See ITCopyright.txt for details.
 
 This software is distributed WITHOUT ANY WARRANTY; without even
diff --git a/Testing/Code/BasicFilters/otbEuclideanDistanceWithMissingValueNew.cxx b/Testing/Code/BasicFilters/otbEuclideanDistanceWithMissingValueNew.cxx
index ced90ba14971da9de375f9d1a375cac6aed97ca1..75bc8d673b38268d759f0db4e7f950295850aec1 100644
--- a/Testing/Code/BasicFilters/otbEuclideanDistanceWithMissingValueNew.cxx
+++ b/Testing/Code/BasicFilters/otbEuclideanDistanceWithMissingValueNew.cxx
@@ -9,7 +9,7 @@ Version:   $Revision$
 Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
 See OTBCopyright.txt for details.
 
-Copyright (c) Institut Telecom ; Telecom Bretagne. All rights reserved.
+Copyright (c) Institut Telecom; Telecom Bretagne. All rights reserved.
 See ITCopyright.txt for details.
 
 This software is distributed WITHOUT ANY WARRANTY; without even
diff --git a/Testing/Code/BasicFilters/otbImagePCAShapeModelEstimatorTest.cxx b/Testing/Code/BasicFilters/otbImagePCAShapeModelEstimatorTest.cxx
index 7d9e889dffd372d7da080c6a255d3165cd93d65b..38e34b510496985d3cdb67358ab44357551de746 100644
--- a/Testing/Code/BasicFilters/otbImagePCAShapeModelEstimatorTest.cxx
+++ b/Testing/Code/BasicFilters/otbImagePCAShapeModelEstimatorTest.cxx
@@ -63,12 +63,12 @@ int otbImagePCAShapeModelEstimatorTest(int argc, char* argv[] )
       std::vector<std::string> imagesfilenames;
       std::vector<std::string> outputimagesfilenames;
       int cpt(3);
-      for(; cpt<(numberOfTrainingImages+3) ; cpt++)
+      for(; cpt<(numberOfTrainingImages+3); cpt++)
       {
           imagesfilenames.push_back(argv[cpt]);
       }
       int cpt2(cpt);
-      for(; cpt<(numberOfPrincipalComponentsRequired+cpt2) ; cpt++)
+      for(; cpt<(numberOfPrincipalComponentsRequired+cpt2); cpt++)
       {
           outputimagesfilenames.push_back(argv[cpt]);
       }
diff --git a/Testing/Code/BasicFilters/otbInnerProductPCAImageFilter.cxx b/Testing/Code/BasicFilters/otbInnerProductPCAImageFilter.cxx
index 643c2a3bd2cba3b2cdcb26938ff1f28bd56bf9a7..abc38f537e99cc94860e96357ea9474f44976020 100644
--- a/Testing/Code/BasicFilters/otbInnerProductPCAImageFilter.cxx
+++ b/Testing/Code/BasicFilters/otbInnerProductPCAImageFilter.cxx
@@ -57,7 +57,7 @@ int otbInnerProductPCAImageFilter( int argc, char* argv[] )
   unsigned int nbComponents = numberOfPrincipalComponentsRequired;
   if (generateMeanComponent == true) nbComponents += 1;
 
-  for(unsigned int cpt=0 ; cpt < nbComponents ; cpt++)
+  for(unsigned int cpt=0; cpt < nbComponents; cpt++)
   {
     ExtractROIFilterType::Pointer extractROIFilter = ExtractROIFilterType::New();
     WriterType2::Pointer     writer2     = WriterType2::New();
diff --git a/Testing/Code/BasicFilters/otbListSampleToHistogramListGenerator.cxx b/Testing/Code/BasicFilters/otbListSampleToHistogramListGenerator.cxx
index 423c0537bcbc08136e9cf162b0bfe89282dfb481..6bd2c413bb41c52f6306c7c7f55551ab9c1255e3 100644
--- a/Testing/Code/BasicFilters/otbListSampleToHistogramListGenerator.cxx
+++ b/Testing/Code/BasicFilters/otbListSampleToHistogramListGenerator.cxx
@@ -59,7 +59,7 @@ int otbListSampleToHistogramListGenerator(int argc, char * argv[])
   for(unsigned int comp = 0; comp<reader->GetOutput()->GetNumberOfComponentsPerPixel();++comp)
     {
     ofs<<"Channel: "<<comp<<" histogram: "<<std::endl;
-    for(unsigned int bin = 0; bin <nbBins ;++bin)
+    for(unsigned int bin = 0; bin <nbBins;++bin)
       {
       ofs<<generator->GetOutput()->GetNthElement(comp)->GetFrequency(bin)<<"\t";
       }
diff --git a/Testing/Code/BasicFilters/otbPointSetDensityFunctionTest.cxx b/Testing/Code/BasicFilters/otbPointSetDensityFunctionTest.cxx
index af6ffd04b993725161a18e3c98fb5a155a0a1da2..7efe47dc111d8cdbf5229ca8f10fc0cccf37a504 100644
--- a/Testing/Code/BasicFilters/otbPointSetDensityFunctionTest.cxx
+++ b/Testing/Code/BasicFilters/otbPointSetDensityFunctionTest.cxx
@@ -46,16 +46,16 @@ int otbPointSetDensityFunctionTest(int argc, char* argv[] )
   PointSetType::PointIdentifier count = 0;
 
   PointSetType::PointType  pDst ,pSrc;
-  pDst[0] = 12.78 ;
-  pDst[1] = 18.76 ;
+  pDst[0] = 12.78;
+  pDst[1] = 18.76;
   pointSet->SetPoint(count++,pDst);
 
-  pDst[0] = 15.78 ;
-  pDst[1] = 23.76 ;
+  pDst[0] = 15.78;
+  pDst[1] = 23.76;
   pointSet->SetPoint(count++,pDst);
 
-  pDst[0] = 9.78 ;
-  pDst[1] = 5.76 ;
+  pDst[0] = 9.78;
+  pDst[1] = 5.76;
   pointSet->SetPoint(count++,pDst);
 
 
diff --git a/Testing/Code/BasicFilters/otbPolygonCompacityFunctor.cxx b/Testing/Code/BasicFilters/otbPolygonCompacityFunctor.cxx
index 0f010fc1c0c2340e30449927ec8f1360f920465b..a54cb4eac957e4ef966c937693d7e8cb62531a6f 100644
--- a/Testing/Code/BasicFilters/otbPolygonCompacityFunctor.cxx
+++ b/Testing/Code/BasicFilters/otbPolygonCompacityFunctor.cxx
@@ -37,7 +37,7 @@ int otbPolygonCompacityFunctor( int argc, char * argv[] )
 
   if (argc !=3 )
   {
-    std::cout << "Usage: " << argv[0] ;
+    std::cout << "Usage: " << argv[0];
     std::cout << " inputImage outputFile" << std::endl;
     return 1;
   }
diff --git a/Testing/Code/Common/otbHistogramStatisticsFunction.cxx b/Testing/Code/Common/otbHistogramStatisticsFunction.cxx
index 26d7c7ab0f4cef5a69b9c7f2711c6869aa106379..c73e0fa63776ffde579c987e84fb084033d32d25 100644
--- a/Testing/Code/Common/otbHistogramStatisticsFunction.cxx
+++ b/Testing/Code/Common/otbHistogramStatisticsFunction.cxx
@@ -27,19 +27,19 @@ int otbHistogramStatisticsFunction(int argc, char* argv[])
 {
   unsigned int  NbOfBins((unsigned int)::atoi(argv[1]));
 
-  typedef float MeasurementType ;
-  typedef itk::Statistics::Histogram< MeasurementType, 1 > HistogramType ;
-  HistogramType::Pointer histogram = HistogramType::New() ;
+  typedef float MeasurementType;
+  typedef itk::Statistics::Histogram< MeasurementType, 1 > HistogramType;
+  HistogramType::Pointer histogram = HistogramType::New();
 
   // initialize histogram
   HistogramType::SizeType size;
-  size.Fill(NbOfBins) ;
-  HistogramType::MeasurementVectorType lowerBound ;
-  HistogramType::MeasurementVectorType upperBound ;
-  lowerBound[0] = 0.0 ;
-  upperBound[0] = NbOfBins ;
+  size.Fill(NbOfBins);
+  HistogramType::MeasurementVectorType lowerBound;
+  HistogramType::MeasurementVectorType upperBound;
+  lowerBound[0] = 0.0;
+  upperBound[0] = NbOfBins;
 
-  histogram->Initialize(size, lowerBound, upperBound ) ;
+  histogram->Initialize(size, lowerBound, upperBound );
 
 
   // create histogram with same value for each frequency
diff --git a/Testing/Code/Common/otbLineSpatialObjectList.cxx b/Testing/Code/Common/otbLineSpatialObjectList.cxx
index 609cf48f7eb74b97eb412b394f48fff6bb0e1d56..380c209ea7418d2c45a1abc4bb6d6283d4d13b64 100644
--- a/Testing/Code/Common/otbLineSpatialObjectList.cxx
+++ b/Testing/Code/Common/otbLineSpatialObjectList.cxx
@@ -29,7 +29,7 @@ int otbLineSpatialObjectList( int argc, char * argv[] )
   typedef LineSpatialObjectListType::const_iterator                       LineSpatialObjectListConstIterator;
 
   LineSpatialObjectListType::Pointer listLines = LineSpatialObjectListType::New();
-  for ( int i = 0 ; i < 10 ; i++ )
+  for ( int i = 0; i < 10; i++ )
   {
     LineSpatialObjecType::Pointer lLine = LineSpatialObjecType::New();
     listLines->push_back( lLine );
diff --git a/Testing/Code/Common/otbMultiChannelExtractROI.cxx b/Testing/Code/Common/otbMultiChannelExtractROI.cxx
index 939982bfddcc7ba85489b80c0d60b3f94107387e..8e81555ce063ae5cf3f5e63f2a7fd256425b55c6 100644
--- a/Testing/Code/Common/otbMultiChannelExtractROI.cxx
+++ b/Testing/Code/Common/otbMultiChannelExtractROI.cxx
@@ -100,7 +100,7 @@ int generic_otbMultiChannelExtractROI( int argc, char * argv[], const char * inp
   std::cout << " Canaux selectionnes ("<<extractROIFilter->GetNbChannels()<<") : ";
   typename ExtractROIFilterType::ChannelsType lChannels;
   lChannels = extractROIFilter->GetChannels();
-  for (unsigned int i=0 ; i< lChannels.size(); i++)
+  for (unsigned int i=0; i< lChannels.size(); i++)
   {
     std::cout << lChannels[i]<<" ";
   }
diff --git a/Testing/Code/Common/otbPathListToHistogramGenerator.cxx b/Testing/Code/Common/otbPathListToHistogramGenerator.cxx
index e7cb3f9dc1c30be217da5dfc3f22ddce9c494b27..a8ac5680b5993d3300caca0dc30f9ff06045bc2e 100644
--- a/Testing/Code/Common/otbPathListToHistogramGenerator.cxx
+++ b/Testing/Code/Common/otbPathListToHistogramGenerator.cxx
@@ -46,7 +46,7 @@ int otbPathListToHistogramGenerator( int argc, char* argv[] )
   PathListType*  PathList = new PathListType;
   PathList->clear();
 
-  for (int i = 0 ; i <NbAngle ; i++)
+  for (int i = 0; i <NbAngle; i++)
   {
     PathPointer pathElt = PathType::New();
     pathElt->Initialize();
diff --git a/Testing/Code/Common/otbTestCommandLineArgumentParser.cxx b/Testing/Code/Common/otbTestCommandLineArgumentParser.cxx
index dca82b0f93b406586ec9620395919094e5fca64a..94a6b2674ebbfb10a0f5c74624a55bc98cfb0f20 100644
--- a/Testing/Code/Common/otbTestCommandLineArgumentParser.cxx
+++ b/Testing/Code/Common/otbTestCommandLineArgumentParser.cxx
@@ -35,7 +35,7 @@ int otbTestCommandLineArgumentParser( int argc, char * argv[] )
   typedef otb::CommandLineArgumentParseResult ParserResultType;
   ParserResultType::Pointer  parseResult = ParserResultType::New();
 
-  parser->ParseCommandLine(argc,argv,parseResult) ;
+  parser->ParseCommandLine(argc,argv,parseResult);
 
 
   std::cout << "Image : "<<parseResult->GetParameterString("-image")<<std::endl;
diff --git a/Testing/Code/Common/otbTestCommandLineArgumentParserHelp.cxx b/Testing/Code/Common/otbTestCommandLineArgumentParserHelp.cxx
index 513ceaf0cb4e0ce1518c5b8e740678141a26cdd7..9e38d4b617b37608f436551934d1ad6efee45693 100644
--- a/Testing/Code/Common/otbTestCommandLineArgumentParserHelp.cxx
+++ b/Testing/Code/Common/otbTestCommandLineArgumentParserHelp.cxx
@@ -35,7 +35,7 @@ int otbTestCommandLineArgumentParserHelp( int argc, char * argv[] )
     typedef otb::CommandLineArgumentParseResult ParserResultType;
     ParserResultType::Pointer  parseResult = ParserResultType::New();
 
-    parser->ParseCommandLine(argc,argv,parseResult) ;
+    parser->ParseCommandLine(argc,argv,parseResult);
 
 
     std::cout << "Image : "<<parseResult->GetParameterString("-image")<<std::endl;
diff --git a/Testing/Code/Common/otbTestCommandLineArgumentParserList.cxx b/Testing/Code/Common/otbTestCommandLineArgumentParserList.cxx
index 3eb34df1af7209347b7610e43476016e9540f209..3fcd49e7964e83bb7d540fd5fe4df8c7ceda8ae6 100644
--- a/Testing/Code/Common/otbTestCommandLineArgumentParserList.cxx
+++ b/Testing/Code/Common/otbTestCommandLineArgumentParserList.cxx
@@ -36,7 +36,7 @@ int otbTestCommandLineArgumentParserList( int argc, char * argv[] )
   typedef otb::CommandLineArgumentParseResult ParserResultType;
   ParserResultType::Pointer  parseResult = ParserResultType::New();
 
-  parser->ParseCommandLine(argc,argv,parseResult) ;
+  parser->ParseCommandLine(argc,argv,parseResult);
 
 
   std::cout << "Image : "<<parseResult->GetParameterString("-image")<<std::endl;
@@ -54,7 +54,7 @@ int otbTestCommandLineArgumentParserList( int argc, char * argv[] )
   std::cout << "Double : "<<lDouble<<std::endl;
 
   std::cout << "List de Double : "<<parseResult->GetNumberOfParameters("-doubles")<<std::endl;
-  for (int i =0 ; i<parseResult->GetNumberOfParameters("-doubles") ; i++)
+  for (int i =0; i<parseResult->GetNumberOfParameters("-doubles"); i++)
   {
     //double value = otb::GetParameter<double>(parseResult,"-doubles",i);
     double value = parseResult->GetParameterDouble("-doubles",i);
diff --git a/Testing/Code/Common/otbTestCommandLineArgumentParserWithError.cxx b/Testing/Code/Common/otbTestCommandLineArgumentParserWithError.cxx
index c80c06914b24f542dc31d169bc68c5e6c07c18ad..d840ac51d5d2321ed9a55159c1aec202828177cc 100644
--- a/Testing/Code/Common/otbTestCommandLineArgumentParserWithError.cxx
+++ b/Testing/Code/Common/otbTestCommandLineArgumentParserWithError.cxx
@@ -38,7 +38,7 @@ int otbTestCommandLineArgumentParserWithError( int argc, char * argv[] )
   try
   {
 
-    parser->ParseCommandLine(argc,argv,parseResult) ;
+    parser->ParseCommandLine(argc,argv,parseResult);
 
 
     std::cout << "Image : "<<parseResult->GetParameterString("-image")<<std::endl;
diff --git a/Testing/Code/DisparityMap/otbBSplinesInterpolateTransformDeformationFieldGenerator.cxx b/Testing/Code/DisparityMap/otbBSplinesInterpolateTransformDeformationFieldGenerator.cxx
index 43e9f10c41d93893380a19cd5dcad47ae7fc7e52..3dc64b43b8c848e74014f27ef85f3fff8450a1a6 100644
--- a/Testing/Code/DisparityMap/otbBSplinesInterpolateTransformDeformationFieldGenerator.cxx
+++ b/Testing/Code/DisparityMap/otbBSplinesInterpolateTransformDeformationFieldGenerator.cxx
@@ -78,13 +78,13 @@ int otbBSplinesInterpolateTransformDeformationFieldGenerator(int argc, char * ar
   pd4[0] = 0.91;
   pd4[1] = 0;
   pd4[2] = 0;
-  pd4[3] = 0.03925  ;
+  pd4[3] = 0.03925 ;
   pd4[4] = -5;
   pd4[5] = 5;
   pd5[0] = 0.91;
   pd5[1] = 0;
   pd5[2] = 0;
-  pd5[3] = -0.03925  ;
+  pd5[3] = -0.03925 ;
   pd5[4] = -5;
   pd5[5] = -5;
 
diff --git a/Testing/Code/DisparityMap/otbDisparityMapEstimationMethod.cxx b/Testing/Code/DisparityMap/otbDisparityMapEstimationMethod.cxx
index 616b810883856447d34e9531b85bdc5a6386ff2c..c933bd5ff446fe8172365a5bf23e641137050276 100644
--- a/Testing/Code/DisparityMap/otbDisparityMapEstimationMethod.cxx
+++ b/Testing/Code/DisparityMap/otbDisparityMapEstimationMethod.cxx
@@ -135,7 +135,7 @@ int otbDisparityMapEstimationMethod(int argc, char* argv[])
   std::cout<<"Point data size: "<<pointSet->GetPointData()->Size()<<std::endl;
   for (;it!=pointSet->GetPoints()->End()
        &&itData!=pointSet->GetPointData()->End()
-       ;++it,++itData)
+      ;++it,++itData)
   {
     out<<"Point "<<it.Value()<<" -> transform parameters: ";
     out<<itData.Value();
diff --git a/Testing/Code/FeatureExtraction/otbAlignImageToPath.cxx b/Testing/Code/FeatureExtraction/otbAlignImageToPath.cxx
index 800d9a85d2ecec0f1267d3b42b99661b5cd6f5c7..db0035707a50440509e4e420264e450c14658dc7 100644
--- a/Testing/Code/FeatureExtraction/otbAlignImageToPath.cxx
+++ b/Testing/Code/FeatureExtraction/otbAlignImageToPath.cxx
@@ -104,7 +104,7 @@ int otbAlignImageToPath( int argc, char * argv[] )
   int nbPath = sortiePath->Size();
   otbGenericMsgDebugMacro(<< "NbSegment: "<<nbPath);
   fprintf(file,"Nb Segment: %d\n",nbPath);
-  for (int i =0 ; i<nbPath ;i++)
+  for (int i =0; i<nbPath;i++)
   {
     vertexList = sortiePath->GetNthElement(i)->GetVertexList();
     cindex = vertexList->GetElement(0);
diff --git a/Testing/Code/FeatureExtraction/otbBreakAngularPathListFilter.cxx b/Testing/Code/FeatureExtraction/otbBreakAngularPathListFilter.cxx
index 4e3735fee0b6617d6ef32ef7069d8692b90e6135..a3b312e96e0a4519f09f0c13ea8ae357aa0552f7 100644
--- a/Testing/Code/FeatureExtraction/otbBreakAngularPathListFilter.cxx
+++ b/Testing/Code/FeatureExtraction/otbBreakAngularPathListFilter.cxx
@@ -76,12 +76,12 @@ int otbBreakAngularPathListFilter(int argc, char * argv[])
   PathListType::Pointer InputPathList = PathListType::New();
 
   //Generate PathList
-  for (PointsMatrixType::iterator listpos=MatricePoints.begin() ; listpos != MatricePoints.end() ; ++listpos)
+  for (PointsMatrixType::iterator listpos=MatricePoints.begin(); listpos != MatricePoints.end(); ++listpos)
   {
     PathType::Pointer path = PathType::New();
     //Generate PathList
     std::cout << "List "<<std::endl;
-    for (PointsVectorType::iterator it=(*listpos).begin() ; it != (*listpos).end() ; ++it)
+    for (PointsVectorType::iterator it=(*listpos).begin(); it != (*listpos).end(); ++it)
     {
       cindex[0] = *it;
       ++it;
@@ -100,7 +100,7 @@ int otbBreakAngularPathListFilter(int argc, char * argv[])
   std::ofstream file;
   file.open(outfname);
 
-  for (PointsVectorType::iterator itAngle=ListMaxAngle.begin() ; itAngle != ListMaxAngle.end() ; ++itAngle)
+  for (PointsVectorType::iterator itAngle=ListMaxAngle.begin(); itAngle != ListMaxAngle.end(); ++itAngle)
   {
 
 
diff --git a/Testing/Code/FeatureExtraction/otbCompacityPathCircle.cxx b/Testing/Code/FeatureExtraction/otbCompacityPathCircle.cxx
index 8f64f09badeb87329da1d45d78e7d6e342ca34f2..38a1ffae5681a2c7952f3cf57650fe32c378eaab 100644
--- a/Testing/Code/FeatureExtraction/otbCompacityPathCircle.cxx
+++ b/Testing/Code/FeatureExtraction/otbCompacityPathCircle.cxx
@@ -50,7 +50,7 @@ int otbCompacityPathCircle( int argc, char * argv[] )
 
   pathElt->Initialize();
 
-  for (unsigned int noTheta = 0 ; noTheta < NbOfPoints ; noTheta++)
+  for (unsigned int noTheta = 0; noTheta < NbOfPoints; noTheta++)
   {
     RealType Theta = deltaTheta * static_cast<RealType>(noTheta);
 
diff --git a/Testing/Code/FeatureExtraction/otbFillGapsFilter.cxx b/Testing/Code/FeatureExtraction/otbFillGapsFilter.cxx
index 9a9dc9108b1df711cc46bc524229798d977439f3..bdf2c99f6bef998046ccc08dc78c561150a1f071 100644
--- a/Testing/Code/FeatureExtraction/otbFillGapsFilter.cxx
+++ b/Testing/Code/FeatureExtraction/otbFillGapsFilter.cxx
@@ -62,7 +62,7 @@ int otbFillGapsFilter( int argc, char * argv[] )
   FillGapsFilterType::Pointer fillgaps = FillGapsFilterType::New();
 
   LinesListType::Pointer   linesListBeforeFillGaps = LinesListType::New();
-  const LinesListType *linesListAfterFillGaps ;
+  const LinesListType *linesListAfterFillGaps;
 
   LineType::PointListType  pointList;
   LineType::LinePointType  point;
diff --git a/Testing/Code/FeatureExtraction/otbFlusserImage.cxx b/Testing/Code/FeatureExtraction/otbFlusserImage.cxx
index d230706cf3fb90ac1ac95d0edada5d95b51f99b0..454051810e09ba1b0f9b569f3760808119f60d21 100644
--- a/Testing/Code/FeatureExtraction/otbFlusserImage.cxx
+++ b/Testing/Code/FeatureExtraction/otbFlusserImage.cxx
@@ -75,7 +75,7 @@ int otbFlusserImage( int argc, char * argv[] )
   std::ofstream outputStream(outputFilename);
   outputStream <<std::setprecision(10)<<"Flusser Image moments: [12]"<<std::endl;
 
-  for (Number = 1 ;Number<12;Number++)
+  for (Number = 1;Number<12;Number++)
   {
     //OTB-FA-00024-CS
     function->SetMomentNumber(Number);
diff --git a/Testing/Code/FeatureExtraction/otbFlusserPath.cxx b/Testing/Code/FeatureExtraction/otbFlusserPath.cxx
index 0726a9dbd456e3ba244818470d3e2522e58bbf09..ed574603d1945d02a6eb0a999871671b6b37076a 100644
--- a/Testing/Code/FeatureExtraction/otbFlusserPath.cxx
+++ b/Testing/Code/FeatureExtraction/otbFlusserPath.cxx
@@ -65,7 +65,7 @@ int otbFlusserPath( int argc, char * argv[] )
 
   RealType Result;
 
-  for (Number = 1 ;Number<12;Number++)
+  for (Number = 1;Number<12;Number++)
   {
     //OTB-FA-00024-CS
     function->SetMomentNumber(Number);
diff --git a/Testing/Code/FeatureExtraction/otbHarrisToPointSet.cxx b/Testing/Code/FeatureExtraction/otbHarrisToPointSet.cxx
index 9f02805425130251d3a757ea992b9863f80c06e9..f37e5b5706a1f51d9ddaea3ca559a9414aef1bd5 100644
--- a/Testing/Code/FeatureExtraction/otbHarrisToPointSet.cxx
+++ b/Testing/Code/FeatureExtraction/otbHarrisToPointSet.cxx
@@ -75,10 +75,10 @@ int otbHarrisToPointSet( int argc, char * argv[] )
   unsigned long  NbPoints  = pointList->GetNumberOfPoints();
   file << "NbPoints : " << NbPoints <<std::endl;
 
-  for (unsigned long i = 0 ; i < NbPoints ; i++)
+  for (unsigned long i = 0; i < NbPoints; i++)
   {
     pointList->GetPoint(i,&CoordPoint);
-    file << i+1 <<" / " << NbPoints << " : " ;
+    file << i+1 <<" / " << NbPoints << " : ";
     file << CoordPoint[0]<<" , "<< CoordPoint[1] << std::endl;
   }
 
diff --git a/Testing/Code/FeatureExtraction/otbHoughTransform2DLinesImageTest.cxx b/Testing/Code/FeatureExtraction/otbHoughTransform2DLinesImageTest.cxx
index d4d60966673e43d10b635593e149225d51be327e..bca9a4ab74ce5f1e5ef34cd5e9cfa7aefa7a5e47 100644
--- a/Testing/Code/FeatureExtraction/otbHoughTransform2DLinesImageTest.cxx
+++ b/Testing/Code/FeatureExtraction/otbHoughTransform2DLinesImageTest.cxx
@@ -224,7 +224,7 @@ int otbHoughTransform2DLinesImageTest(int argc , char* argv[])
       {
         houghPoint m_HoughPoint;
         m_HoughPoint.radius = it_input.GetIndex()[0];
-        m_HoughPoint.angle  = ((it_input.GetIndex()[1])*2*nPI/houghFilter->GetAngleAxisSize())-nPI ;
+        m_HoughPoint.angle  = ((it_input.GetIndex()[1])*2*nPI/houghFilter->GetAngleAxisSize())-nPI;
 
         m_LinesList.push_back(m_HoughPoint);
 
diff --git a/Testing/Code/FeatureExtraction/otbHuImage.cxx b/Testing/Code/FeatureExtraction/otbHuImage.cxx
index 80e4e21fe60a8137fd71a304606ed5c9de1782c7..29f34d341f985d02c5ea84997f7937c0ce44daa8 100644
--- a/Testing/Code/FeatureExtraction/otbHuImage.cxx
+++ b/Testing/Code/FeatureExtraction/otbHuImage.cxx
@@ -74,7 +74,7 @@ int otbHuImage( int argc, char * argv[] )
 
   std::ofstream outputStream(outputFilename);
   outputStream << std::setprecision(10) << "Hu Image moments: [10]"<<std::endl;
-  for (Number = 1 ;Number<10;Number++)
+  for (Number = 1;Number<10;Number++)
   {
     //OTB-FA-00024-CS
     function->SetMomentNumber(Number);
diff --git a/Testing/Code/FeatureExtraction/otbHuPath.cxx b/Testing/Code/FeatureExtraction/otbHuPath.cxx
index 645760bab53294aabcac6300b2d51f9ca31ed3e1..528a9f06b00fe792479c552a670302e83afa2951 100644
--- a/Testing/Code/FeatureExtraction/otbHuPath.cxx
+++ b/Testing/Code/FeatureExtraction/otbHuPath.cxx
@@ -65,7 +65,7 @@ int otbHuPath( int argc, char * argv[] )
   std::ofstream outputStream(outputFilename);
   outputStream << std::setprecision(10) << "Hu Path moments: [8]"<<std::endl;
 
-  for (Number = 1 ;Number<8;Number++)
+  for (Number = 1;Number<8;Number++)
   {
     //OTB-FA-00024-CS
     function->SetMomentNumber(Number);
diff --git a/Testing/Code/FeatureExtraction/otbImageToEdgePathFilter.cxx b/Testing/Code/FeatureExtraction/otbImageToEdgePathFilter.cxx
index d1c32daa626a0c4df59659127ca64b993bfd0543..93d49c6525c3232595c486e55daf6d45cf6d1bd7 100644
--- a/Testing/Code/FeatureExtraction/otbImageToEdgePathFilter.cxx
+++ b/Testing/Code/FeatureExtraction/otbImageToEdgePathFilter.cxx
@@ -76,7 +76,7 @@ int otbImageToEdgePathFilter(int argc, char * argv[])
   // Create one iterator for the Input Image (this is a light object)
   IteratorType it( outputImage, outputImage->GetBufferedRegion() );
 
-  for (unsigned int cpt=0 ; cpt<  ptrVertexList->Size() ; cpt++)
+  for (unsigned int cpt=0; cpt<  ptrVertexList->Size(); cpt++)
   {
     std::cout <<" Point "<<cpt<<" : "<< ptrVertexList->GetElement(cpt)<<std::endl;
     IndexType pos;
diff --git a/Testing/Code/FeatureExtraction/otbImageToFastSIFTKeyPointSetFilterOutputDescriptorAscii.cxx b/Testing/Code/FeatureExtraction/otbImageToFastSIFTKeyPointSetFilterOutputDescriptorAscii.cxx
index 26aa4fd829452cef4f451bd461c2423de1709a0e..0a3877a80f7a2c24eda0a1c39ad997dc1238b3e0 100644
--- a/Testing/Code/FeatureExtraction/otbImageToFastSIFTKeyPointSetFilterOutputDescriptorAscii.cxx
+++ b/Testing/Code/FeatureExtraction/otbImageToFastSIFTKeyPointSetFilterOutputDescriptorAscii.cxx
@@ -98,7 +98,7 @@ int otbImageToFastSIFTKeyPointSetFilterOutputDescriptorAscii(int argc, char * ar
   }
 
   //Sorting the vectors
-  ImageDataType::iterator itData ;
+  ImageDataType::iterator itData;
   sort(imageData.begin() , imageData.end(),CMPData);
 
   itData = imageData.begin();
@@ -108,7 +108,7 @@ int otbImageToFastSIFTKeyPointSetFilterOutputDescriptorAscii(int argc, char * ar
     int itDescriptor = 0;
     while (itDescriptor < static_cast<int> (pDataIt.Value().Size() ))
     {
-      outfile << "[" << std::fixed << std::setprecision(3) << (*itData)[itDescriptor+2] << " " ;
+      outfile << "[" << std::fixed << std::setprecision(3) << (*itData)[itDescriptor+2] << " ";
       itDescriptor++;
     }
     outfile << "]" << std::endl;
diff --git a/Testing/Code/FeatureExtraction/otbImageToFastSIFTKeyPointSetFilterOutputInterestPointAscii.cxx b/Testing/Code/FeatureExtraction/otbImageToFastSIFTKeyPointSetFilterOutputInterestPointAscii.cxx
index 14926ff5a6a65082e65544761a65b4bb4ba8afdb..f7c9d397e8d315f25e3a46e97ab64d4917149de5 100644
--- a/Testing/Code/FeatureExtraction/otbImageToFastSIFTKeyPointSetFilterOutputInterestPointAscii.cxx
+++ b/Testing/Code/FeatureExtraction/otbImageToFastSIFTKeyPointSetFilterOutputInterestPointAscii.cxx
@@ -104,7 +104,7 @@ int otbImageToFastSIFTKeyPointSetFilterOutputInterestPointAscii(int argc, char *
   }
 
   //Sorting the vectors
-  ImageDataType::iterator itData ;
+  ImageDataType::iterator itData;
   sort(imageData.begin() , imageData.end(),CMP);
 
   itData = imageData.begin();
diff --git a/Testing/Code/FeatureExtraction/otbImageToSURFKeyPointSetFilterOutputDescriptorAscii.cxx b/Testing/Code/FeatureExtraction/otbImageToSURFKeyPointSetFilterOutputDescriptorAscii.cxx
index 24f471675a6111ec9ab91503a15d83d7260dd103..460461d67000dadd2cbbe6e553519c4355e1becd 100644
--- a/Testing/Code/FeatureExtraction/otbImageToSURFKeyPointSetFilterOutputDescriptorAscii.cxx
+++ b/Testing/Code/FeatureExtraction/otbImageToSURFKeyPointSetFilterOutputDescriptorAscii.cxx
@@ -81,7 +81,7 @@ int otbImageToSURFKeyPointSetFilterOutputDescriptorAscii(int argc, char * argv[]
 
   while ( pIt!=filter->GetOutput()->GetPoints()->End() )
   {
-    outfile << "[" ;
+    outfile << "[";
     unsigned int lIterDesc=0;
     while (lIterDesc < pDataIt.Value().Size())
     {
diff --git a/Testing/Code/FeatureExtraction/otbLikelihoodPathListFilter.cxx b/Testing/Code/FeatureExtraction/otbLikelihoodPathListFilter.cxx
index 77ea94ca4b42f56f575864c828a175034a40709c..f046bd236ba1c2030cff1f171ffce8c8ad8dfc91 100644
--- a/Testing/Code/FeatureExtraction/otbLikelihoodPathListFilter.cxx
+++ b/Testing/Code/FeatureExtraction/otbLikelihoodPathListFilter.cxx
@@ -71,12 +71,12 @@ int otbLikelihoodPathListFilter(int argc, char * argv[])
   PathListType::Pointer InputPathList = PathListType::New();
 
   //Generate PathList
-  for (PointsMatrixType::iterator listpos=MatricePoints.begin() ; listpos != MatricePoints.end() ; ++listpos)
+  for (PointsMatrixType::iterator listpos=MatricePoints.begin(); listpos != MatricePoints.end(); ++listpos)
   {
     PathType::Pointer path = PathType::New();
     //Generate PathList
     std::cout << "List "<<std::endl;
-    for (PointsVectorType::iterator it=(*listpos).begin() ; it != (*listpos).end() ; ++it)
+    for (PointsVectorType::iterator it=(*listpos).begin(); it != (*listpos).end(); ++it)
     {
       cindex[0] = *it;
       ++it;
diff --git a/Testing/Code/FeatureExtraction/otbLineSegmentDetector.cxx b/Testing/Code/FeatureExtraction/otbLineSegmentDetector.cxx
index cf4b7c5a746697705329ef518655dcf027d48fcd..74ebc650609558bfb16d409a1d74b2592a0693fc 100644
--- a/Testing/Code/FeatureExtraction/otbLineSegmentDetector.cxx
+++ b/Testing/Code/FeatureExtraction/otbLineSegmentDetector.cxx
@@ -78,13 +78,13 @@ int otbLineSegmentDetector( int argc, char * argv[] )
       
 //       float x = (*itPoints).GetPosition()[0];
 //       float y = (*itPoints).GetPosition()[1];
-//       IndexBegin[0] = static_cast<int>(x) ; IndexBegin[1] = static_cast<int>(y);
+//       IndexBegin[0] = static_cast<int>(x); IndexBegin[1] = static_cast<int>(y);
       
 //       itPoints++;
 
 //       float x1 = (*itPoints).GetPosition()[0];
 //       float y1 = (*itPoints).GetPosition()[1];
-//       IndexEnd[0]= static_cast<int>(x1) ; IndexEnd[1] = static_cast<int>(y1);
+//       IndexEnd[0]= static_cast<int>(x1); IndexEnd[1] = static_cast<int>(y1);
 
 //       LineIteratorFilter   itLine(reader->GetOutput(),IndexBegin,  IndexEnd);
 //       itLine.GoToBegin();
diff --git a/Testing/Code/FeatureExtraction/otbLineSpatialObjectListToRightAnglePointSetFilter.cxx b/Testing/Code/FeatureExtraction/otbLineSpatialObjectListToRightAnglePointSetFilter.cxx
index 73ec5b3df3c86dea4db386e52dcccc0a0d9295dd..ebecd5775084ed3d71c57c8470fa6b7f8ab35e65 100644
--- a/Testing/Code/FeatureExtraction/otbLineSpatialObjectListToRightAnglePointSetFilter.cxx
+++ b/Testing/Code/FeatureExtraction/otbLineSpatialObjectListToRightAnglePointSetFilter.cxx
@@ -132,7 +132,7 @@ int otbLineSpatialObjectListToRightAnglePointSetFilter( int argc, char * argv[]
   segmentOrtho = rightAngleFilter->GetOutput();
   PointSetType::PointType   pRight;
   
-  for (unsigned int i = 0; i<segmentOrtho->GetNumberOfPoints() ; i++)
+  for (unsigned int i = 0; i<segmentOrtho->GetNumberOfPoints(); i++)
     {
       segmentOrtho->GetPoint(i, &pRight);
       outfile << " Right Angle found in point : " <<  pRight << std::endl;
diff --git a/Testing/Code/FeatureExtraction/otbLineSpatialObjectListToRightAnglePointSetFilterByStepsOutputAscii.cxx b/Testing/Code/FeatureExtraction/otbLineSpatialObjectListToRightAnglePointSetFilterByStepsOutputAscii.cxx
index 5b485941a1e8fae536891d4bdd174a2b97b45cda..e2dbeaf6c41997151c52e391d7ddecdab928c12b 100644
--- a/Testing/Code/FeatureExtraction/otbLineSpatialObjectListToRightAnglePointSetFilterByStepsOutputAscii.cxx
+++ b/Testing/Code/FeatureExtraction/otbLineSpatialObjectListToRightAnglePointSetFilterByStepsOutputAscii.cxx
@@ -76,7 +76,7 @@ int otbLineSpatialObjectListToRightAnglePointSetFilterByStepsOutputAscii( int ar
   LinesListType::Pointer    outputLinesList = LinesListType::New();
   
   std::ofstream outfile(outfname);
-  for (unsigned int i = 0; i<segmentOrtho->GetNumberOfPoints() ; i++)
+  for (unsigned int i = 0; i<segmentOrtho->GetNumberOfPoints(); i++)
     {
       segmentOrtho->GetPoint(i, &pRight);
       outfile << " Right Angle found in point : " <<  pRight << std::endl;
diff --git a/Testing/Code/FeatureExtraction/otbLinkPathListFilter.cxx b/Testing/Code/FeatureExtraction/otbLinkPathListFilter.cxx
index 544f57dda8c6ae93d9ea86161d95a4e31b04aecb..ef4893145a72b6c49bb78090f0c3a4826a9b1cb2 100644
--- a/Testing/Code/FeatureExtraction/otbLinkPathListFilter.cxx
+++ b/Testing/Code/FeatureExtraction/otbLinkPathListFilter.cxx
@@ -70,12 +70,12 @@ int otbLinkPathListFilter(int argc, char * argv[])
   PathListType::Pointer InputPathList = PathListType::New();
 
   //Generate PathList
-  for (PointsMatrixType::iterator listpos=MatricePoints.begin() ; listpos != MatricePoints.end() ; ++listpos)
+  for (PointsMatrixType::iterator listpos=MatricePoints.begin(); listpos != MatricePoints.end(); ++listpos)
   {
     PathType::Pointer path = PathType::New();
     //Generate PathList
     std::cout << "List "<<std::endl;
-    for (PointsVectorType::iterator it=(*listpos).begin() ; it != (*listpos).end() ; ++it)
+    for (PointsVectorType::iterator it=(*listpos).begin(); it != (*listpos).end(); ++it)
     {
       cindex[0] = *it;
       ++it;
diff --git a/Testing/Code/FeatureExtraction/otbRemoveTortuousPathListFilter.cxx b/Testing/Code/FeatureExtraction/otbRemoveTortuousPathListFilter.cxx
index 238dd7e5380a0a5026e9d1b4d77ec5a5c88a41f6..eb37db8bd5a38a7e76e14e57b4de50c487b4fccc 100644
--- a/Testing/Code/FeatureExtraction/otbRemoveTortuousPathListFilter.cxx
+++ b/Testing/Code/FeatureExtraction/otbRemoveTortuousPathListFilter.cxx
@@ -64,12 +64,12 @@ int otbRemoveTortuousPathListFilter(int argc, char * argv[])
   PathListType::Pointer InputPathList = PathListType::New();
 
   //Generate PathList
-  for (PointsMatrixType::iterator listpos=MatricePoints.begin() ; listpos != MatricePoints.end() ; ++listpos)
+  for (PointsMatrixType::iterator listpos=MatricePoints.begin(); listpos != MatricePoints.end(); ++listpos)
   {
     PathType::Pointer path = PathType::New();
     //Generate PathList
     std::cout << "List "<<std::endl;
-    for (PointsVectorType::iterator it=(*listpos).begin() ; it != (*listpos).end() ; ++it)
+    for (PointsVectorType::iterator it=(*listpos).begin(); it != (*listpos).end(); ++it)
     {
       cindex[0] = *it;
       ++it;
diff --git a/Testing/Code/FeatureExtraction/otbSimplePointCountStrategyTest.cxx b/Testing/Code/FeatureExtraction/otbSimplePointCountStrategyTest.cxx
index 608ed02ef00df6adf861a1073ad3ebd5e1e9077f..e587241abdb91e310fd96f54b7e30d0ef5b005a6 100644
--- a/Testing/Code/FeatureExtraction/otbSimplePointCountStrategyTest.cxx
+++ b/Testing/Code/FeatureExtraction/otbSimplePointCountStrategyTest.cxx
@@ -28,7 +28,7 @@ int otbSimplePointCountStrategyTest(int argc, char * argv[])
   typedef float                  RealType;
 
   typedef otb::Image<RealType,Dimension>                ImageType;
-  typedef ImageType::PointType                          PointType ;
+  typedef ImageType::PointType                          PointType;
   typedef itk::VariableLengthVector<RealType>           RealVectorType;
 
   typedef itk::PointSet<RealVectorType,Dimension>       PointSetType;
@@ -41,10 +41,10 @@ int otbSimplePointCountStrategyTest(int argc, char * argv[])
   PointSetType::Pointer pointset =  PointSetType::New();
   PointsContainerType::ElementIdentifier         count = 0;
   PointSetType::PointType Point;
-  Point[0] = 12.14 ;
+  Point[0] = 12.14;
   Point[1] = 14.14;
 
-  for (int  i = 0 ; i < 10 ; i++)
+  for (int  i = 0; i < 10; i++)
   {
     pointset->SetPoint(count, Point);
     count++;
@@ -52,8 +52,8 @@ int otbSimplePointCountStrategyTest(int argc, char * argv[])
 
   /*Test du filtre*/
   IndexType index;
-  index[0] = 12 ;
-  index[1] = 14 ;
+  index[0] = 12;
+  index[1] = 14;
   unsigned int rad = 2;
   counterType comptemoica;
 
diff --git a/Testing/Code/FeatureExtraction/otbSimplifyPathListFilter.cxx b/Testing/Code/FeatureExtraction/otbSimplifyPathListFilter.cxx
index c6bcfb30109f660b49aa2819d2385b3c852a7b71..817785863f976e2e40be37ab079baad24f88d041 100644
--- a/Testing/Code/FeatureExtraction/otbSimplifyPathListFilter.cxx
+++ b/Testing/Code/FeatureExtraction/otbSimplifyPathListFilter.cxx
@@ -64,12 +64,12 @@ int otbSimplifyPathListFilter(int argc, char * argv[])
   PathListType::Pointer InputPathList = PathListType::New();
 
   //Generate PathList
-  for (PointsMatrixType::iterator listpos=MatricePoints.begin() ; listpos != MatricePoints.end() ; ++listpos)
+  for (PointsMatrixType::iterator listpos=MatricePoints.begin(); listpos != MatricePoints.end(); ++listpos)
   {
     PathType::Pointer path = PathType::New();
     //Generate PathList
     std::cout << "List "<<std::endl;
-    for (PointsVectorType::iterator it=(*listpos).begin() ; it != (*listpos).end() ; ++it)
+    for (PointsVectorType::iterator it=(*listpos).begin(); it != (*listpos).end(); ++it)
     {
       cindex[0] = *it;
       ++it;
diff --git a/Testing/Code/FeatureExtraction/otbThresholdImageToPointSetTest.cxx b/Testing/Code/FeatureExtraction/otbThresholdImageToPointSetTest.cxx
index 71e6a08669f35be57dc995363b70812a589061ea..ba601929fc6b766f56de1ec72bfb125d1cd69652 100644
--- a/Testing/Code/FeatureExtraction/otbThresholdImageToPointSetTest.cxx
+++ b/Testing/Code/FeatureExtraction/otbThresholdImageToPointSetTest.cxx
@@ -68,7 +68,7 @@ int otbThresholdImageToPointSetTest( int argc, char * argv[] )
   //Initialization
   CoordPoint.Fill(0);
 
-  for (unsigned long i = 0 ; i < NbPoints ; i++)
+  for (unsigned long i = 0; i < NbPoints; i++)
   {
     pointList->GetPoint(i,&CoordPoint);
     file << i+1 <<"/" << NbPoints<<" : " << CoordPoint[0] << " , "<<CoordPoint[1]<< std::endl;
diff --git a/Testing/Code/IO/otbDEMHandlerTest.cxx b/Testing/Code/IO/otbDEMHandlerTest.cxx
index 6954d9f89b3db6bc059468421ca7f36f79b40e6e..c2766dfb8568a2a53fbae461e46ec3c20d0d90b7 100644
--- a/Testing/Code/IO/otbDEMHandlerTest.cxx
+++ b/Testing/Code/IO/otbDEMHandlerTest.cxx
@@ -48,7 +48,7 @@ int otbDEMHandlerTest(int argc, char * argv[])
   std::ofstream file;
   file.open(outputfilename);
   file << "--- HEIGHT ABOVE MSL TEST ---" << std::endl;
-  file << " geoPoint: "<<geoPoint[1]<<" ; "<<geoPoint[0]<< std::endl;
+  file << " geoPoint: "<<geoPoint[1]<<"; "<<geoPoint[0]<< std::endl;
   file << " -> Height: "<<height<< std::endl;
   file.close();
 
diff --git a/Testing/Code/IO/otbImageTest.cxx b/Testing/Code/IO/otbImageTest.cxx
index 31677bedebf9fb514a81321e0264e1df572cf49f..d7c3d5a29265e68d3b9337578f0430fc543d1dba 100644
--- a/Testing/Code/IO/otbImageTest.cxx
+++ b/Testing/Code/IO/otbImageTest.cxx
@@ -76,7 +76,7 @@ int otbImageTest(int argc, char* argv[])
   unsigned int GCPCount = image->GetGCPCount();
   file << "GCP Count " << image->GetGCPCount() << std::endl;
 
-  for (unsigned int GCPnum = 0 ; GCPnum < GCPCount ; GCPnum++ )
+  for (unsigned int GCPnum = 0; GCPnum < GCPCount; GCPnum++ )
   {
     file << "GCP[" << GCPnum << "] Id " << image->GetGCPId(GCPnum) << std::endl;
     file << "GCP[" << GCPnum << "] Info " << image->GetGCPInfo(GCPnum) << std::endl;
@@ -91,7 +91,7 @@ int otbImageTest(int argc, char* argv[])
   InputImageType::VectorType tab = image->GetGeoTransform();
 
   file << "Geo Transform " << std::endl;
-  for (unsigned int i = 0 ; i < tab.size() ; i++ )
+  for (unsigned int i = 0; i < tab.size(); i++ )
   {
     file << " " <<i<<" -> "<<tab[i]<< std::endl;
   }
@@ -99,28 +99,28 @@ int otbImageTest(int argc, char* argv[])
 
   tab = image->GetUpperLeftCorner();
   file << "Corners " << std::endl;
-  for (unsigned int i = 0 ; i < tab.size() ; i++ )
+  for (unsigned int i = 0; i < tab.size(); i++ )
   {
     file << " UL[" <<i<<"] -> "<<tab[i]<< std::endl;
   }
   tab.clear();
 
   tab = image->GetUpperRightCorner();
-  for (unsigned int i = 0 ; i < tab.size() ; i++ )
+  for (unsigned int i = 0; i < tab.size(); i++ )
   {
     file << " UR[" <<i<<"] -> "<<tab[i]<< std::endl;
   }
   tab.clear();
 
   tab = image->GetLowerLeftCorner();
-  for (unsigned int i = 0 ; i < tab.size() ; i++ )
+  for (unsigned int i = 0; i < tab.size(); i++ )
   {
     file << " LL[" <<i<<"] -> "<<tab[i]<< std::endl;
   }
   tab.clear();
 
   tab = image->GetLowerRightCorner();
-  for (unsigned int i = 0 ; i < tab.size() ; i++ )
+  for (unsigned int i = 0; i < tab.size(); i++ )
   {
     file << " LR[" <<i<<"] -> "<<tab[i]<< std::endl;
   }
diff --git a/Testing/Code/IO/otbVectorImageTest.cxx b/Testing/Code/IO/otbVectorImageTest.cxx
index dcc12c08f1d75b984b0b7082524996b412a3b982..681b5ed2fed7fa875a487fe1ad8299e4f2277c02 100644
--- a/Testing/Code/IO/otbVectorImageTest.cxx
+++ b/Testing/Code/IO/otbVectorImageTest.cxx
@@ -76,7 +76,7 @@ int otbVectorImageTest(int argc, char* argv[])
   unsigned int GCPCount = image->GetGCPCount();
   file << "GCP Count " << image->GetGCPCount() << std::endl;
 
-  for (unsigned int GCPnum = 0 ; GCPnum < GCPCount ; GCPnum++ )
+  for (unsigned int GCPnum = 0; GCPnum < GCPCount; GCPnum++ )
   {
     file << "GCP[" << GCPnum << "] Id " << image->GetGCPId(GCPnum) << std::endl;
     file << "GCP[" << GCPnum << "] Info " << image->GetGCPInfo(GCPnum) << std::endl;
@@ -91,7 +91,7 @@ int otbVectorImageTest(int argc, char* argv[])
   InputImageType::VectorType tab = image->GetGeoTransform();
 
   file << "Geo Transform " << std::endl;
-  for (unsigned int i = 0 ; i < tab.size() ; i++ )
+  for (unsigned int i = 0; i < tab.size(); i++ )
   {
     file << " " <<i<<" -> "<<tab[i]<< std::endl;
   }
@@ -99,28 +99,28 @@ int otbVectorImageTest(int argc, char* argv[])
 
   tab = image->GetUpperLeftCorner();
   file << "Corners " << std::endl;
-  for (unsigned int i = 0 ; i < tab.size() ; i++ )
+  for (unsigned int i = 0; i < tab.size(); i++ )
   {
     file << " UL[" <<i<<"] -> "<<tab[i]<< std::endl;
   }
   tab.clear();
 
   tab = image->GetUpperRightCorner();
-  for (unsigned int i = 0 ; i < tab.size() ; i++ )
+  for (unsigned int i = 0; i < tab.size(); i++ )
   {
     file << " UR[" <<i<<"] -> "<<tab[i]<< std::endl;
   }
   tab.clear();
 
   tab = image->GetLowerLeftCorner();
-  for (unsigned int i = 0 ; i < tab.size() ; i++ )
+  for (unsigned int i = 0; i < tab.size(); i++ )
   {
     file << " LL[" <<i<<"] -> "<<tab[i]<< std::endl;
   }
   tab.clear();
 
   tab = image->GetLowerRightCorner();
-  for (unsigned int i = 0 ; i < tab.size() ; i++ )
+  for (unsigned int i = 0; i < tab.size(); i++ )
   {
     file << " LR[" <<i<<"] -> "<<tab[i]<< std::endl;
   }
diff --git a/Testing/Code/Learning/otbSEMClassifierNew.cxx b/Testing/Code/Learning/otbSEMClassifierNew.cxx
index ddcb23b16caf723ae260ddabb4f520b15855d9e2..44fccd7ec5071b89ae78eb2bad9703b62f977db0 100644
--- a/Testing/Code/Learning/otbSEMClassifierNew.cxx
+++ b/Testing/Code/Learning/otbSEMClassifierNew.cxx
@@ -40,7 +40,7 @@ int otbSEMClassifierNew( int argc, char* argv[] )
   typedef itk::Statistics::ListSample< ImageType::PixelType > SampleType;
   typedef itk::Statistics::Subsample< SampleType > ClassSampleType;
 
-  typedef otb::Statistics::ModelComponentBase< ClassSampleType > ComponentType ;
+  typedef otb::Statistics::ModelComponentBase< ClassSampleType > ComponentType;
 
   ClassifType::Pointer classifier = ClassifType::New();
   ComponentType::Pointer component = ComponentType::New();
diff --git a/Testing/Code/Learning/otbSOMClassifier.cxx b/Testing/Code/Learning/otbSOMClassifier.cxx
index 1af7a3f85601e80678fe9d25eeac75da8a3c7168..ddcc6afafd125629b9662d028eb3798f7327e815 100644
--- a/Testing/Code/Learning/otbSOMClassifier.cxx
+++ b/Testing/Code/Learning/otbSOMClassifier.cxx
@@ -35,7 +35,7 @@ int otbSOMClassifier(int argc, char* argv[] )
   if (argc != 4)
   {
     std::cout << "Usage : " << argv[0] << " inputImage modelFile outputImage"
-              << std::endl ;
+              << std::endl;
     return EXIT_FAILURE;
   }
 
@@ -81,10 +81,10 @@ int otbSOMClassifier(int argc, char* argv[] )
     ++it;
   }
 
-  ClassifierType::Pointer classifier = ClassifierType::New() ;
+  ClassifierType::Pointer classifier = ClassifierType::New();
   classifier->SetSample(listSample.GetPointer());
   classifier->SetMap(somreader->GetOutput());
-  classifier->Update() ;
+  classifier->Update();
 
   OutputImageType::Pointer outputImage = OutputImageType::New();
   outputImage->SetRegions( reader->GetOutput()->GetLargestPossibleRegion());
@@ -100,7 +100,7 @@ int otbSOMClassifier(int argc, char* argv[] )
   while (m_iter != m_last && !outIt.IsAtEnd())
   {
     outIt.Set(m_iter.GetClassLabel());
-    ++m_iter ;
+    ++m_iter;
     ++outIt;
   }
 
diff --git a/Testing/Code/Learning/otbSOMClassifierNew.cxx b/Testing/Code/Learning/otbSOMClassifierNew.cxx
index 4708f3f6d379b6e0c3cbde10315fa96452c7567c..32755d567dcf8a433fcb8fe5acbf8ce0a2c466db 100644
--- a/Testing/Code/Learning/otbSOMClassifierNew.cxx
+++ b/Testing/Code/Learning/otbSOMClassifierNew.cxx
@@ -39,7 +39,7 @@ int otbSOMClassifierNew(int argc, char* argv[] )
   typedef itk::Statistics::ListSample< PixelType > SampleType;
   typedef otb::SOMClassifier<SampleType,SOMMapType,LabelPixelType> ClassifierType;
 
-  ClassifierType::Pointer classifier = ClassifierType::New() ;
+  ClassifierType::Pointer classifier = ClassifierType::New();
 
 
   return EXIT_SUCCESS;
diff --git a/Testing/Code/Learning/otbSVMClassifierImage.cxx b/Testing/Code/Learning/otbSVMClassifierImage.cxx
index 0898244e3093d1568652bd11395456f08e82eedc..b5bb515502d510c4dc559a0659693f8988e6fcb7 100644
--- a/Testing/Code/Learning/otbSVMClassifierImage.cxx
+++ b/Testing/Code/Learning/otbSVMClassifierImage.cxx
@@ -62,12 +62,12 @@ public:
 
 int otbSVMClassifierImage(int argc, char* argv[] )
 {
-  namespace stat = itk::Statistics ;
+  namespace stat = itk::Statistics;
 
   if (argc != 4)
   {
     std::cout << "Usage : " << argv[0] << " inputImage modelFile outputImage"
-              << std::endl ;
+              << std::endl;
     return EXIT_FAILURE;
   }
 
@@ -108,14 +108,14 @@ int otbSVMClassifierImage(int argc, char* argv[] )
 
   int numberOfClasses = model->GetNumberOfClasses();
 
-  typedef otb::SVMClassifier< SampleType, LabelPixelType > ClassifierType ;
+  typedef otb::SVMClassifier< SampleType, LabelPixelType > ClassifierType;
 
-  ClassifierType::Pointer classifier = ClassifierType::New() ;
+  ClassifierType::Pointer classifier = ClassifierType::New();
 
-  classifier->SetNumberOfClasses(numberOfClasses) ;
+  classifier->SetNumberOfClasses(numberOfClasses);
   classifier->SetModel( model );
-  classifier->SetSample(sample.GetPointer()) ;
-  classifier->Update() ;
+  classifier->SetSample(sample.GetPointer());
+  classifier->Update();
 
   /* Build the class map */
   otbGenericMsgDebugMacro( << "Output image creation" );
@@ -148,12 +148,12 @@ int otbSVMClassifierImage(int argc, char* argv[] )
 
   otbGenericMsgDebugMacro( << "classifier get output" );
   ClassifierType::OutputType* membershipSample =
-    classifier->GetOutput() ;
+    classifier->GetOutput();
   otbGenericMsgDebugMacro( << "Sample iterators" );
   ClassifierType::OutputType::ConstIterator m_iter =
-    membershipSample->Begin() ;
+    membershipSample->Begin();
   ClassifierType::OutputType::ConstIterator m_last =
-    membershipSample->End() ;
+    membershipSample->End();
 
   otbGenericMsgDebugMacro( << "Image iterator" );
   typedef itk::ImageRegionIterator< OutputImageType>  OutputIteratorType;
@@ -168,7 +168,7 @@ int otbSVMClassifierImage(int argc, char* argv[] )
   while (m_iter != m_last && !outIt.IsAtEnd())
   {
     outIt.Set(m_iter.GetClassLabel());
-    ++m_iter ;
+    ++m_iter;
     ++outIt;
   }
 
diff --git a/Testing/Code/Learning/otbSVMClassifierNew.cxx b/Testing/Code/Learning/otbSVMClassifierNew.cxx
index 2442a1fcd26b53c6e66d0aeeb4291a4f3cc4bdcb..7674a7fa049e9b4c7365a5214f2107cf1a9eecce 100644
--- a/Testing/Code/Learning/otbSVMClassifierNew.cxx
+++ b/Testing/Code/Learning/otbSVMClassifierNew.cxx
@@ -29,13 +29,13 @@ int otbSVMClassifierNew(int argc, char* argv[] )
 {
   typedef double InputPixelType;
   typedef int LabelPixelType;
-  typedef itk::PointSet< InputPixelType, 2 > PointSetType ;
+  typedef itk::PointSet< InputPixelType, 2 > PointSetType;
 
   typedef itk::Statistics::PointSetToListAdaptor< PointSetType >
   DataSampleType;
 
 
-  typedef otb::SVMClassifier< DataSampleType, LabelPixelType > ClassifierType ;
+  typedef otb::SVMClassifier< DataSampleType, LabelPixelType > ClassifierType;
 
   ClassifierType::Pointer classifier = ClassifierType::New();
 
diff --git a/Testing/Code/Learning/otbSVMClassifierPointSet.cxx b/Testing/Code/Learning/otbSVMClassifierPointSet.cxx
index eac2bf01b58c8911ae825a7c5204efb055994e28..b760bf5b1435de303dc76966e0d83699e0e3c47d 100644
--- a/Testing/Code/Learning/otbSVMClassifierPointSet.cxx
+++ b/Testing/Code/Learning/otbSVMClassifierPointSet.cxx
@@ -32,12 +32,12 @@
 
 int otbSVMClassifierPointSet(int argc, char* argv[] )
 {
-  namespace stat = itk::Statistics ;
+  namespace stat = itk::Statistics;
 
   if (argc != 2)
   {
     std::cout << "Usage : " << argv[0] << " modelFile"
-              << std::endl ;
+              << std::endl;
     return EXIT_FAILURE;
   }
 
@@ -109,26 +109,26 @@ int otbSVMClassifierPointSet(int argc, char* argv[] )
 
   int numberOfClasses = model->GetNumberOfClasses();
 
-  typedef otb::SVMClassifier< SampleType, LabelPixelType > ClassifierType ;
+  typedef otb::SVMClassifier< SampleType, LabelPixelType > ClassifierType;
 
-  ClassifierType::Pointer classifier = ClassifierType::New() ;
+  ClassifierType::Pointer classifier = ClassifierType::New();
 
-  classifier->SetNumberOfClasses(numberOfClasses) ;
+  classifier->SetNumberOfClasses(numberOfClasses);
   classifier->SetModel( model );
-  classifier->SetSample(sample.GetPointer()) ;
-  classifier->Update() ;
+  classifier->SetSample(sample.GetPointer());
+  classifier->Update();
 
   /* Build the class map */
 
 
   std::cout << "classifier get output" << std::endl;
   ClassifierType::OutputType* membershipSample =
-    classifier->GetOutput() ;
+    classifier->GetOutput();
   std::cout << "Sample iterators" << std::endl;
   ClassifierType::OutputType::ConstIterator m_iter =
-    membershipSample->Begin() ;
+    membershipSample->Begin();
   ClassifierType::OutputType::ConstIterator m_last =
-    membershipSample->End() ;
+    membershipSample->End();
 
 
   double error = 0.0;
@@ -149,7 +149,7 @@ int otbSVMClassifierPointSet(int argc, char* argv[] )
 
 
     ++pointId;
-    ++m_iter ;
+    ++m_iter;
   }
 
   std::cout << "Error = " << error/pointId << std::endl;
diff --git a/Testing/Code/MultiScale/otbWaveletFilterBank.cxx b/Testing/Code/MultiScale/otbWaveletFilterBank.cxx
index 3022a30fef62247419e784b94485802b2f4e458a..c61a217f2d71e9af9b067bcb84dc8f9737cb03ef 100644
--- a/Testing/Code/MultiScale/otbWaveletFilterBank.cxx
+++ b/Testing/Code/MultiScale/otbWaveletFilterBank.cxx
@@ -37,7 +37,7 @@ int otbWaveletFilterBank( int argc, char * argv[] )
 {
   typedef otb::CommandLineArgumentParser ParserType;
   ParserType::Pointer parser = ParserType::New();
-  parser->AddInputImage() ;
+  parser->AddInputImage();
   //parser->AddOption( "--Level", "Decomposition level through the low pass branch (def. 1)", "-l", 1, false );
         //parser->AddOutputImage();
   parser->AddOption( "--Output", "Output filename prefix", "-out", 1, true );
diff --git a/Testing/Code/MultiScale/otbWaveletPacketTransform.cxx b/Testing/Code/MultiScale/otbWaveletPacketTransform.cxx
index 2a6d7058291e3db97806722a8ebaba1fb2016dfd..f7e75dcd64d8d6a4d43cebf135d3d5689bd258ec 100644
--- a/Testing/Code/MultiScale/otbWaveletPacketTransform.cxx
+++ b/Testing/Code/MultiScale/otbWaveletPacketTransform.cxx
@@ -39,7 +39,7 @@ int otbWaveletPacketTransform( int argc, char * argv[] )
 {
   typedef otb::CommandLineArgumentParser ParserType;
   ParserType::Pointer parser = ParserType::New();
-  parser->AddInputImage() ;
+  parser->AddInputImage();
   parser->AddOption( "--Level", "Decomposition level of the wavelet packet (def. 1)", "-l", 1, false );
   parser->AddOption( "--Output", "Output filename prefix", "-out", 1, true );
   typedef otb::CommandLineArgumentParseResult ParserResultType;
diff --git a/Testing/Code/MultiScale/otbWaveletTransform.cxx b/Testing/Code/MultiScale/otbWaveletTransform.cxx
index 4181562a7e64bce4e13ab66ea2e8b13974f57762..c5ec490a16146bd640a9cff6ed2964fd723b9518 100644
--- a/Testing/Code/MultiScale/otbWaveletTransform.cxx
+++ b/Testing/Code/MultiScale/otbWaveletTransform.cxx
@@ -38,7 +38,7 @@ int otbWaveletTransform( int argc, char * argv[] )
 {
   typedef otb::CommandLineArgumentParser ParserType;
   ParserType::Pointer parser = ParserType::New();
-  parser->AddInputImage() ;
+  parser->AddInputImage();
   parser->AddOption( "--Level", "Decomposition level through the low pass branch (def. 1)", "-l", 1, false );
   parser->AddOption( "--Output", "Output filename prefix", "-out", 1, true );
   typedef otb::CommandLineArgumentParseResult ParserResultType;
diff --git a/Testing/Code/Projections/otbOrthoRectificationFilter.cxx b/Testing/Code/Projections/otbOrthoRectificationFilter.cxx
index f08eef9b87f1c0dfff43e6aafce93310f67483b7..43727345626d11b6927c1cbf9b242fcb8c58fbbd 100644
--- a/Testing/Code/Projections/otbOrthoRectificationFilter.cxx
+++ b/Testing/Code/Projections/otbOrthoRectificationFilter.cxx
@@ -51,8 +51,8 @@ int otbOrthoRectificationFilter( int argc, char* argv[] )
   typedef otb::Image<double, 2>     ImageType;
   typedef otb::ImageFileReader<ImageType>  ReaderType;
   typedef otb::StreamingImageFileWriter<ImageType>  WriterType;
-  typedef otb::UtmInverseProjection UtmMapProjectionType ;
-  typedef otb::OrthoRectificationFilter<ImageType, ImageType, UtmMapProjectionType> OrthoRectifFilterType ;
+  typedef otb::UtmInverseProjection UtmMapProjectionType;
+  typedef otb::OrthoRectificationFilter<ImageType, ImageType, UtmMapProjectionType> OrthoRectifFilterType;
 
   //Allocate pointer
   ReaderType::Pointer             reader = ReaderType::New();
diff --git a/Testing/Code/Projections/otbOrthoRectificationFilterNew.cxx b/Testing/Code/Projections/otbOrthoRectificationFilterNew.cxx
index 4f55ffcef1d1fc9884355b69e26bcf79d666e349..42c6b4019a39c31e442376497d61ac05429afc5f 100644
--- a/Testing/Code/Projections/otbOrthoRectificationFilterNew.cxx
+++ b/Testing/Code/Projections/otbOrthoRectificationFilterNew.cxx
@@ -25,8 +25,8 @@
 int otbOrthoRectificationFilterNew( int argc, char* argv[] )
 {
   typedef otb::Image<double, 2>     ImageType;
-  typedef otb::UtmInverseProjection UtmMapProjectionType ;
-  typedef otb::OrthoRectificationFilter<ImageType, ImageType, UtmMapProjectionType> OrthoRectifFilterType ;
+  typedef otb::UtmInverseProjection UtmMapProjectionType;
+  typedef otb::OrthoRectificationFilter<ImageType, ImageType, UtmMapProjectionType> OrthoRectifFilterType;
 
   OrthoRectifFilterType::Pointer          orthoRectifFilter=OrthoRectifFilterType::New();
 
diff --git a/Testing/Code/Projections/otbOrthoRectificationFilterWithDEM.cxx b/Testing/Code/Projections/otbOrthoRectificationFilterWithDEM.cxx
index c5a9863b7eed5e785b8a8d3e6a874088e57903f0..2f57114ae379cd35d834eaf2dd56005a04f21bf8 100644
--- a/Testing/Code/Projections/otbOrthoRectificationFilterWithDEM.cxx
+++ b/Testing/Code/Projections/otbOrthoRectificationFilterWithDEM.cxx
@@ -65,8 +65,8 @@ int otbOrthoRectificationFilterWithDEM( int argc, char* argv[] )
   typedef otb::ImageFileReader<ImageType>  ReaderType;
   typedef otb::StreamingImageFileWriter<ImageType>  WriterType;
 
-  typedef otb::UtmInverseProjection UtmMapProjectionType ;
-  typedef otb::OrthoRectificationFilter<ImageType, ImageType, UtmMapProjectionType> OrthoRectifFilterType ;
+  typedef otb::UtmInverseProjection UtmMapProjectionType;
+  typedef otb::OrthoRectificationFilter<ImageType, ImageType, UtmMapProjectionType> OrthoRectifFilterType;
 
   //Allocate pointer
   ReaderType::Pointer       reader=ReaderType::New();
diff --git a/Testing/Code/Projections/otbOrthoRectificationMonoThreadFilter.cxx b/Testing/Code/Projections/otbOrthoRectificationMonoThreadFilter.cxx
index 49f59aff70f21bc10d0047d4c6bf6b7aaadb5481..1e9625f70f376df6cdadb82b87595f137dc9255d 100644
--- a/Testing/Code/Projections/otbOrthoRectificationMonoThreadFilter.cxx
+++ b/Testing/Code/Projections/otbOrthoRectificationMonoThreadFilter.cxx
@@ -52,8 +52,8 @@ int otbOrthoRectificationMonoThreadFilter( int argc, char* argv[] )
   typedef otb::Image<double, 2>     ImageType;
   typedef otb::ImageFileReader<ImageType>  ReaderType;
   typedef otb::StreamingImageFileWriter<ImageType>  WriterType;
-  typedef otb::UtmInverseProjection UtmMapProjectionType ;
-  typedef otb::OrthoRectificationFilter<ImageType, ImageType, UtmMapProjectionType> OrthoRectifFilterType ;
+  typedef otb::UtmInverseProjection UtmMapProjectionType;
+  typedef otb::OrthoRectificationFilter<ImageType, ImageType, UtmMapProjectionType> OrthoRectifFilterType;
 
   //Allocate pointer
   ReaderType::Pointer             reader = ReaderType::New();
diff --git a/Testing/Code/Radiometry/otbAtmosphericCorrectionSequencement.cxx b/Testing/Code/Radiometry/otbAtmosphericCorrectionSequencement.cxx
index 8795d76315e30b0a5006a3104cc777b8b7a0280e..d4cc59629953f58aedb6bb130443f5b1a50b7c2e 100644
--- a/Testing/Code/Radiometry/otbAtmosphericCorrectionSequencement.cxx
+++ b/Testing/Code/Radiometry/otbAtmosphericCorrectionSequencement.cxx
@@ -82,7 +82,7 @@ int otbAtmosphericCorrectionSequencementTest( int argc, char *argv[] )
   std::ifstream fin;
   fin.open(argv[3]);
   double dalpha(0.), dbeta(0.);
-  for ( unsigned int i=0 ; i < nbOfComponent ; i++)
+  for ( unsigned int i=0; i < nbOfComponent; i++)
   {
     fin >> dalpha;
     fin >> dbeta;
@@ -108,7 +108,7 @@ int otbAtmosphericCorrectionSequencementTest( int argc, char *argv[] )
 
   fin.open(argv[7]);
   double dsolarIllumination(0.);
-  for ( unsigned int i=0 ; i < nbOfComponent ; i++)
+  for ( unsigned int i=0; i < nbOfComponent; i++)
   {
     fin >> dsolarIllumination;
     solarIllumination[i] = dsolarIllumination;
@@ -157,7 +157,7 @@ int otbAtmosphericCorrectionSequencementTest( int argc, char *argv[] )
 
   fin.open(argv[16]);
   fin >> nbBands;
-  for (unsigned int i=0 ; i<nbBands ; i++)
+  for (unsigned int i=0; i<nbBands; i++)
   {
     valuesVector.clear();
     fin >> sString;
@@ -165,7 +165,7 @@ int otbAtmosphericCorrectionSequencementTest( int argc, char *argv[] )
     fin >> maxSpectralValue;
     fin >> userStep;
     fin >> nbValuesPerBand;
-    for ( unsigned int j=0 ; j < nbValuesPerBand ; j++)
+    for ( unsigned int j=0; j < nbValuesPerBand; j++)
     {
       fin >> value;
       valuesVector.push_back(value);