diff --git a/Code/OBIA/otbLabelMapToVectorDataFilter.h b/Code/OBIA/otbLabelMapToVectorDataFilter.h
index d7d32de3f099623ed6073d87d4035facb9db9a5e..f2feecc04e0377c3d2c56b4a11a72778d708630d 100644
--- a/Code/OBIA/otbLabelMapToVectorDataFilter.h
+++ b/Code/OBIA/otbLabelMapToVectorDataFilter.h
@@ -40,7 +40,7 @@ namespace otb {
    * "An algorithm for the rapid computation of boundaries of run-length
    * encoded regions", Francis K. H. Queck, in Pattern Recognition 33
    * (2000), p 1637-1649.
-   * 
+   *
    * Note : the output vector data contains index coordinates (not physical coordinates).
    * For instance, a polygon around the pixel at index (0,0) would have the following
    * points : [-0.5,-0.5] , [0.5,-0.5] , [0.5,0.5] , [-0.5,0.5]
diff --git a/Code/OBIA/otbVectorDataToLabelMapWithAttributesFilter.h b/Code/OBIA/otbVectorDataToLabelMapWithAttributesFilter.h
index 4cb0ce1b8ced88a3793a18ab17d044e94c35fb90..bbdbf55c420847e716973bf0a0b2376d5e24a2a8 100644
--- a/Code/OBIA/otbVectorDataToLabelMapWithAttributesFilter.h
+++ b/Code/OBIA/otbVectorDataToLabelMapWithAttributesFilter.h
@@ -48,11 +48,11 @@ namespace otb
  * The first Label is set using SetInitialLabel (by default it is 0), and increases 1 by 1.
  * The vector data attributes are also assigned to the object in the label map.
  *
- * When AutomaticSizeComputation=True, the spacing from the vector data object 
- * is used. Then the size and origin are computed so that the image extent 
+ * When AutomaticSizeComputation=True, the spacing from the vector data object
+ * is used. Then the size and origin are computed so that the image extent
  * covers exactly the vector data bounding region.
- * 
- * Note : the coordinates in the vector data are assumed to be physical coordinates.  
+ *
+ * Note : the coordinates in the vector data are assumed to be physical coordinates.
  *
  * \sa LabelMapSource
  */
diff --git a/Code/OBIA/otbVectorDataToLabelMapWithAttributesFilter.txx b/Code/OBIA/otbVectorDataToLabelMapWithAttributesFilter.txx
index 1b65490118418ec8879f5567309a3246e2a1db4d..3ffe5aa92b3448a40a1093b0b19f40a5eac0eb71 100644
--- a/Code/OBIA/otbVectorDataToLabelMapWithAttributesFilter.txx
+++ b/Code/OBIA/otbVectorDataToLabelMapWithAttributesFilter.txx
@@ -146,7 +146,7 @@ void VectorDataToLabelMapWithAttributesFilter<TVectorData, TLabelMap>
     SizeType size;
     SpacingType spacing = this->GetInput()->GetSpacing();
     OriginType origin = m_VectorDataProperties->GetBoundingRegion().GetOrigin();
-    for (unsigned int i=0 ; i<2 ; ++i)
+    for (unsigned int i=0; i<2; ++i)
       {
       if (spacing[i] < 0.0)
         {
@@ -350,7 +350,7 @@ VectorDataToLabelMapWithAttributesFilter<TVectorData, TLabelMap>
         physCorners[2][0] += polygonExtRingBoundReg.GetSize(0);
         physCorners[3][0] += polygonExtRingBoundReg.GetSize(0);
         
-        for (unsigned int k=0 ; k<4 ; ++k)
+        for (unsigned int k=0; k<4; ++k)
           {
           this->GetOutput()->TransformPhysicalPointToIndex(physCorners[k],tmpIdx);
           if (k == 0)
@@ -385,9 +385,9 @@ VectorDataToLabelMapWithAttributesFilter<TVectorData, TLabelMap>
         
         OriginType tmpPoint;
         VertexType vertex;
-        for (IndexValueType j=startIdx[1] ; j<=endIdx[1] ; ++j)
+        for (IndexValueType j=startIdx[1]; j<=endIdx[1]; ++j)
           {
-          for (IndexValueType i=startIdx[0] ; i<=endIdx[0] ; ++i)
+          for (IndexValueType i=startIdx[0]; i<=endIdx[0]; ++i)
             {
             tmpIdx[0] = i;
             tmpIdx[1] = j;