diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6758c4391793cb85df2e316902dca763f4072edb..c133505d8e170a437e6b8df500b40370b1357ed9 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -118,7 +118,7 @@ SET(CXX_TEST_PATH ${CMAKE_RUNTIME_OUTPUT_DIRECTORY})
 
 FIND_PACKAGE(OSGeo4W)
 # Put GDAL first, since on Windows, include dirs for other libs (curl, expat, mapnik)  contain gdal 1.5 includes
-INCLUDE(ImportGdal) 
+INCLUDE(ImportGdal)
 INCLUDE(ImportLibLAS) # depends on ImportGdal
 INCLUDE(ImportExpat)
 INCLUDE(ImportITK)
diff --git a/Examples/BasicFilters/CMakeLists.txt b/Examples/BasicFilters/CMakeLists.txt
index 68b1f8e188a3c40e777839c3a4c12c83dd1376e3..a3f78a9f158dab374bb78710aa606783f51928c0 100644
--- a/Examples/BasicFilters/CMakeLists.txt
+++ b/Examples/BasicFilters/CMakeLists.txt
@@ -43,35 +43,35 @@ SET(NOTOL 0.0)
 # ------- LeeImageFilterTest----------
 
 ADD_TEST(bfTeLeeImageFilterTest ${EXE_TESTS}
-	--compare-n-images ${NOTOL} 1
-	${BASELINE}/GomaSmallLeeFiltered.png
-	${TEMP}/GomaSmallLeeFiltered.png
-	LeeImageFilterTest
-	${INPUTDATA}/GomaSmall.png
-	${TEMP}/GomaSmallLeeFiltered.png
+        --compare-n-images ${NOTOL} 1
+        ${BASELINE}/GomaSmallLeeFiltered.png
+        ${TEMP}/GomaSmallLeeFiltered.png
+        LeeImageFilterTest
+        ${INPUTDATA}/GomaSmall.png
+        ${TEMP}/GomaSmallLeeFiltered.png
     3 1
 )
 
 # ------- FrostImageFilterTest----------
 
 ADD_TEST(bfTeFrostImageFilterTest ${EXE_TESTS}
-	--compare-n-images ${NOTOL} 1
-	${BASELINE}/GomaSmallFrostFiltered.png
-	${TEMP}/GomaSmallFrostFiltered.png
-	FrostImageFilterTest
-	${INPUTDATA}/GomaSmall.png
-	${TEMP}/GomaSmallFrostFiltered.png
+        --compare-n-images ${NOTOL} 1
+        ${BASELINE}/GomaSmallFrostFiltered.png
+        ${TEMP}/GomaSmallFrostFiltered.png
+        FrostImageFilterTest
+        ${INPUTDATA}/GomaSmall.png
+        ${TEMP}/GomaSmallFrostFiltered.png
     5 0.1
 )
 
 # ------- DEMToRainbowExampleTest ----------
 
 ADD_TEST(bfTeDEMToRainbowExampleTest ${EXE_TESTS}
-	--compare-n-images ${NOTOL} 1
-	${BASELINE}/DEMToRainbowImageGenerator.png
-	${TEMP}/DEMToRainbowImageGenerator.png
-	DEMToRainbowExampleTest
-	${TEMP}/DEMToRainbowImageGenerator.png
+        --compare-n-images ${NOTOL} 1
+        ${BASELINE}/DEMToRainbowImageGenerator.png
+        ${TEMP}/DEMToRainbowImageGenerator.png
+        DEMToRainbowExampleTest
+        ${TEMP}/DEMToRainbowImageGenerator.png
     6.5 45.5 500 500 0.002 -0.002 ${OTB_DATA_ROOT}/Examples/DEM_srtm
 )
 
@@ -79,69 +79,69 @@ ADD_TEST(bfTeDEMToRainbowExampleTest ${EXE_TESTS}
 # ------- ScalingFilterExampleTest ----------
 
 ADD_TEST(bfTeScalingFilterExampleTest ${EXE_TESTS}
-	--compare-n-images ${NOTOL} 2
-	${BASELINE}/QB_Toulouse_Ortho_PAN_rescaled.png
-	${TEMP}/QB_Toulouse_Ortho_PAN_rescaled.png
-	${BASELINE}/QB_Toulouse_Ortho_PAN_casted.png
-	${TEMP}/QB_Toulouse_Ortho_PAN_casted.png
-	ScalingFilterExampleTest
-	${INPUTDATA}/QB_Toulouse_Ortho_PAN.tif
-	${TEMP}/QB_Toulouse_Ortho_PAN_rescaled.png
-	${TEMP}/QB_Toulouse_Ortho_PAN_casted.png
+        --compare-n-images ${NOTOL} 2
+        ${BASELINE}/QB_Toulouse_Ortho_PAN_rescaled.png
+        ${TEMP}/QB_Toulouse_Ortho_PAN_rescaled.png
+        ${BASELINE}/QB_Toulouse_Ortho_PAN_casted.png
+        ${TEMP}/QB_Toulouse_Ortho_PAN_casted.png
+        ScalingFilterExampleTest
+        ${INPUTDATA}/QB_Toulouse_Ortho_PAN.tif
+        ${TEMP}/QB_Toulouse_Ortho_PAN_rescaled.png
+        ${TEMP}/QB_Toulouse_Ortho_PAN_casted.png
 )
 
 # ------- PrintableImageFilterTest----------
 
 ADD_TEST(bfTePrintableImageFilterExample1Test ${EXE_TESTS}
-	--compare-n-images ${NOTOL} 1
-	${BASELINE}/PrintableExampleOutput1.png
-	${TEMP}/PrintableExampleOutput1.png
-	PrintableImageFilterExample1Test
-	${INPUTDATA}/IMAGERY_SSECH.tif
-	${TEMP}/PrintableExampleOutput1.png
+        --compare-n-images ${NOTOL} 1
+        ${BASELINE}/PrintableExampleOutput1.png
+        ${TEMP}/PrintableExampleOutput1.png
+        PrintableImageFilterExample1Test
+        ${INPUTDATA}/IMAGERY_SSECH.tif
+        ${TEMP}/PrintableExampleOutput1.png
     1 2 3
 )
 
 ADD_TEST(bfTePrintableImageFilteExample2rTest ${EXE_TESTS}
-	--compare-n-images ${NOTOL} 1
-	${BASELINE}/PrintableExampleOutput2.png
-	${TEMP}/PrintableExampleOutput2.png
-	PrintableImageFilterExample2Test
-	${INPUTDATA}/IMAGERY_SSECH.tif
-	${TEMP}/PrintableExampleOutput2.png
+        --compare-n-images ${NOTOL} 1
+        ${BASELINE}/PrintableExampleOutput2.png
+        ${TEMP}/PrintableExampleOutput2.png
+        PrintableImageFilterExample2Test
+        ${INPUTDATA}/IMAGERY_SSECH.tif
+        ${TEMP}/PrintableExampleOutput2.png
     1 4 2
 )
 
 # ------- IndexedToRGBExampleTest----------
 
 ADD_TEST(bfTeIndexedToRGBExampleTest ${EXE_TESTS}
-	--compare-n-images ${NOTOL} 2
-	${BASELINE}/buildingExtractionRGB.png
-	${TEMP}/buildingExtractionRGB.png
-	${BASELINE}/buildingExtractionIndexed_scaled.png
-	${TEMP}/buildingExtractionIndexed_scaled.png
-	IndexedToRGBExampleTest
-	${INPUTDATA}/buildingExtractionIndexed.tif
-	${TEMP}/buildingExtractionRGB.png
-	${TEMP}/buildingExtractionIndexed_scaled.png
+        --compare-n-images ${NOTOL} 2
+        ${BASELINE}/buildingExtractionRGB.png
+        ${TEMP}/buildingExtractionRGB.png
+        ${BASELINE}/buildingExtractionIndexed_scaled.png
+        ${TEMP}/buildingExtractionIndexed_scaled.png
+        IndexedToRGBExampleTest
+        ${INPUTDATA}/buildingExtractionIndexed.tif
+        ${TEMP}/buildingExtractionRGB.png
+        ${TEMP}/buildingExtractionIndexed_scaled.png
 )
 
 ADD_TEST(bfTeMeanShiftVectorImageFilterExampleTest ${EXE_TESTS}
-	--compare-n-images ${NOTOL} 6
-	${BASELINE}/MSFilteredOutput.tif
-	${TEMP}/MSFilteredOutput.tif
-	${BASELINE}/MSClusteredOutput.tif
-	${TEMP}/MSClusteredOutput.tif
-	${BASELINE}/MSLabelledOutput.tif
-	${TEMP}/MSLabelledOutput.tif
-	${BASELINE}/MSBoundariesOutput.tif
-	${TEMP}/MSBoundariesOutput.tif
-	${BASELINE}/MSFilteredOutput-pretty.png
-	${TEMP}/MSFilteredOutput-pretty.png
-	${BASELINE}/MSClusteredOutput-pretty.png
-	${TEMP}/MSClusteredOutput-pretty.png
+        --compare-n-images ${NOTOL} 6
+        ${BASELINE}/MSFilteredOutput.tif
+        ${TEMP}/MSFilteredOutput.tif
+        ${BASELINE}/MSClusteredOutput.tif
+        ${TEMP}/MSClusteredOutput.tif
+        ${BASELINE}/MSLabelledOutput.tif
+        ${TEMP}/MSLabelledOutput.tif
+        ${BASELINE}/MSBoundariesOutput.tif
+        ${TEMP}/MSBoundariesOutput.tif
+        ${BASELINE}/MSFilteredOutput-pretty.png
+        ${TEMP}/MSFilteredOutput-pretty.png
+        ${BASELINE}/MSClusteredOutput-pretty.png
+        ${TEMP}/MSClusteredOutput-pretty.png
      MeanShiftVectorImageFilterExampleTest
-	${INPUTDATA}/ROI_QB_MUL_1.png
+        ${INPUTDATA}/ROI_QB_MUL_1.png
         ${TEMP}/MSFilteredOutput.tif
         ${TEMP}/MSClusteredOutput.tif
         ${TEMP}/MSLabelledOutput.tif
@@ -157,14 +157,14 @@ ADD_TEST(bfTeMeanShiftVectorImageFilterExampleTest ${EXE_TESTS}
 # ------- HillShadingExampleTest ----------
 
 ADD_TEST(bfTeHillShadingExampleTest ${EXE_TESTS}
-	--compare-n-images ${NOTOL} 2
-	    ${BASELINE}/HillShadingExample.png
-	    ${TEMP}/HillShadingExample.png
-		${BASELINE}/HillShadingColorExample.png
-	    ${TEMP}/HillShadingColorExample.png
-	HillShadingExampleTest
-	    ${TEMP}/HillShadingExample.png
-    	${TEMP}/HillShadingColorExample.png
+        --compare-n-images ${NOTOL} 2
+            ${BASELINE}/HillShadingExample.png
+            ${TEMP}/HillShadingExample.png
+                ${BASELINE}/HillShadingColorExample.png
+            ${TEMP}/HillShadingColorExample.png
+        HillShadingExampleTest
+            ${TEMP}/HillShadingExample.png
+            ${TEMP}/HillShadingColorExample.png
         6.8 45.3 500 500 0.002 -0.002 ${OTB_DATA_ROOT}/Examples/DEM_srtm
 )
 
diff --git a/Examples/CMakeLists.txt b/Examples/CMakeLists.txt
index b42ee433d3d0598c6eedb502766ec06e5d54176e..e19fb24ed30248facc59e0b5fe32f79869e28228 100644
--- a/Examples/CMakeLists.txt
+++ b/Examples/CMakeLists.txt
@@ -85,7 +85,7 @@ ELSE(OTB_BINARY_DIR)
         ADD_SUBDIRECTORY(Fusion)
         ADD_SUBDIRECTORY(Tutorials)
         ADD_SUBDIRECTORY(Markov)
-	ADD_SUBDIRECTORY(OBIA)
+        ADD_SUBDIRECTORY(OBIA)
 
     IF(OTB_USE_VISU_GUI)
         ADD_SUBDIRECTORY(Visualization)
@@ -96,7 +96,7 @@ ELSE(OTB_BINARY_DIR)
     ENDIF(OTB_USE_PATENTED)
 
     IF(OTB_USE_PQXX)
-	ADD_SUBDIRECTORY(GeospatialAnalysis)
+        ADD_SUBDIRECTORY(GeospatialAnalysis)
     ENDIF(OTB_USE_PQXX)
   ELSE(OTB_FOUND)
     MESSAGE("OTB not found.  Please set OTB_DIR")
diff --git a/Examples/ChangeDetection/CMakeLists.txt b/Examples/ChangeDetection/CMakeLists.txt
index 78cfaf7be66f00b4e3ab2c1dde71115635464a91..60905fd32d19f829392d58c0e2ed8e407058f3bf 100644
--- a/Examples/ChangeDetection/CMakeLists.txt
+++ b/Examples/ChangeDetection/CMakeLists.txt
@@ -61,66 +61,66 @@ SET(PNGEPSILON 2)
 # ------- CorrelChDetTest----------
 
 ADD_TEST(cdTeCorrelChDetTest ${EXE_TESTS}
-	--compare-n-images ${TOL} 1
-	${BASELINE}/CorrChDet.tif
-	${TEMP}/CorrChDet.tif
-	CorrelChDetTest
-	${INPUTDATA}/ERSBefore.png
-	${INPUTDATA}/ERSAfter.png
-	${TEMP}/CorrChDet.tif
+        --compare-n-images ${TOL} 1
+        ${BASELINE}/CorrChDet.tif
+        ${TEMP}/CorrChDet.tif
+        CorrelChDetTest
+        ${INPUTDATA}/ERSBefore.png
+        ${INPUTDATA}/ERSAfter.png
+        ${TEMP}/CorrChDet.tif
     15
 )
 
 # ------- DiffChDetTest----------
 
 ADD_TEST(cdTeDiffChDetTest ${EXE_TESTS}
-	--compare-n-images ${TOL} 1
-	${BASELINE}/DiffChDet.tif
-	${TEMP}/DiffChDet.tif
-	DiffChDetTest
-	${INPUTDATA}/SpotBefore.png
-	${INPUTDATA}/SpotAfter.png
-	${TEMP}/DiffChDet.tif
+        --compare-n-images ${TOL} 1
+        ${BASELINE}/DiffChDet.tif
+        ${TEMP}/DiffChDet.tif
+        DiffChDetTest
+        ${INPUTDATA}/SpotBefore.png
+        ${INPUTDATA}/SpotAfter.png
+        ${TEMP}/DiffChDet.tif
     3
 )
 
 # ------- RatioChDetTest----------
 
 ADD_TEST(cdTeRatioChDetTest ${EXE_TESTS}
-	--compare-n-images ${TOL} 1
-	${BASELINE}/RatioChDet.tif
-	${TEMP}/RatioChDet.tif
-	RatioChDetTest
-	${INPUTDATA}/GomaAvant.png
-	${INPUTDATA}/GomaApres.png
-	${TEMP}/RatioChDet.tif
+        --compare-n-images ${TOL} 1
+        ${BASELINE}/RatioChDet.tif
+        ${TEMP}/RatioChDet.tif
+        RatioChDetTest
+        ${INPUTDATA}/GomaAvant.png
+        ${INPUTDATA}/GomaApres.png
+        ${TEMP}/RatioChDet.tif
     3
 )
 
 # ------- KullbackLeiblerDistanceChDetTest----------
 
 ADD_TEST(cdTeKullbackLeiblerDistanceChDetTest ${EXE_TESTS}
-	--compare-n-images ${PNGEPSILON} 1
-	${BASELINE}/KullbackLeiblerDistanceChDetTest.png
-	${TEMP}/KullbackLeiblerDistanceChDetTest.png
-	KullbackLeiblerDistanceChDetTest
-	${INPUTDATA}/GomaAvant.png
-	${INPUTDATA}/GomaApres.png
-	${TEMP}/KullbackLeiblerDistanceChDetTest.png
-	35
+        --compare-n-images ${PNGEPSILON} 1
+        ${BASELINE}/KullbackLeiblerDistanceChDetTest.png
+        ${TEMP}/KullbackLeiblerDistanceChDetTest.png
+        KullbackLeiblerDistanceChDetTest
+        ${INPUTDATA}/GomaAvant.png
+        ${INPUTDATA}/GomaApres.png
+        ${TEMP}/KullbackLeiblerDistanceChDetTest.png
+        35
 )
 
 # ------- KullbackLeiblerProfileChDetTest----------
 
 ADD_TEST(cdTeKullbackLeiblerProfileChDetTest ${EXE_TESTS}
-	--compare-n-images ${TOL} 1
-	${BASELINE}/KullbackLeiblerProfileChDetTest.png
-	${TEMP}/KullbackLeiblerProfileChDetTest.png
-	KullbackLeiblerProfileChDetTest
-	${INPUTDATA}/GomaAvant.png
-	${INPUTDATA}/GomaApres.png
-	${TEMP}/KullbackLeiblerProfileChDetTest.png
-	5 51 1 12 24
+        --compare-n-images ${TOL} 1
+        ${BASELINE}/KullbackLeiblerProfileChDetTest.png
+        ${TEMP}/KullbackLeiblerProfileChDetTest.png
+        KullbackLeiblerProfileChDetTest
+        ${INPUTDATA}/GomaAvant.png
+        ${INPUTDATA}/GomaApres.png
+        ${TEMP}/KullbackLeiblerProfileChDetTest.png
+        5 51 1 12 24
 )
 
 INCLUDE_DIRECTORIES(${OTB_SOURCE_DIR}/Testing/Code)
diff --git a/Examples/Classification/CMakeLists.txt b/Examples/Classification/CMakeLists.txt
index a582be21519a48db2d79f1481d0f88c84fccaa26..738b26dedc0315c4e6d62bfcfa7c66955e4f667d 100644
--- a/Examples/Classification/CMakeLists.txt
+++ b/Examples/Classification/CMakeLists.txt
@@ -131,25 +131,25 @@ SET(TOL 0.0)
 # ------- ScalarImageMarkovRandomField1Test----------
 
 ADD_TEST(clTeScalarImageMarkovRandomField1Test ${EXE_TESTS}
-	--compare-n-images ${TOL} 1
-	${BASELINE}/ScalarImageMarkovRandomField1Output.png
-	${TEMP}/ScalarImageMarkovRandomField1Output.png
-	ScalarImageMarkovRandomField1Test
-	${INPUTDATA}/QB_Suburb.png
-	${INPUTDATA}/QB_Suburb_labelled.png
-	${TEMP}/ScalarImageMarkovRandomField1Output.png
+        --compare-n-images ${TOL} 1
+        ${BASELINE}/ScalarImageMarkovRandomField1Output.png
+        ${TEMP}/ScalarImageMarkovRandomField1Output.png
+        ScalarImageMarkovRandomField1Test
+        ${INPUTDATA}/QB_Suburb.png
+        ${INPUTDATA}/QB_Suburb_labelled.png
+        ${TEMP}/ScalarImageMarkovRandomField1Output.png
     50 3 4 79.5097 138.136 213.846 25.9395
 )
 
 # ------- ScalarImageKmeansClassifierTest----------
 
 ADD_TEST(clTeScalarImageKmeansClassifierTest ${EXE_TESTS}
-	--compare-n-images ${TOL} 1
-	${BASELINE}/QB_Suburb_labelled.png
-	${TEMP}/QB_Suburb_labelled.png
-	ScalarImageKmeansClassifierTest
-	${INPUTDATA}/QB_Suburb.png
-	${TEMP}/QB_Suburb_labelled.png
+        --compare-n-images ${TOL} 1
+        ${BASELINE}/QB_Suburb_labelled.png
+        ${TEMP}/QB_Suburb_labelled.png
+        ScalarImageKmeansClassifierTest
+        ${INPUTDATA}/QB_Suburb.png
+        ${TEMP}/QB_Suburb_labelled.png
     0 4 79.5097 138.136 213.846 25.9395
 )
 
diff --git a/Examples/DataRepresentation/Image/CMakeLists.txt b/Examples/DataRepresentation/Image/CMakeLists.txt
index 477dd448e7af977e9697c181433e94758a451563..87554e86e7ec43a2df90d645c4e346d23c00cd4a 100644
--- a/Examples/DataRepresentation/Image/CMakeLists.txt
+++ b/Examples/DataRepresentation/Image/CMakeLists.txt
@@ -56,45 +56,45 @@ SET(TOL 0.0)
 # ------- ImageAdaptor4Test----------
 
 ADD_TEST(diTeImageAdaptor4Test1 ${EXE_TESTS}
-	--compare-n-images ${TOL} 1
-	${BASELINE}/ImageAdaptorThresholdingA.png
-	${TEMP}/ImageAdaptorThresholdingA.png
-	ImageAdaptor4Test
-	${INPUTDATA}/QB_Suburb.png
-	${TEMP}/ImageAdaptorThresholdingA.png
+        --compare-n-images ${TOL} 1
+        ${BASELINE}/ImageAdaptorThresholdingA.png
+        ${TEMP}/ImageAdaptorThresholdingA.png
+        ImageAdaptor4Test
+        ${INPUTDATA}/QB_Suburb.png
+        ${TEMP}/ImageAdaptorThresholdingA.png
     100
 )
 
 # ------- ImageAdaptor4Test----------
 
 ADD_TEST(diTeImageAdaptor4Test2 ${EXE_TESTS}
-	--compare-n-images ${TOL} 1
-	${BASELINE}/ImageAdaptorThresholdingB.png
-	${TEMP}/ImageAdaptorThresholdingB.png
-	ImageAdaptor4Test
-	${INPUTDATA}/QB_Suburb.png
-	${TEMP}/ImageAdaptorThresholdingB.png
+        --compare-n-images ${TOL} 1
+        ${BASELINE}/ImageAdaptorThresholdingB.png
+        ${TEMP}/ImageAdaptorThresholdingB.png
+        ImageAdaptor4Test
+        ${INPUTDATA}/QB_Suburb.png
+        ${TEMP}/ImageAdaptorThresholdingB.png
     200
 )
 
 # ------- Image5Test----------
 
 ADD_TEST(diTeImage5Test ${EXE_TESTS}
-	--compare-n-images ${TOL} 1
-	${BASELINE}/Image5.png
-	${TEMP}/Image5.png
-	Image5Test
-	${TEMP}/Image5.png
+        --compare-n-images ${TOL} 1
+        ${BASELINE}/Image5.png
+        ${TEMP}/Image5.png
+        Image5Test
+        ${TEMP}/Image5.png
 )
 
 # ------- Image6Test----------
 
 ADD_TEST(diTeImage6Test ${EXE_TESTS}
-	--compare-n-images ${TOL} 1
-	${BASELINE}/Image6.tif
-	${TEMP}/Image6.tif
-	Image6Test
-	${TEMP}/Image6.tif
+        --compare-n-images ${TOL} 1
+        ${BASELINE}/Image6.tif
+        ${TEMP}/Image6.tif
+        Image6Test
+        ${TEMP}/Image6.tif
 )
 
 INCLUDE_DIRECTORIES(${OTB_SOURCE_DIR}/Testing/Code)
diff --git a/Examples/FeatureExtraction/CMakeLists.txt b/Examples/FeatureExtraction/CMakeLists.txt
index 541103697f3c7934303f5d027e95a154109e3ed0..b4627aca8c77aed0eac7181691228cc08991acaa 100644
--- a/Examples/FeatureExtraction/CMakeLists.txt
+++ b/Examples/FeatureExtraction/CMakeLists.txt
@@ -119,118 +119,118 @@ SET(TOL 0.0)
 # ------- CorrelationLineDetectorExampleTest----------
 
 ADD_TEST(feTeCorrelationLineDetectorExampleTest ${EXE_TESTS1}
-	--compare-n-images ${TOL} 2
-	${BASELINE}/amstLineCorrelations.png
-	${TEMP}/amstLineCorrelations.png
-	${BASELINE}/amstLineCorrelationDirections.png
-	${TEMP}/amstLineCorrelationDirections.png
-	CorrelationLineDetectorExampleTest
-	${INPUTDATA}/amst.png
-	${TEMP}/amstLineCorrelations.png
-	${TEMP}/amstLineCorrelationDirections.png
+        --compare-n-images ${TOL} 2
+        ${BASELINE}/amstLineCorrelations.png
+        ${TEMP}/amstLineCorrelations.png
+        ${BASELINE}/amstLineCorrelationDirections.png
+        ${TEMP}/amstLineCorrelationDirections.png
+        CorrelationLineDetectorExampleTest
+        ${INPUTDATA}/amst.png
+        ${TEMP}/amstLineCorrelations.png
+        ${TEMP}/amstLineCorrelationDirections.png
     5 1
 )
 
 # ------- LocalHoughExampleTest----------
 
 ADD_TEST(feTeLocalHoughExampleTest ${EXE_TESTS1}
-	--compare-n-images ${TOL} 1
-	${BASELINE}/detected_local_hough.png
-	${TEMP}/detected_local_hough.png
-	LocalHoughExampleTest
-	${INPUTDATA}/detected_lines.png
-	${TEMP}/detected_local_hough.png
+        --compare-n-images ${TOL} 1
+        ${BASELINE}/detected_local_hough.png
+        ${TEMP}/detected_local_hough.png
+        LocalHoughExampleTest
+        ${INPUTDATA}/detected_lines.png
+        ${TEMP}/detected_local_hough.png
   30 10 1 50
 )
 
 # ------- HarrisExampleTest----------
 
 ADD_TEST(feTeHarrisExampleTest ${EXE_TESTS1}
-	--compare-n-images ${TOL} 1
-	${BASELINE}/ROISpot5Harris.png
-	${TEMP}/ROISpot5Harris.png
-	HarrisExampleTest
-	${INPUTDATA}/ROISpot5.png
-	${TEMP}/ROISpot5Harris.png
+        --compare-n-images ${TOL} 1
+        ${BASELINE}/ROISpot5Harris.png
+        ${TEMP}/ROISpot5Harris.png
+        HarrisExampleTest
+        ${INPUTDATA}/ROISpot5.png
+        ${TEMP}/ROISpot5Harris.png
     1.5 2 0.1
 )
 
 # ------- TouziEdgeDetectorExampleTest----------
 
 ADD_TEST(feTeTouziEdgeDetectorExampleTest ${EXE_TESTS1}
-	--compare-n-images ${TOL} 2
-	${BASELINE}/amstTouziEdges.png
-	${TEMP}/amstTouziEdges.png
-	${BASELINE}/amstTouziDirections.png
-	${TEMP}/amstTouziDirections.png
-	TouziEdgeDetectorExampleTest
-	${INPUTDATA}/amst.png
-	${TEMP}/amstTouziEdges.png
-	${TEMP}/amstTouziDirections.png
+        --compare-n-images ${TOL} 2
+        ${BASELINE}/amstTouziEdges.png
+        ${TEMP}/amstTouziEdges.png
+        ${BASELINE}/amstTouziDirections.png
+        ${TEMP}/amstTouziDirections.png
+        TouziEdgeDetectorExampleTest
+        ${INPUTDATA}/amst.png
+        ${TEMP}/amstTouziEdges.png
+        ${TEMP}/amstTouziDirections.png
     3
 )
 
 # ------- ExtractSegmentsByStepsExampleTest----------
 
 ADD_TEST(feTeExtractSegmentsByStepsExampleTest ${EXE_TESTS1}
-	--compare-n-images ${TOL} 1
-	${BASELINE}/amstSegmentExtractionBySteps.png
-	${TEMP}/amstSegmentExtractionBySteps.png
-	ExtractSegmentsByStepsExampleTest
-	${INPUTDATA_OTB}/amst_ers1.ima.extrait.419_187_70_66.hdr
-	${TEMP}/amstSegmentExtractionBySteps.png
+        --compare-n-images ${TOL} 1
+        ${BASELINE}/amstSegmentExtractionBySteps.png
+        ${TEMP}/amstSegmentExtractionBySteps.png
+        ExtractSegmentsByStepsExampleTest
+        ${INPUTDATA_OTB}/amst_ers1.ima.extrait.419_187_70_66.hdr
+        ${TEMP}/amstSegmentExtractionBySteps.png
   10 3 10 0.5 10 10 3 10 0.5
 )
 
 # ------- AssymmetricFusionOfLineDetectorExampleTest----------
 
 ADD_TEST(feTeAssymmetricFusionOfLineDetectorExampleTest ${EXE_TESTS1}
-	--compare-n-images ${TOL} 1
-	${BASELINE}/amstLineFusion.png
-	${TEMP}/amstLineFusion.png
-	AssymmetricFusionOfLineDetectorExampleTest
-	${INPUTDATA}/amst.png
-	${TEMP}/amstLineFusion.png
+        --compare-n-images ${TOL} 1
+        ${BASELINE}/amstLineFusion.png
+        ${TEMP}/amstLineFusion.png
+        AssymmetricFusionOfLineDetectorExampleTest
+        ${INPUTDATA}/amst.png
+        ${TEMP}/amstLineFusion.png
     5 1
 )
 
 # ------- ExtractSegmentsExampleTest----------
 
 ADD_TEST(feTeExtractSegmentsExampleTest ${EXE_TESTS1}
-	--compare-n-images ${TOL} 1
-	${BASELINE}/amstSegmentExtraction.png
-	${TEMP}/amstSegmentExtraction.png
-	ExtractSegmentsExampleTest
-	${INPUTDATA_OTB}/amst_ers1.ima.extrait.419_187_70_66.hdr
-	${TEMP}/amstSegmentExtraction.png
+        --compare-n-images ${TOL} 1
+        ${BASELINE}/amstSegmentExtraction.png
+        ${TEMP}/amstSegmentExtraction.png
+        ExtractSegmentsExampleTest
+        ${INPUTDATA_OTB}/amst_ers1.ima.extrait.419_187_70_66.hdr
+        ${TEMP}/amstSegmentExtraction.png
   10 3 10 0.5 10 10 3 10 0.5
 )
 
 # ------- RatioLineDetectorExampleTest----------
 
 ADD_TEST(feTeRatioLineDetectorExampleTest ${EXE_TESTS1}
-	--compare-n-images ${TOL} 2
-	${BASELINE}/amstLineRatios.png
-	${TEMP}/amstLineRatios.png
-	${BASELINE}/amstLineRatioDirections.png
-	${TEMP}/amstLineRatioDirections.png
-	RatioLineDetectorExampleTest
-	${INPUTDATA}/amst.png
-	${TEMP}/amstLineRatios.png
-	${TEMP}/amstLineRatioDirections.png
+        --compare-n-images ${TOL} 2
+        ${BASELINE}/amstLineRatios.png
+        ${TEMP}/amstLineRatios.png
+        ${BASELINE}/amstLineRatioDirections.png
+        ${TEMP}/amstLineRatioDirections.png
+        RatioLineDetectorExampleTest
+        ${INPUTDATA}/amst.png
+        ${TEMP}/amstLineRatios.png
+        ${TEMP}/amstLineRatioDirections.png
     5 1
 )
 
 # ------- AlignmentsExampleTest----------
 
 ADD_TEST(feTeAlignmentsExampleTest ${EXE_TESTS1}
-	--compare-n-images ${TOL} 1
-	${BASELINE}/QB_SuburbAlign.png
-	${TEMP}/QB_SuburbAlign.png
-	AlignmentsExampleTest
-	${INPUTDATA}/QB_Suburb.png
-	${TEMP}/QB_SuburbAlign.png
-	5
+        --compare-n-images ${TOL} 1
+        ${BASELINE}/QB_SuburbAlign.png
+        ${TEMP}/QB_SuburbAlign.png
+        AlignmentsExampleTest
+        ${INPUTDATA}/QB_Suburb.png
+        ${TEMP}/QB_SuburbAlign.png
+        5
 )
 
 # ------- RoadExtractionExamplesTest----------
@@ -238,15 +238,15 @@ ADD_TEST(feTeAlignmentsExampleTest ${EXE_TESTS1}
 
 ADD_TEST(feTeExtractRoadByStepsExampleTest ${EXE_TESTS2}
         --compare-n-images ${TOL} 2
-	${BASELINE}/qb_ExtractRoad_pretty.png
-	${TEMP}/qb_ExtractRoad_pretty.png
+        ${BASELINE}/qb_ExtractRoad_pretty.png
+        ${TEMP}/qb_ExtractRoad_pretty.png
         ${BASELINE}/ExtractRoadByStepsExampleOutput.png
         ${TEMP}/ExtractRoadByStepsExampleOutput.png
         ExtractRoadByStepsExampleTest
         ${INPUTDATA}/qb_RoadExtract.tif
-	${TEMP}/ExtractRoadByStepsExampleOutput.png
+        ${TEMP}/ExtractRoadByStepsExampleOutput.png
         ${TEMP}/qb_ExtractRoad_pretty.png
-	337 557 432 859 0.00005 1.0
+        337 557 432 859 0.00005 1.0
 )
 
 
@@ -257,7 +257,7 @@ ADD_TEST(feTeExtractRoadExampleTest ${EXE_TESTS2}
         ExtractRoadExampleTest
         ${INPUTDATA}/qb_RoadExtract.tif
         ${TEMP}/ExtractRoadExampleOutput.png
-	337 557 432 859 1.0 0.00005 1.0 0.39269 1.0 10.0 25.
+        337 557 432 859 1.0 0.00005 1.0 0.39269 1.0 10.0 25.
 )
 
 # ------- SeamCarvingExamplesTest----------
@@ -269,7 +269,7 @@ ADD_TEST(feTeSeamCarvingExampleTest ${EXE_TESTS2}
         SeamCarvingExampleTest
         ${INPUTDATA}/QB_Suburb.png
         ${TEMP}/SeamCarvingExampleOutput.png
-	50
+        50
 )
 
 ADD_TEST(feTeSeamCarvingOtherExampleTest ${EXE_TESTS2}
@@ -279,7 +279,7 @@ ADD_TEST(feTeSeamCarvingOtherExampleTest ${EXE_TESTS2}
         SeamCarvingOtherExampleTest
         ${INPUTDATA}/QB_Suburb.png
         ${TEMP}/SeamCarvingOtherExampleOutput.png
-	50
+        50
 )
 
 #ADD_TEST(feTeImageToSIFTKeyPointSetFilterTest ${EXE_TESTS}
@@ -289,7 +289,7 @@ ADD_TEST(feTeSeamCarvingOtherExampleTest ${EXE_TESTS2}
 #        ImageToSIFTKeyPointSetFilterTest
 #        ${INPUTDATA}/Scene.png
 #        ${TEMP}/ImageToSIFTKeyPointSetFilterOutput.png
-#	6 3 0.08 10
+#        6 3 0.08 10
 #)
 
 
@@ -302,8 +302,8 @@ ADD_TEST(feTeCloudDetectionExampleTest ${EXE_TESTS2}
         CloudDetectionExampleTest
         ${INPUTDATA}/CloudsOnReunion.tif
         ${TEMP}/CloudDetectionOutput.tif
-	${TEMP}/PrettyCloudDetectionInput.png
-	${TEMP}/PrettyCloudDetectionOutput.png
+        ${TEMP}/PrettyCloudDetectionInput.png
+        ${TEMP}/PrettyCloudDetectionOutput.png
         553 467 734 581 0.4 0.6 1.0
 )
 
@@ -316,8 +316,8 @@ ADD_TEST(feTeLineSegmentDetectorExampleTest  ${EXE_TESTS2}
         ${BASELINE}/feTeLineSegmentDetectorExampleOutput.png
         ${TEMP}/feTeLineSegmentDetectorExampleOutput.png
        LineSegmentDetectorExampleTest
-	${INPUTDATA}/Scene.png
-	${TEMP}/feTeLineSegmentDetectorExampleOutput.png
+        ${INPUTDATA}/Scene.png
+        ${TEMP}/feTeLineSegmentDetectorExampleOutput.png
 )
 
 # ------- Right Angle Detection test----------
@@ -327,12 +327,12 @@ ADD_TEST(feTeRightAngleDetectionExample  ${EXE_TESTS2}
         ${BASELINE}/feTeRightAngleDetectionExampleOutput.png
         ${TEMP}/feTeRightAngleDetectionExampleOutput.png
        RightAngleDetectionExample
-	${INPUTDATA}/Scene.png
-	${TEMP}/feTeRightAngleDetectionExampleOutput.png
-	${TEMP}/PrettyRightAngleInput.png
-	${TEMP}/PrettyRightAngleOutput.png
-	0.1
-	10.
+        ${INPUTDATA}/Scene.png
+        ${TEMP}/feTeRightAngleDetectionExampleOutput.png
+        ${TEMP}/PrettyRightAngleInput.png
+        ${TEMP}/PrettyRightAngleOutput.png
+        0.1
+        10.
 )
 
 ENDIF(OTB_USE_MAPNIK)
diff --git a/Examples/Filtering/CMakeLists.txt b/Examples/Filtering/CMakeLists.txt
index 923d356ed356226fdc5882945153d0209b0060d8..8fb2ff28fb6af663eb4ec2cc3377adf13dde2bfa 100644
--- a/Examples/Filtering/CMakeLists.txt
+++ b/Examples/Filtering/CMakeLists.txt
@@ -81,133 +81,133 @@ SET(PNGTOL 2)
 # ------- MathematicalMorphologyBinaryFiltersTest----------
 
 ADD_TEST(fiTeMathematicalMorphologyBinaryFiltersTest ${EXE_TESTS}
-	--compare-n-images ${TOL} 2
-	${BASELINE}/MathematicalMorphologyBinaryErosionOutput.png
-	${TEMP}/MathematicalMorphologyBinaryErosionOutput.png
-	${BASELINE}/MathematicalMorphologyBinaryDilationOutput.png
-	${TEMP}/MathematicalMorphologyBinaryDilationOutput.png
-	MathematicalMorphologyBinaryFiltersTest
-	${INPUTDATA}/ROISpot5.png
-	${TEMP}/MathematicalMorphologyBinaryErosionOutput.png
-	${TEMP}/MathematicalMorphologyBinaryDilationOutput.png
+        --compare-n-images ${TOL} 2
+        ${BASELINE}/MathematicalMorphologyBinaryErosionOutput.png
+        ${TEMP}/MathematicalMorphologyBinaryErosionOutput.png
+        ${BASELINE}/MathematicalMorphologyBinaryDilationOutput.png
+        ${TEMP}/MathematicalMorphologyBinaryDilationOutput.png
+        MathematicalMorphologyBinaryFiltersTest
+        ${INPUTDATA}/ROISpot5.png
+        ${TEMP}/MathematicalMorphologyBinaryErosionOutput.png
+        ${TEMP}/MathematicalMorphologyBinaryDilationOutput.png
     150 180
 )
 
 # ------- DanielssonDistanceMapImageFilterTest----------
 
 ADD_TEST(fiTeDanielssonDistanceMapImageFilterTest ${EXE_TESTS}
-	--compare-n-images ${TOL} 2
-	${BASELINE}/DanielssonDistanceMapImageFilterOutput1.png
-	${TEMP}/DanielssonDistanceMapImageFilterOutput1.png
-	${BASELINE}/DanielssonDistanceMapImageFilterOutput2.png
-	${TEMP}/DanielssonDistanceMapImageFilterOutput2.png
-	DanielssonDistanceMapImageFilterTest
-	${INPUTDATA}/FivePoints.png
-	${TEMP}/DanielssonDistanceMapImageFilterOutput1.png
-	${TEMP}/DanielssonDistanceMapImageFilterOutput2.png
+        --compare-n-images ${TOL} 2
+        ${BASELINE}/DanielssonDistanceMapImageFilterOutput1.png
+        ${TEMP}/DanielssonDistanceMapImageFilterOutput1.png
+        ${BASELINE}/DanielssonDistanceMapImageFilterOutput2.png
+        ${TEMP}/DanielssonDistanceMapImageFilterOutput2.png
+        DanielssonDistanceMapImageFilterTest
+        ${INPUTDATA}/FivePoints.png
+        ${TEMP}/DanielssonDistanceMapImageFilterOutput1.png
+        ${TEMP}/DanielssonDistanceMapImageFilterOutput2.png
 )
 
 # ------- MeanImageFilterTest----------
 
 ADD_TEST(fiTeMeanImageFilterTest ${EXE_TESTS}
-	--compare-n-images ${TOL} 1
-	${BASELINE}/MeanImageFilterOutput.png
-	${TEMP}/MeanImageFilterOutput.png
-	MeanImageFilterTest
-	${INPUTDATA}/QB_Suburb.png
-	${TEMP}/MeanImageFilterOutput.png
+        --compare-n-images ${TOL} 1
+        ${BASELINE}/MeanImageFilterOutput.png
+        ${TEMP}/MeanImageFilterOutput.png
+        MeanImageFilterTest
+        ${INPUTDATA}/QB_Suburb.png
+        ${TEMP}/MeanImageFilterOutput.png
 )
 
 # ------- ThresholdImageFilterTest----------
 
 ADD_TEST(fiTeThresholdImageFilterTest ${EXE_TESTS}
-	--compare-n-images ${TOL} 3
-	${BASELINE}/ThresholdImageFilterOutputBelow.png
-	${TEMP}/ThresholdImageFilterOutputBelow.png
-	${BASELINE}/ThresholdImageFilterOutputAbove.png
-	${TEMP}/ThresholdImageFilterOutputAbove.png
-	${BASELINE}/ThresholdImageFilterOutputOutside.png
-	${TEMP}/ThresholdImageFilterOutputOutside.png
-	ThresholdImageFilterTest
-	${INPUTDATA}/ROISpot5.png
-	${TEMP}/ThresholdImageFilterOutputBelow.png
-	${TEMP}/ThresholdImageFilterOutputAbove.png
-	${TEMP}/ThresholdImageFilterOutputOutside.png
+        --compare-n-images ${TOL} 3
+        ${BASELINE}/ThresholdImageFilterOutputBelow.png
+        ${TEMP}/ThresholdImageFilterOutputBelow.png
+        ${BASELINE}/ThresholdImageFilterOutputAbove.png
+        ${TEMP}/ThresholdImageFilterOutputAbove.png
+        ${BASELINE}/ThresholdImageFilterOutputOutside.png
+        ${TEMP}/ThresholdImageFilterOutputOutside.png
+        ThresholdImageFilterTest
+        ${INPUTDATA}/ROISpot5.png
+        ${TEMP}/ThresholdImageFilterOutputBelow.png
+        ${TEMP}/ThresholdImageFilterOutputAbove.png
+        ${TEMP}/ThresholdImageFilterOutputOutside.png
 )
 
 # ------- GradientMagnitudeRecursiveGaussianImageFilterTest----------
 
 ADD_TEST(fiTeGradientMagnitudeRecursiveGaussianImageFilterTest ${EXE_TESTS}
-	--compare-n-images ${PNGTOL} 1
-	${BASELINE}/GradientMagnitudeRecursiveGaussianImageFilterOutput3.png
-	${TEMP}/GradientMagnitudeRecursiveGaussianImageFilterOutput3.png
-	GradientMagnitudeRecursiveGaussianImageFilterTest
-	${INPUTDATA}/ROISpot5.png
-	${TEMP}/GradientMagnitudeRecursiveGaussianImageFilterOutput3.png
+        --compare-n-images ${PNGTOL} 1
+        ${BASELINE}/GradientMagnitudeRecursiveGaussianImageFilterOutput3.png
+        ${TEMP}/GradientMagnitudeRecursiveGaussianImageFilterOutput3.png
+        GradientMagnitudeRecursiveGaussianImageFilterTest
+        ${INPUTDATA}/ROISpot5.png
+        ${TEMP}/GradientMagnitudeRecursiveGaussianImageFilterOutput3.png
     3
 )
 
 # ------- GradientMagnitudeRecursiveGaussianImageFilterTest----------
 
 ADD_TEST(fiTeGradientMagnitudeRecursiveGaussianImageFilterTest ${EXE_TESTS}
-	--compare-n-images ${TOL} 1
-	${BASELINE}/GradientMagnitudeRecursiveGaussianImageFilterOutput5.png
-	${TEMP}/GradientMagnitudeRecursiveGaussianImageFilterOutput5.png
-	GradientMagnitudeRecursiveGaussianImageFilterTest
-	${INPUTDATA}/ROISpot5.png
-	${TEMP}/GradientMagnitudeRecursiveGaussianImageFilterOutput5.png
+        --compare-n-images ${TOL} 1
+        ${BASELINE}/GradientMagnitudeRecursiveGaussianImageFilterOutput5.png
+        ${TEMP}/GradientMagnitudeRecursiveGaussianImageFilterOutput5.png
+        GradientMagnitudeRecursiveGaussianImageFilterTest
+        ${INPUTDATA}/ROISpot5.png
+        ${TEMP}/GradientMagnitudeRecursiveGaussianImageFilterOutput5.png
     5
 )
 
 # ------- GradientAnisotropicDiffusionImageFilterTest----------
 
 ADD_TEST(fiTeGradientAnisotropicDiffusionImageFilterTest ${EXE_TESTS}
-	--compare-n-images ${TOL} 1
-	${BASELINE}/GradientAnisotropicDiffusionImageFilterOutput.png
-	${TEMP}/GradientAnisotropicDiffusionImageFilterOutput.png
-	GradientAnisotropicDiffusionImageFilterTest
-	${INPUTDATA}/QB_Suburb.png
-	${TEMP}/GradientAnisotropicDiffusionImageFilterOutput.png
+        --compare-n-images ${TOL} 1
+        ${BASELINE}/GradientAnisotropicDiffusionImageFilterOutput.png
+        ${TEMP}/GradientAnisotropicDiffusionImageFilterOutput.png
+        GradientAnisotropicDiffusionImageFilterTest
+        ${INPUTDATA}/QB_Suburb.png
+        ${TEMP}/GradientAnisotropicDiffusionImageFilterOutput.png
     5 0.125 3
 )
 
 # ------- GradientMagnitudeImageFilterTest----------
 
 ADD_TEST(fiTeGradientMagnitudeImageFilterTest ${EXE_TESTS}
-	--compare-n-images ${TOL} 1
-	${BASELINE}/GradientMagnitudeImageFilterOutput.png
-	${TEMP}/GradientMagnitudeImageFilterOutput.png
-	GradientMagnitudeImageFilterTest
-	${INPUTDATA}/ROISpot5.png
-	${TEMP}/GradientMagnitudeImageFilterOutput.png
+        --compare-n-images ${TOL} 1
+        ${BASELINE}/GradientMagnitudeImageFilterOutput.png
+        ${TEMP}/GradientMagnitudeImageFilterOutput.png
+        GradientMagnitudeImageFilterTest
+        ${INPUTDATA}/ROISpot5.png
+        ${TEMP}/GradientMagnitudeImageFilterOutput.png
 )
 
 # ------- MathematicalMorphologyGrayscaleFiltersTest----------
 
 ADD_TEST(fiTeMathematicalMorphologyGrayscaleFiltersTest ${EXE_TESTS}
-	--compare-n-images ${TOL} 2
-	${BASELINE}/MathematicalMorphologyGrayscaleErosionOutput.png
-	${TEMP}/MathematicalMorphologyGrayscaleErosionOutput.png
-	${BASELINE}/MathematicalMorphologyGrayscaleDilationOutput.png
-	${TEMP}/MathematicalMorphologyGrayscaleDilationOutput.png
-	MathematicalMorphologyGrayscaleFiltersTest
-	${INPUTDATA}/QB_Suburb.png
-	${TEMP}/MathematicalMorphologyGrayscaleErosionOutput.png
-	${TEMP}/MathematicalMorphologyGrayscaleDilationOutput.png
+        --compare-n-images ${TOL} 2
+        ${BASELINE}/MathematicalMorphologyGrayscaleErosionOutput.png
+        ${TEMP}/MathematicalMorphologyGrayscaleErosionOutput.png
+        ${BASELINE}/MathematicalMorphologyGrayscaleDilationOutput.png
+        ${TEMP}/MathematicalMorphologyGrayscaleDilationOutput.png
+        MathematicalMorphologyGrayscaleFiltersTest
+        ${INPUTDATA}/QB_Suburb.png
+        ${TEMP}/MathematicalMorphologyGrayscaleErosionOutput.png
+        ${TEMP}/MathematicalMorphologyGrayscaleDilationOutput.png
     150 180
 )
 
 # ------- LaplacianRecursiveGaussianImageFilter1Test----------
 
 ADD_TEST(fiTeLaplacianRecursiveGaussianImageFilter1Test ${EXE_TESTS}
-	--compare-n-images ${TOL} 2
-	${BASELINE}/LaplacianRecursiveGaussianImageFilteroutput5.hdr
-	${TEMP}/LaplacianRecursiveGaussianImageFilteroutput5.hdr
+        --compare-n-images ${TOL} 2
+        ${BASELINE}/LaplacianRecursiveGaussianImageFilteroutput5.hdr
+        ${TEMP}/LaplacianRecursiveGaussianImageFilteroutput5.hdr
         ${BASELINE}/LaplacianRecursiveGaussianImageFilterOutput5.png
-	${TEMP}/LaplacianRecursiveGaussianImageFilterOutput5.png
-	LaplacianRecursiveGaussianImageFilter1Test
-	${INPUTDATA}/ROISpot5.png
-	${TEMP}/LaplacianRecursiveGaussianImageFilteroutput5.hdr
+        ${TEMP}/LaplacianRecursiveGaussianImageFilterOutput5.png
+        LaplacianRecursiveGaussianImageFilter1Test
+        ${INPUTDATA}/ROISpot5.png
+        ${TEMP}/LaplacianRecursiveGaussianImageFilteroutput5.hdr
         5
         ${TEMP}/LaplacianRecursiveGaussianImageFilterOutput5.png
 )
@@ -216,77 +216,77 @@ ADD_TEST(fiTeLaplacianRecursiveGaussianImageFilter1Test ${EXE_TESTS}
 # ------- LaplacianRecursiveGaussianImageFilter2Test----------
 
 ADD_TEST(fiTeLaplacianRecursiveGaussianImageFilter2Test ${EXE_TESTS}
-	--compare-n-images ${TOL} 2
-	${BASELINE}/LaplacianRecursiveGaussianImageFilter2output5.hdr
-	${TEMP}/LaplacianRecursiveGaussianImageFilter2output5.hdr
-	${BASELINE}/LaplacianRecursiveGaussianImageFilter2Output5.png
-	${TEMP}/LaplacianRecursiveGaussianImageFilter2Output5.png
-	LaplacianRecursiveGaussianImageFilter2Test
-	${INPUTDATA}/ROISpot5.png
-	${TEMP}/LaplacianRecursiveGaussianImageFilter2output5.hdr
+        --compare-n-images ${TOL} 2
+        ${BASELINE}/LaplacianRecursiveGaussianImageFilter2output5.hdr
+        ${TEMP}/LaplacianRecursiveGaussianImageFilter2output5.hdr
+        ${BASELINE}/LaplacianRecursiveGaussianImageFilter2Output5.png
+        ${TEMP}/LaplacianRecursiveGaussianImageFilter2Output5.png
+        LaplacianRecursiveGaussianImageFilter2Test
+        ${INPUTDATA}/ROISpot5.png
+        ${TEMP}/LaplacianRecursiveGaussianImageFilter2output5.hdr
         5
-	${TEMP}/LaplacianRecursiveGaussianImageFilter2Output5.png
+        ${TEMP}/LaplacianRecursiveGaussianImageFilter2Output5.png
 )
 
 # ------- CannyEdgeDetectionImageFilterTest----------
 
 ADD_TEST(fiTeCannyEdgeDetectionImageFilterTest ${EXE_TESTS}
-	--compare-n-images ${TOL} 1
-	${BASELINE}/CannyEdgeDetectorImageFilterOutput.png
-	${TEMP}/CannyEdgeDetectorImageFilterOutput.png
-	CannyEdgeDetectionImageFilterTest
-	${INPUTDATA}/ROISpot5.png
-	${TEMP}/CannyEdgeDetectorImageFilterOutput.png
+        --compare-n-images ${TOL} 1
+        ${BASELINE}/CannyEdgeDetectorImageFilterOutput.png
+        ${TEMP}/CannyEdgeDetectorImageFilterOutput.png
+        CannyEdgeDetectionImageFilterTest
+        ${INPUTDATA}/ROISpot5.png
+        ${TEMP}/CannyEdgeDetectorImageFilterOutput.png
  2
 )
 
 # ------- DiscreteGaussianImageFilterTest----------
 
 ADD_TEST(fiTeDiscreteGaussianImageFilterTest ${EXE_TESTS}
-	--compare-n-images ${TOL} 1
-	${BASELINE}/DiscreteGaussianImageFilterOutput.png
-	${TEMP}/DiscreteGaussianImageFilterOutput.png
-	DiscreteGaussianImageFilterTest
-	${INPUTDATA}/QB_Suburb.png
-	${TEMP}/DiscreteGaussianImageFilterOutput.png
+        --compare-n-images ${TOL} 1
+        ${BASELINE}/DiscreteGaussianImageFilterOutput.png
+        ${TEMP}/DiscreteGaussianImageFilterOutput.png
+        DiscreteGaussianImageFilterTest
+        ${INPUTDATA}/QB_Suburb.png
+        ${TEMP}/DiscreteGaussianImageFilterOutput.png
     4 9
 )
 
 # ------- MedianImageFilterTest----------
 
 ADD_TEST(fiTeMedianImageFilterTest ${EXE_TESTS}
-	--compare-n-images ${TOL} 1
-	${BASELINE}/MedianImageFilterOutput.png
-	${TEMP}/MedianImageFilterOutput.png
-	MedianImageFilterTest
-	${INPUTDATA}/QB_Suburb.png
-	${TEMP}/MedianImageFilterOutput.png
+        --compare-n-images ${TOL} 1
+        ${BASELINE}/MedianImageFilterOutput.png
+        ${TEMP}/MedianImageFilterOutput.png
+        MedianImageFilterTest
+        ${INPUTDATA}/QB_Suburb.png
+        ${TEMP}/MedianImageFilterOutput.png
 )
 
 # ------- BinaryThresholdImageFilterTest----------
 
 ADD_TEST(fiTeBinaryThresholdImageFilterTest ${EXE_TESTS}
-	--compare-n-images ${TOL} 1
-	${BASELINE}/BinaryThresholdImageFilterOutput.png
-	${TEMP}/BinaryThresholdImageFilterOutput.png
-	BinaryThresholdImageFilterTest
-	${INPUTDATA}/ROISpot5.png
-	${TEMP}/BinaryThresholdImageFilterOutput.png
+        --compare-n-images ${TOL} 1
+        ${BASELINE}/BinaryThresholdImageFilterOutput.png
+        ${TEMP}/BinaryThresholdImageFilterOutput.png
+        BinaryThresholdImageFilterTest
+        ${INPUTDATA}/ROISpot5.png
+        ${TEMP}/BinaryThresholdImageFilterOutput.png
  150 180 0 255
 )
 
 # ------- DerivativeImageFilterTest----------
 
 ADD_TEST(fiTeDerivativeImageFilterTest ${EXE_TESTS}
-	--compare-n-images ${TOL} 2
-	${BASELINE}/DerivativeImageFilterFloatOutput.hdr
-	${TEMP}/DerivativeImageFilterFloatOutput.hdr
-	${BASELINE}/DerivativeImageFilterOutput.png
-	${TEMP}/DerivativeImageFilterOutput.png
-	DerivativeImageFilterTest
-	${INPUTDATA}/ROISpot5.png
-	${TEMP}/DerivativeImageFilterFloatOutput.hdr
-	${TEMP}/DerivativeImageFilterOutput.png
+        --compare-n-images ${TOL} 2
+        ${BASELINE}/DerivativeImageFilterFloatOutput.hdr
+        ${TEMP}/DerivativeImageFilterFloatOutput.hdr
+        ${BASELINE}/DerivativeImageFilterOutput.png
+        ${TEMP}/DerivativeImageFilterOutput.png
+        DerivativeImageFilterTest
+        ${INPUTDATA}/ROISpot5.png
+        ${TEMP}/DerivativeImageFilterFloatOutput.hdr
+        ${TEMP}/DerivativeImageFilterOutput.png
     1 0
 )
 
diff --git a/Examples/Fusion/CMakeLists.txt b/Examples/Fusion/CMakeLists.txt
index b0bce89064a42ac90f22bfc508e4156ff22f2c6d..fbd5cd42b6b78c26101b529e6a149b23c6b0d3a4 100644
--- a/Examples/Fusion/CMakeLists.txt
+++ b/Examples/Fusion/CMakeLists.txt
@@ -24,31 +24,31 @@ SET(TOL 0.0)
 SET(EPSILON 0.00000001)
 
 ADD_TEST(fuTeBayesianFusionImageFilterTest ${EXE_TESTS}
-	--compare-image ${EPSILON}
-	${BASELINE}/ImageBayesianFusion.tif
-	${TEMP}/ImageBayesianFusion.tif
+        --compare-image ${EPSILON}
+        ${BASELINE}/ImageBayesianFusion.tif
+        ${TEMP}/ImageBayesianFusion.tif
     BayesianFusionImageFilterTest
         ${INPUTDATA}/multiSpect.tif
-	${INPUTDATA}/multiSpectInterp.tif
+        ${INPUTDATA}/multiSpectInterp.tif
         ${INPUTDATA}/panchro.tif
-	${TEMP}/ImageBayesianFusion.tif
-	${TEMP}/ImageBayesianFusion1.png
-	${TEMP}/ImageBayesianFusion2.png
-	${TEMP}/ImageBayesianFusion3.png
-	${TEMP}/ImageBayesianFusion4.png
-	0.9999
+        ${TEMP}/ImageBayesianFusion.tif
+        ${TEMP}/ImageBayesianFusion1.png
+        ${TEMP}/ImageBayesianFusion2.png
+        ${TEMP}/ImageBayesianFusion3.png
+        ${TEMP}/ImageBayesianFusion4.png
+        0.9999
 )
 
 ADD_TEST(fuTePanSharpeningExampleTest ${EXE_TESTS}
     --compare-image ${EPSILON}  ${BASELINE}/PanSharpeningExampleTest.tif
                            ${TEMP}/PanSharpeningExampleTest.tif
         PanSharpeningExampleTest
-	${INPUTDATA}/QB_Toulouse_Ortho_PAN.tif
-	${INPUTDATA}/QB_Toulouse_Ortho_XS.tif
-	${TEMP}/PanSharpeningExampleTest.tif
-	${TEMP}/PanSharpeningExampleTest1.png
-	${TEMP}/PanSharpeningExampleTest2.png
-	${TEMP}/PanSharpeningExampleTest3.png
+        ${INPUTDATA}/QB_Toulouse_Ortho_PAN.tif
+        ${INPUTDATA}/QB_Toulouse_Ortho_XS.tif
+        ${TEMP}/PanSharpeningExampleTest.tif
+        ${TEMP}/PanSharpeningExampleTest1.png
+        ${TEMP}/PanSharpeningExampleTest2.png
+        ${TEMP}/PanSharpeningExampleTest3.png
 )
 
 INCLUDE_DIRECTORIES(${OTB_SOURCE_DIR}/Testing/Code)
diff --git a/Examples/GeospatialAnalysis/CMakeLists.txt b/Examples/GeospatialAnalysis/CMakeLists.txt
index 866586e8ddc1a765c3da60a9bf6eba0f965c9942..875256af96e1a7e77f76dda17249a3a211fd8752 100644
--- a/Examples/GeospatialAnalysis/CMakeLists.txt
+++ b/Examples/GeospatialAnalysis/CMakeLists.txt
@@ -26,10 +26,10 @@ SET(EPS 0.001)
 ADD_TEST( trTeGeospatialAnalysisPostGISCreateTableTest ${EXE_TESTS}
       
         GeospatialAnalysisPostGISCreateTableTest
-  	localhost
-  	orfeotoolbox_test
-  	orfeotoolbox_test_user
-  	Bidfeud0
+          localhost
+          orfeotoolbox_test
+          orfeotoolbox_test_user
+          Bidfeud0
         )
 
 
diff --git a/Examples/IO/CMakeLists.txt b/Examples/IO/CMakeLists.txt
index f474b58343fb420a9c12c68cdab6ed899522f700..fcd17eb417c4bf4b4db10e41a73cafe0921cfc9a 100644
--- a/Examples/IO/CMakeLists.txt
+++ b/Examples/IO/CMakeLists.txt
@@ -138,16 +138,16 @@ SET(HIGHTOL 10.0)
 # ------- ExtractROITest----------
 
 ADD_TEST(ioTeExtractROITest ${EXE_TESTS1}
-	--compare-n-images ${NOTOL} 2
-	${BASELINE}/ROI_IMAGERY_RGB.png
-	${TEMP}/ROI_IMAGERY_RGB.png
-
-	${BASELINE}/ROI_IMAGERY_MIR.png
-	${TEMP}/ROI_IMAGERY_MIR.png
-	ExtractROITest
-	${INPUTDATA}/IMAGERY_SSECH.tif
-	${TEMP}/ROI_IMAGERY_RGB.png
-	${TEMP}/ROI_IMAGERY_MIR.png
+        --compare-n-images ${NOTOL} 2
+        ${BASELINE}/ROI_IMAGERY_RGB.png
+        ${TEMP}/ROI_IMAGERY_RGB.png
+
+        ${BASELINE}/ROI_IMAGERY_MIR.png
+        ${TEMP}/ROI_IMAGERY_MIR.png
+        ExtractROITest
+        ${INPUTDATA}/IMAGERY_SSECH.tif
+        ${TEMP}/ROI_IMAGERY_RGB.png
+        ${TEMP}/ROI_IMAGERY_MIR.png
     0 0 100 100
 )
 
@@ -166,7 +166,7 @@ ADD_TEST(ioTeDEMToImageGeneratorTest ${EXE_TESTS1}
           ${INPUTDATA}/DEM_srtm
          )
 
-# Testing the chain of creating a kmz and MapFilefrom 
+# Testing the chain of creating a kmz and MapFilefrom
 # a non georeferenced image
 ADD_TEST(ioImageToKmzAndMapFileProductExample ${EXE_TESTS1}
          ImageToKmzAndMapFileProductExample
@@ -176,7 +176,7 @@ ADD_TEST(ioImageToKmzAndMapFileProductExample ${EXE_TESTS1}
          ${TEMP}/mapserverExample/shapeindex
          http://localhost/cgi-bin/mapserv
          ${DATA}/DEM/srtm_directory
-         198.000000 199.000000 -72.351257 18.555075 0.000000 
+         198.000000 199.000000 -72.351257 18.555075 0.000000
          196.000000 194.000000 -72.352051 18.556946 0.000000
          208.000000 157.000000 -72.346130 18.574358 0.000000
          215.000000 143.000000 -72.342377 18.580441 0.000000
@@ -185,7 +185,7 @@ ADD_TEST(ioImageToKmzAndMapFileProductExample ${EXE_TESTS1}
          349.000000 140.000000 -72.278343 18.580887 0.000000
          289.000000 144.000000 -72.306908 18.579464 0.000000
          210.000000 247.000000 -72.345741 18.532839 0.000000
-         194.000000 247.000000 -72.353317 18.532595 0.00000 
+         194.000000 247.000000 -72.353317 18.532595 0.00000
          164.000000 241.000000 -72.367691 18.535810 0.000000
          144.000000 245.000000 -72.377457 18.534243 0.000000
          69.000000  201.000000 -72.413315 18.554974 0.000000
diff --git a/Examples/Iterators/CMakeLists.txt b/Examples/Iterators/CMakeLists.txt
index 748b4ffeb902dcf7b53796b47710b626b37d0d59..b4433428d2589e9d15c64dc8e33d9af323e9fd45 100644
--- a/Examples/Iterators/CMakeLists.txt
+++ b/Examples/Iterators/CMakeLists.txt
@@ -65,127 +65,127 @@ SET(TOL 0.0)
 # ------- ImageRegionIteratorWithIndexTest----------
 
 ADD_TEST(itTeImageRegionIteratorWithIndexTest ${EXE_TESTS}
-	--compare-n-images ${TOL} 1
-	${BASELINE}/ImageRegionIteratorWithIndexOutput.png
-	${TEMP}/ImageRegionIteratorWithIndexOutput.png
-	ImageRegionIteratorWithIndexTest
-	${INPUTDATA}/ROI_QB_MUL_2.tif
-	${TEMP}/ImageRegionIteratorWithIndexOutput.png
+        --compare-n-images ${TOL} 1
+        ${BASELINE}/ImageRegionIteratorWithIndexOutput.png
+        ${TEMP}/ImageRegionIteratorWithIndexOutput.png
+        ImageRegionIteratorWithIndexTest
+        ${INPUTDATA}/ROI_QB_MUL_2.tif
+        ${TEMP}/ImageRegionIteratorWithIndexOutput.png
 )
 
 # ------- NeighborhoodIterators1Test----------
 
 ADD_TEST(itTeNeighborhoodIterators1Test ${EXE_TESTS}
-	--compare-n-images ${TOL} 1
-	${BASELINE}/NeighborhoodIterators1a.png
-	${TEMP}/NeighborhoodIterators1a.png
-	NeighborhoodIterators1Test
-	${INPUTDATA}/ROI_QB_PAN_1.tif
-	${TEMP}/NeighborhoodIterators1a.png
+        --compare-n-images ${TOL} 1
+        ${BASELINE}/NeighborhoodIterators1a.png
+        ${TEMP}/NeighborhoodIterators1a.png
+        NeighborhoodIterators1Test
+        ${INPUTDATA}/ROI_QB_PAN_1.tif
+        ${TEMP}/NeighborhoodIterators1a.png
 )
 
 # ------- NeighborhoodIterators4Test----------
 
 ADD_TEST(itTeNeighborhoodIterators4Test ${EXE_TESTS}
-	--compare-n-images ${TOL} 1
-	${BASELINE}/NeighborhoodIterators4a.png
-	${TEMP}/NeighborhoodIterators4a.png
-	NeighborhoodIterators4Test
-	${INPUTDATA}/QB_Suburb.png
-	${TEMP}/NeighborhoodIterators4a.png
+        --compare-n-images ${TOL} 1
+        ${BASELINE}/NeighborhoodIterators4a.png
+        ${TEMP}/NeighborhoodIterators4a.png
+        NeighborhoodIterators4Test
+        ${INPUTDATA}/QB_Suburb.png
+        ${TEMP}/NeighborhoodIterators4a.png
     0
 )
 
 # ------- NeighborhoodIterators4Test----------
 
 ADD_TEST(itTeNeighborhoodIterators4Test ${EXE_TESTS}
-	--compare-n-images ${TOL} 1
-	${BASELINE}/NeighborhoodIterators4b.png
-	${TEMP}/NeighborhoodIterators4b.png
-	NeighborhoodIterators4Test
-	${INPUTDATA}/QB_Suburb.png
-	${TEMP}/NeighborhoodIterators4b.png
+        --compare-n-images ${TOL} 1
+        ${BASELINE}/NeighborhoodIterators4b.png
+        ${TEMP}/NeighborhoodIterators4b.png
+        NeighborhoodIterators4Test
+        ${INPUTDATA}/QB_Suburb.png
+        ${TEMP}/NeighborhoodIterators4b.png
     1
 )
 
 # ------- NeighborhoodIterators4Test----------
 
 ADD_TEST(itTeNeighborhoodIterators4Test ${EXE_TESTS}
-	--compare-n-images ${TOL} 1
-	${BASELINE}/NeighborhoodIterators4c.png
-	${TEMP}/NeighborhoodIterators4c.png
-	NeighborhoodIterators4Test
-	${INPUTDATA}/QB_Suburb.png
-	${TEMP}/NeighborhoodIterators4c.png
+        --compare-n-images ${TOL} 1
+        ${BASELINE}/NeighborhoodIterators4c.png
+        ${TEMP}/NeighborhoodIterators4c.png
+        NeighborhoodIterators4Test
+        ${INPUTDATA}/QB_Suburb.png
+        ${TEMP}/NeighborhoodIterators4c.png
     2
 )
 
 # ------- NeighborhoodIterators4Test----------
 
 ADD_TEST(itTeNeighborhoodIterators4Test ${EXE_TESTS}
-	--compare-n-images ${TOL} 1
-	${BASELINE}/NeighborhoodIterators4d.png
-	${TEMP}/NeighborhoodIterators4d.png
-	NeighborhoodIterators4Test
-	${INPUTDATA}/QB_Suburb.png
-	${TEMP}/NeighborhoodIterators4d.png
+        --compare-n-images ${TOL} 1
+        ${BASELINE}/NeighborhoodIterators4d.png
+        ${TEMP}/NeighborhoodIterators4d.png
+        NeighborhoodIterators4Test
+        ${INPUTDATA}/QB_Suburb.png
+        ${TEMP}/NeighborhoodIterators4d.png
     5
 )
 
 # ------- NeighborhoodIterators6Test----------
 
 ADD_TEST(itTeNeighborhoodIterators6Test ${EXE_TESTS}
-	--compare-n-images ${TOL} 1
-	${BASELINE}/NeighborhoodIterators6a.png
-	${TEMP}/NeighborhoodIterators6a.png
-	NeighborhoodIterators6Test
-	${TEMP}/NeighborhoodIterators6a.png
+        --compare-n-images ${TOL} 1
+        ${BASELINE}/NeighborhoodIterators6a.png
+        ${TEMP}/NeighborhoodIterators6a.png
+        NeighborhoodIterators6Test
+        ${TEMP}/NeighborhoodIterators6a.png
     100 100
 )
 
 # ------- NeighborhoodIterators6Test----------
 
 ADD_TEST(itTeNeighborhoodIterators6Test ${EXE_TESTS}
-	--compare-n-images ${TOL} 1
-	${BASELINE}/NeighborhoodIterators6b.png
-	${TEMP}/NeighborhoodIterators6b.png
-	NeighborhoodIterators6Test
-	${TEMP}/NeighborhoodIterators6b.png
+        --compare-n-images ${TOL} 1
+        ${BASELINE}/NeighborhoodIterators6b.png
+        ${TEMP}/NeighborhoodIterators6b.png
+        NeighborhoodIterators6Test
+        ${TEMP}/NeighborhoodIterators6b.png
     50 150
 )
 
 # ------- NeighborhoodIterators6Test----------
 
 ADD_TEST(itTeNeighborhoodIterators6Test ${EXE_TESTS}
-	--compare-n-images ${TOL} 1
-	${BASELINE}/NeighborhoodIterators6c.png
-	${TEMP}/NeighborhoodIterators6c.png
-	NeighborhoodIterators6Test
-	${TEMP}/NeighborhoodIterators6c.png
+        --compare-n-images ${TOL} 1
+        ${BASELINE}/NeighborhoodIterators6c.png
+        ${TEMP}/NeighborhoodIterators6c.png
+        NeighborhoodIterators6Test
+        ${TEMP}/NeighborhoodIterators6c.png
     150 50
 )
 
 # ------- ImageRegionIteratorTest----------
 
 ADD_TEST(itTeImageRegionIteratorTest ${EXE_TESTS}
-	--compare-n-images ${TOL} 1
-	${BASELINE}/ImageRegionIteratorOutput.png
-	${TEMP}/ImageRegionIteratorOutput.png
-	ImageRegionIteratorTest
-	${INPUTDATA}/QB_Suburb.png
-	${TEMP}/ImageRegionIteratorOutput.png
+        --compare-n-images ${TOL} 1
+        ${BASELINE}/ImageRegionIteratorOutput.png
+        ${TEMP}/ImageRegionIteratorOutput.png
+        ImageRegionIteratorTest
+        ${INPUTDATA}/QB_Suburb.png
+        ${TEMP}/ImageRegionIteratorOutput.png
      10 10 110 140
 )
 
 # ------- ShapedNeighborhoodIterators2Test----------
 
 ADD_TEST(itTeShapedNeighborhoodIterators2Test ${EXE_TESTS}
-	--compare-n-images ${TOL} 1
-	${BASELINE}/ShapedNeighborhoodIterators1b.png
-	${TEMP}/ShapedNeighborhoodIterators1b.png
-	ShapedNeighborhoodIterators2Test
-	${INPUTDATA}/BinaryImage.png
-	${TEMP}/ShapedNeighborhoodIterators1b.png
+        --compare-n-images ${TOL} 1
+        ${BASELINE}/ShapedNeighborhoodIterators1b.png
+        ${TEMP}/ShapedNeighborhoodIterators1b.png
+        ShapedNeighborhoodIterators2Test
+        ${INPUTDATA}/BinaryImage.png
+        ${TEMP}/ShapedNeighborhoodIterators1b.png
   4
 )
 
diff --git a/Examples/Learning/CMakeLists.txt b/Examples/Learning/CMakeLists.txt
index e66d5501bcafa15a27d861362636e901b2845ad5..72f40ce7a732d77ed31fa64b2b2052d8ac8c0f7c 100644
--- a/Examples/Learning/CMakeLists.txt
+++ b/Examples/Learning/CMakeLists.txt
@@ -62,116 +62,116 @@ SET(EPS 0.001)
 # ------- SVMImageClassificationExampleTest----------
 
 ADD_TEST(leTeSVMImageClassificationExampleTest ${EXE_TESTS}
-	--compare-n-images ${TOL} 1
-	${BASELINE}/ROI_QB_MUL_1_SVN_CLASS.png
-	${TEMP}/ROI_QB_MUL_1_SVN_CLASS.png
-	SVMImageClassificationExampleTest
-	${INPUTDATA}/ROI_QB_MUL_1.png
-	${TEMP}/ROI_QB_MUL_1_SVN_CLASS.png
+        --compare-n-images ${TOL} 1
+        ${BASELINE}/ROI_QB_MUL_1_SVN_CLASS.png
+        ${TEMP}/ROI_QB_MUL_1_SVN_CLASS.png
+        SVMImageClassificationExampleTest
+        ${INPUTDATA}/ROI_QB_MUL_1.png
+        ${TEMP}/ROI_QB_MUL_1_SVN_CLASS.png
     ${OTB_DATA_ROOT}/Examples/svm_image_model.svm
 )
 
 # ------- SVMImageEstimatorClassificationMultiExampleTest----------
 
 ADD_TEST(leTeSVMImageEstimatorClassificationMultiExampleTest ${EXE_TESTS}
-	--compare-n-images ${TOL} 1
-	${BASELINE}/ROI_QB_MUL_1_SVN_CLASS_MULTI.png
-	${TEMP}/ROI_QB_MUL_1_SVN_CLASS_MULTI.png
-	SVMImageEstimatorClassificationMultiExampleTest
-	${INPUTDATA}/ROI_QB_MUL_1.png
-	${INPUTDATA}/ROI_mask_multi.png
-	${TEMP}/ROI_QB_MUL_1_SVN_CLASS_MULTI.png
-	${TEMP}/ROI_QB_MUL_1_SVN_CLASS_MULTI_Rescaled.png
+        --compare-n-images ${TOL} 1
+        ${BASELINE}/ROI_QB_MUL_1_SVN_CLASS_MULTI.png
+        ${TEMP}/ROI_QB_MUL_1_SVN_CLASS_MULTI.png
+        SVMImageEstimatorClassificationMultiExampleTest
+        ${INPUTDATA}/ROI_QB_MUL_1.png
+        ${INPUTDATA}/ROI_mask_multi.png
+        ${TEMP}/ROI_QB_MUL_1_SVN_CLASS_MULTI.png
+        ${TEMP}/ROI_QB_MUL_1_SVN_CLASS_MULTI_Rescaled.png
 )
 
 # ------- GenerateTrainingImageExampleTest----------
 
 ADD_TEST(leTeGenerateTrainingImageExampleTest ${EXE_TESTS}
-	--compare-n-images ${TOL} 1
-	${BASELINE}/ROI_QB_MUL_4_training.png
-	${TEMP}/ROI_QB_MUL_4_training.png
-	GenerateTrainingImageExampleTest
-	${INPUTDATA}/ROI_QB_MUL_4.tif
-	${INPUTDATA}/LearningROIs.txt
-	${TEMP}/ROI_QB_MUL_4_training.png
+        --compare-n-images ${TOL} 1
+        ${BASELINE}/ROI_QB_MUL_4_training.png
+        ${TEMP}/ROI_QB_MUL_4_training.png
+        GenerateTrainingImageExampleTest
+        ${INPUTDATA}/ROI_QB_MUL_4.tif
+        ${INPUTDATA}/LearningROIs.txt
+        ${TEMP}/ROI_QB_MUL_4_training.png
 )
 
 # ------- SVMImageModelEstimatorExampleTest----------
 
 ADD_TEST(leTeSVMImageModelEstimatorExampleTest ${EXE_TESTS}
-	--compare-ascii ${EPS}
-	${BASELINE}/svm_image_model.svn
-	${TEMP}/svm_image_model.svn
-	--ignore-lines-with 2 probA probB
-	SVMImageModelEstimatorExampleTest
-	${INPUTDATA}/ROI_QB_MUL_1.png
-	${INPUTDATA}/ROI_mask.png
-	${TEMP}/svm_image_model.svn
+        --compare-ascii ${EPS}
+        ${BASELINE}/svm_image_model.svn
+        ${TEMP}/svm_image_model.svn
+        --ignore-lines-with 2 probA probB
+        SVMImageModelEstimatorExampleTest
+        ${INPUTDATA}/ROI_QB_MUL_1.png
+        ${INPUTDATA}/ROI_mask.png
+        ${TEMP}/svm_image_model.svn
 )
 
 
 # ------- SOMExampleTest----------
 
 ADD_TEST(leTeSOMExampleTest ${EXE_TESTS}
-	--compare-n-images ${TOL} 2
-	${BASELINE}/ROI_QB_MUL_SOM.png
-	${TEMP}/ROI_QB_MUL_SOM.png
-	${BASELINE}/ROI_QB_MUL_SOMACT.png
-	${TEMP}/ROI_QB_MUL_SOMACT.png
-	SOMExampleTest
-	${INPUTDATA}/ROI_QB_MUL_1.png
-	${TEMP}/ROI_QB_MUL_SOM.png
-	${TEMP}/ROI_QB_MUL_SOMACT.png
-	4 4 4 4 15 1.0 0.1 128
+        --compare-n-images ${TOL} 2
+        ${BASELINE}/ROI_QB_MUL_SOM.png
+        ${TEMP}/ROI_QB_MUL_SOM.png
+        ${BASELINE}/ROI_QB_MUL_SOMACT.png
+        ${TEMP}/ROI_QB_MUL_SOMACT.png
+        SOMExampleTest
+        ${INPUTDATA}/ROI_QB_MUL_1.png
+        ${TEMP}/ROI_QB_MUL_SOM.png
+        ${TEMP}/ROI_QB_MUL_SOMACT.png
+        4 4 4 4 15 1.0 0.1 128
 )
 
 # ------- SOMClassifierExampleTest----------
 
 ADD_TEST(leTeSOMClassifierExampleTest ${EXE_TESTS}
-	--compare-image ${TOL}
-	${BASELINE}/ROI_QB_MUL_extractSOMCLASS.tif
-	${TEMP}/ROI_QB_MUL_extractSOMCLASS.tif
-	SOMClassifierExampleTest
-	${INPUTDATA}/ROI_QB_MUL_1_extract.tif
-	${INPUTDATA}/ROI_QB_MUL_extractSOM.tif
-	${TEMP}/ROI_QB_MUL_extractSOMCLASS.tif
+        --compare-image ${TOL}
+        ${BASELINE}/ROI_QB_MUL_extractSOMCLASS.tif
+        ${TEMP}/ROI_QB_MUL_extractSOMCLASS.tif
+        SOMClassifierExampleTest
+        ${INPUTDATA}/ROI_QB_MUL_1_extract.tif
+        ${INPUTDATA}/ROI_QB_MUL_extractSOM.tif
+        ${TEMP}/ROI_QB_MUL_extractSOMCLASS.tif
 )
 
 # ------- SEMModelEstimatorExampleTest----------
 
 ADD_TEST(leTeSEMModelEstimatorExampleTest ${EXE_TESTS}
-#	--compare-image ${TOL}
-#	${BASELINE}/ROI_QB_MUL_SEMMODEL_ESTIMATOR.png
-#	${TEMP}/ROI_QB_MUL_SEMMODEL_ESTIMATOR.png
-	SEMModelEstimatorExampleTest
-	${INPUTDATA}/ROI_QB_MUL_1.tif
-	${TEMP}/ROI_QB_MUL_SEMMODEL_ESTIMATOR.png
+#        --compare-image ${TOL}
+#        ${BASELINE}/ROI_QB_MUL_SEMMODEL_ESTIMATOR.png
+#        ${TEMP}/ROI_QB_MUL_SEMMODEL_ESTIMATOR.png
+        SEMModelEstimatorExampleTest
+        ${INPUTDATA}/ROI_QB_MUL_1.tif
+        ${TEMP}/ROI_QB_MUL_SEMMODEL_ESTIMATOR.png
         4 40 5
 )
 
 # ------- SVMGenericKernelImageModelEstimatorExampleTest----------
 
 ADD_TEST(leTeSVMGenericKernelImageModelEstimatorExampleTest ${EXE_TESTS}
-	--compare-ascii ${EPS}
-	${BASELINE}/svm_image_model_generic_kernel.svn
-	${TEMP}/svm_image_model_generic_kernel.svn
-	--ignore-lines-with 2 probA probB
-	SVMGenericKernelImageModelEstimatorExampleTest
-	${INPUTDATA}/ROI_QB_MUL_1.png
-	${INPUTDATA}/ROI_mask_multi.png
-	${TEMP}/svm_image_model_generic_kernel.svn
+        --compare-ascii ${EPS}
+        ${BASELINE}/svm_image_model_generic_kernel.svn
+        ${TEMP}/svm_image_model_generic_kernel.svn
+        --ignore-lines-with 2 probA probB
+        SVMGenericKernelImageModelEstimatorExampleTest
+        ${INPUTDATA}/ROI_QB_MUL_1.png
+        ${INPUTDATA}/ROI_mask_multi.png
+        ${TEMP}/svm_image_model_generic_kernel.svn
 )
 
 # ------- SVMGenericKernelImageClassificationExampleTest----------
 
 ADD_TEST(leTeSVMGenericKernelImageClassificationExampleTest ${EXE_TESTS}
-	--compare-image ${EPS}
-	${BASELINE}/ROI_QB_MUL_GENERIC_KERNEL_IMAGE_CLASSIF.png
-	${TEMP}/ROI_QB_MUL_GENERIC_KERNEL_IMAGE_CLASSIF.png
-	SVMGenericKernelImageClassificationExampleTest
-	${INPUTDATA}/ROI_QB_MUL_1.png
-	${TEMP}/ROI_QB_MUL_GENERIC_KERNEL_IMAGE_CLASSIF.png
-	${INPUTDATA}/svm_image_model_generic_kernel.svn
+        --compare-image ${EPS}
+        ${BASELINE}/ROI_QB_MUL_GENERIC_KERNEL_IMAGE_CLASSIF.png
+        ${TEMP}/ROI_QB_MUL_GENERIC_KERNEL_IMAGE_CLASSIF.png
+        SVMGenericKernelImageClassificationExampleTest
+        ${INPUTDATA}/ROI_QB_MUL_1.png
+        ${TEMP}/ROI_QB_MUL_GENERIC_KERNEL_IMAGE_CLASSIF.png
+        ${INPUTDATA}/svm_image_model_generic_kernel.svn
 )
 
 INCLUDE_DIRECTORIES(${OTB_SOURCE_DIR}/Testing/Code)
diff --git a/Examples/Markov/CMakeLists.txt b/Examples/Markov/CMakeLists.txt
index c44251ae45e83dfec31f0baa5ce2a385f293a1d4..382b68ff90ce5eac9e276ad94619966955ba2886 100644
--- a/Examples/Markov/CMakeLists.txt
+++ b/Examples/Markov/CMakeLists.txt
@@ -31,7 +31,7 @@ SET(TOL 0.0)
 SET(EPSILON 0.00000001)
 
 ADD_TEST(maTeMarkovClassification1ExampleTest ${EXE_TESTS}
-	--compare-image ${EPSILON}
+        --compare-image ${EPSILON}
                     ${BASELINE}/MarkovClassification1.png
                     ${TEMP}/MarkovClassification1.png
     MarkovClassification1ExampleTest
@@ -40,23 +40,23 @@ ADD_TEST(maTeMarkovClassification1ExampleTest ${EXE_TESTS}
         1.0
         20
         1.0
-	1 #true to use always the same rand() sample, false otherwise
+        1 #true to use always the same rand() sample, false otherwise
 )
 
 ADD_TEST(maTeMarkovClassification2ExampleTest ${EXE_TESTS}
-	--compare-image ${EPSILON}
+        --compare-image ${EPSILON}
                     ${BASELINE}/MarkovClassification2.png
                     ${TEMP}/MarkovClassification2.png
     MarkovClassification2ExampleTest
         ${INPUTDATA}/QB_Suburb.png
         ${TEMP}/MarkovClassification2.png
         1.0
-	5
-	1 # true to use always the same rand() sample, false otherwise
+        5
+        1 # true to use always the same rand() sample, false otherwise
 )
 
 ADD_TEST(maTeMarkovClassification3ExampleTest ${EXE_TESTS}
-	--compare-image ${EPSILON}
+        --compare-image ${EPSILON}
                     ${BASELINE}/MarkovClassification3.png
                     ${TEMP}/MarkovClassification3.png
     MarkovClassification3ExampleTest
@@ -67,9 +67,9 @@ ADD_TEST(maTeMarkovClassification3ExampleTest ${EXE_TESTS}
 )
 
 ADD_TEST(maTeMarkovRestaurationExampleTest ${EXE_TESTS}
-	--compare-image ${EPSILON}
-	                ${BASELINE}/MarkovRestauration.png
-	                ${TEMP}/MarkovRestauration.png
+        --compare-image ${EPSILON}
+                        ${BASELINE}/MarkovRestauration.png
+                        ${TEMP}/MarkovRestauration.png
     MarkovRestaurationExampleTest
         ${INPUTDATA}/QB_Suburb.png
         ${INPUTDATA}/QB_Suburb.png
@@ -77,12 +77,12 @@ ADD_TEST(maTeMarkovRestaurationExampleTest ${EXE_TESTS}
         10.0
         30.0
         1.
-	1 # true to use always the same rand() sample, false otherwise
+        1 # true to use always the same rand() sample, false otherwise
 )
 
 
 ADD_TEST(maTeMarkovRegularizationExampleTest ${EXE_TESTS}
-	--compare-image ${EPSILON}
+        --compare-image ${EPSILON}
                       ${BASELINE}/MarkovRegularization-scaled.png
                       ${TEMP}/MarkovRegularization-scaled.png
    MarkovRegularizationExampleTest
diff --git a/Examples/MultiScale/CMakeLists.txt b/Examples/MultiScale/CMakeLists.txt
index f9a11d7440ca1a8a26440229f70ae1922f99d764..a260623bd2bcff53fcff94fb0a6eb7e34a4c72f1 100644
--- a/Examples/MultiScale/CMakeLists.txt
+++ b/Examples/MultiScale/CMakeLists.txt
@@ -31,65 +31,65 @@ SET(TOL 0.0)
 # ------- MorphologicalPyramidAnalysisFilterExampleTest ----------
 
 ADD_TEST(msTeMorphologicalPyramidAnalysisFilterExampleTest ${EXE_TESTS}
-	--compare-n-images ${TOL} 20
-	${BASELINE}/suburb2_an_1.jpeg ${TEMP}/suburb2_an_1.jpeg
-	${BASELINE}/suburb2_an_2.jpeg ${TEMP}/suburb2_an_2.jpeg
-	${BASELINE}/suburb2_an_3.jpeg ${TEMP}/suburb2_an_3.jpeg
-	${BASELINE}/suburb2_an_4.jpeg ${TEMP}/suburb2_an_4.jpeg
-	${BASELINE}/suburb2_sf_1.jpeg ${TEMP}/suburb2_sf_1.jpeg
-	${BASELINE}/suburb2_sf_2.jpeg ${TEMP}/suburb2_sf_2.jpeg
-	${BASELINE}/suburb2_sf_3.jpeg ${TEMP}/suburb2_sf_3.jpeg
-	${BASELINE}/suburb2_sf_4.jpeg ${TEMP}/suburb2_sf_4.jpeg
-	${BASELINE}/suburb2_if_1.jpeg ${TEMP}/suburb2_if_1.jpeg
-	${BASELINE}/suburb2_if_2.jpeg ${TEMP}/suburb2_if_2.jpeg
-	${BASELINE}/suburb2_if_3.jpeg ${TEMP}/suburb2_if_3.jpeg
-	${BASELINE}/suburb2_if_4.jpeg ${TEMP}/suburb2_if_4.jpeg
-	${BASELINE}/suburb2_id_1.jpeg ${TEMP}/suburb2_id_1.jpeg
-	${BASELINE}/suburb2_id_2.jpeg ${TEMP}/suburb2_id_2.jpeg
-	${BASELINE}/suburb2_id_3.jpeg ${TEMP}/suburb2_id_3.jpeg
-	${BASELINE}/suburb2_id_4.jpeg ${TEMP}/suburb2_id_4.jpeg
-	${BASELINE}/suburb2_sd_1.jpeg ${TEMP}/suburb2_sd_1.jpeg
-	${BASELINE}/suburb2_sd_2.jpeg ${TEMP}/suburb2_sd_2.jpeg
-	${BASELINE}/suburb2_sd_3.jpeg ${TEMP}/suburb2_sd_3.jpeg
-	${BASELINE}/suburb2_sd_4.jpeg ${TEMP}/suburb2_sd_4.jpeg
-	MorphologicalPyramidAnalysisFilterExampleTest
-	${INPUTDATA}/suburb2.jpeg
-	${TEMP}/suburb2_an_1.jpeg 	${TEMP}/suburb2_an_2.jpeg
-	${TEMP}/suburb2_an_3.jpeg 	${TEMP}/suburb2_an_4.jpeg
-	${TEMP}/suburb2_sf_1.jpeg 	${TEMP}/suburb2_sf_2.jpeg
-	${TEMP}/suburb2_sf_3.jpeg 	${TEMP}/suburb2_sf_4.jpeg
-	${TEMP}/suburb2_if_1.jpeg 	${TEMP}/suburb2_if_2.jpeg
-	${TEMP}/suburb2_if_3.jpeg 	${TEMP}/suburb2_if_4.jpeg
-	${TEMP}/suburb2_id_1.jpeg 	${TEMP}/suburb2_id_2.jpeg
-	${TEMP}/suburb2_id_3.jpeg 	${TEMP}/suburb2_id_4.jpeg
-	${TEMP}/suburb2_sd_1.jpeg 	${TEMP}/suburb2_sd_2.jpeg
-	${TEMP}/suburb2_sd_3.jpeg 	${TEMP}/suburb2_sd_4.jpeg
-	4 2
+        --compare-n-images ${TOL} 20
+        ${BASELINE}/suburb2_an_1.jpeg ${TEMP}/suburb2_an_1.jpeg
+        ${BASELINE}/suburb2_an_2.jpeg ${TEMP}/suburb2_an_2.jpeg
+        ${BASELINE}/suburb2_an_3.jpeg ${TEMP}/suburb2_an_3.jpeg
+        ${BASELINE}/suburb2_an_4.jpeg ${TEMP}/suburb2_an_4.jpeg
+        ${BASELINE}/suburb2_sf_1.jpeg ${TEMP}/suburb2_sf_1.jpeg
+        ${BASELINE}/suburb2_sf_2.jpeg ${TEMP}/suburb2_sf_2.jpeg
+        ${BASELINE}/suburb2_sf_3.jpeg ${TEMP}/suburb2_sf_3.jpeg
+        ${BASELINE}/suburb2_sf_4.jpeg ${TEMP}/suburb2_sf_4.jpeg
+        ${BASELINE}/suburb2_if_1.jpeg ${TEMP}/suburb2_if_1.jpeg
+        ${BASELINE}/suburb2_if_2.jpeg ${TEMP}/suburb2_if_2.jpeg
+        ${BASELINE}/suburb2_if_3.jpeg ${TEMP}/suburb2_if_3.jpeg
+        ${BASELINE}/suburb2_if_4.jpeg ${TEMP}/suburb2_if_4.jpeg
+        ${BASELINE}/suburb2_id_1.jpeg ${TEMP}/suburb2_id_1.jpeg
+        ${BASELINE}/suburb2_id_2.jpeg ${TEMP}/suburb2_id_2.jpeg
+        ${BASELINE}/suburb2_id_3.jpeg ${TEMP}/suburb2_id_3.jpeg
+        ${BASELINE}/suburb2_id_4.jpeg ${TEMP}/suburb2_id_4.jpeg
+        ${BASELINE}/suburb2_sd_1.jpeg ${TEMP}/suburb2_sd_1.jpeg
+        ${BASELINE}/suburb2_sd_2.jpeg ${TEMP}/suburb2_sd_2.jpeg
+        ${BASELINE}/suburb2_sd_3.jpeg ${TEMP}/suburb2_sd_3.jpeg
+        ${BASELINE}/suburb2_sd_4.jpeg ${TEMP}/suburb2_sd_4.jpeg
+        MorphologicalPyramidAnalysisFilterExampleTest
+        ${INPUTDATA}/suburb2.jpeg
+        ${TEMP}/suburb2_an_1.jpeg         ${TEMP}/suburb2_an_2.jpeg
+        ${TEMP}/suburb2_an_3.jpeg         ${TEMP}/suburb2_an_4.jpeg
+        ${TEMP}/suburb2_sf_1.jpeg         ${TEMP}/suburb2_sf_2.jpeg
+        ${TEMP}/suburb2_sf_3.jpeg         ${TEMP}/suburb2_sf_4.jpeg
+        ${TEMP}/suburb2_if_1.jpeg         ${TEMP}/suburb2_if_2.jpeg
+        ${TEMP}/suburb2_if_3.jpeg         ${TEMP}/suburb2_if_4.jpeg
+        ${TEMP}/suburb2_id_1.jpeg         ${TEMP}/suburb2_id_2.jpeg
+        ${TEMP}/suburb2_id_3.jpeg         ${TEMP}/suburb2_id_4.jpeg
+        ${TEMP}/suburb2_sd_1.jpeg         ${TEMP}/suburb2_sd_2.jpeg
+        ${TEMP}/suburb2_sd_3.jpeg         ${TEMP}/suburb2_sd_4.jpeg
+        4 2
 )
 
 # ------- MorphologicalPyramidSynthesisFilterExampleTest ----------
 
 ADD_TEST(msTeMorphologicalPyramidSynthesisFilterExampleTest ${EXE_TESTS}
-	--compare-image ${TOL}
-	${BASELINE}/suburb2_synthesis.jpeg
-	${TEMP}/suburb2_synthesis.jpeg
-	MorphologicalPyramidSynthesisFilterExampleTest
-	${INPUTDATA}/suburb2.jpeg
-	${TEMP}/suburb2_synthesis.jpeg
-	4 2
+        --compare-image ${TOL}
+        ${BASELINE}/suburb2_synthesis.jpeg
+        ${TEMP}/suburb2_synthesis.jpeg
+        MorphologicalPyramidSynthesisFilterExampleTest
+        ${INPUTDATA}/suburb2.jpeg
+        ${TEMP}/suburb2_synthesis.jpeg
+        4 2
 )
 
 # ------- MorphologicalPyramidSegmenterExampleTest ----------
 
 ADD_TEST(msTeMorphologicalPyramidSegmenterExampleTest ${EXE_TESTS}
-	--compare-image ${TOL}
-	${BASELINE}/outputPyrSegmented.tif
-	${TEMP}/outputPyrSegmented.tif
-	MorphologicalPyramidSegmenterExampleTest
-	${INPUTDATA}/msPyrMRToMS_IKO_Halles_4_2_sf_full.tif
-	${INPUTDATA}/ROI_IKO_PAN_LesHalles.tif
-	${TEMP}/outputPyrSegmented.tif
-	0 0.9 0.9 10
+        --compare-image ${TOL}
+        ${BASELINE}/outputPyrSegmented.tif
+        ${TEMP}/outputPyrSegmented.tif
+        MorphologicalPyramidSegmenterExampleTest
+        ${INPUTDATA}/msPyrMRToMS_IKO_Halles_4_2_sf_full.tif
+        ${INPUTDATA}/ROI_IKO_PAN_LesHalles.tif
+        ${TEMP}/outputPyrSegmented.tif
+        0 0.9 0.9 10
 )
 
 INCLUDE_DIRECTORIES(${OTB_SOURCE_DIR}/Testing/Code)
diff --git a/Examples/OBIA/CMakeLists.txt b/Examples/OBIA/CMakeLists.txt
index ab6a226f6cc15a63ab0a41fc57cc481fce2be0e8..1e3b2ee4d4c42290e8d7bef369aacdd6b344505c 100644
--- a/Examples/OBIA/CMakeLists.txt
+++ b/Examples/OBIA/CMakeLists.txt
@@ -39,37 +39,37 @@ ADD_TEST( trTeOBIAImageToLabelToImageTest ${EXE_TESTS}
         OBIAImageToLabelToImageTest
         ${INPUTDATA}/MSLabeledOutput.tif
         ${TEMP}/OBIAI2L2IOutput.tif
-	${TEMP}/OBIAI2L2IInPretty.png
-	${TEMP}/OBIAI2L2IOutPretty.png
-	1 1108 0
+        ${TEMP}/OBIAI2L2IInPretty.png
+        ${TEMP}/OBIAI2L2IOutPretty.png
+        1 1108 0
         )
 
 ADD_TEST(trTeOBIAShapeAttributeComputationTest ${EXE_TESTS}
-	--compare-ascii ${EPS}	${BASELINE}/OBIAShapeAttribute.txt
-	                        ${TEMP}/OBIAShapeAttribute.txt
-	OBIAShapeAttributeComputationTest
-	${INPUTDATA}/MSLabeledOutput.tif
-	${TEMP}/OBIAShapeAttribute.txt
+        --compare-ascii ${EPS}        ${BASELINE}/OBIAShapeAttribute.txt
+                                ${TEMP}/OBIAShapeAttribute.txt
+        OBIAShapeAttributeComputationTest
+        ${INPUTDATA}/MSLabeledOutput.tif
+        ${TEMP}/OBIAShapeAttribute.txt
 )
 
 ADD_TEST(trTeOBIARadiometricAttributesLabelMapFilterTest ${EXE_TESTS}
-	--compare-image ${TOL}	${BASELINE}/OBIARadiometricAttributes.tif
-	                        ${TEMP}/OBIARadiometricAttributes.tif
-	RadiometricAttributesLabelMapFilterExample
-	${INPUTDATA}/qb_RoadExtract.tif 
-	${TEMP}/OBIARadiometricAttributes.tif
-	${TEMP}/qb_RoadExtract_Radiometry_pretty.png
-	STATS::Band1::Mean
-	0
-	0.5
-	16
-	16
-	50
-	1.0
+        --compare-image ${TOL}        ${BASELINE}/OBIARadiometricAttributes.tif
+                                ${TEMP}/OBIARadiometricAttributes.tif
+        RadiometricAttributesLabelMapFilterExample
+        ${INPUTDATA}/qb_RoadExtract.tif
+        ${TEMP}/OBIARadiometricAttributes.tif
+        ${TEMP}/qb_RoadExtract_Radiometry_pretty.png
+        STATS::Band1::Mean
+        0
+        0.5
+        16
+        16
+        50
+        1.0
 )
     
 ADD_TEST(trTeLabelMapToVectorData ${EXE_TESTS}
-	LabelMapToVectorDataTest
+        LabelMapToVectorDataTest
         ${INPUTDATA}/rcc8_mire1.png
         ${TEMP}/rcc8_mire2_vectorizer.shp
 )
diff --git a/Examples/Patented/CMakeLists.txt b/Examples/Patented/CMakeLists.txt
index 779268f7cc13855c9952bada347b1a4dc4c476aa..23828b57fec50ed6e4b7121e5e0dcf9f299300f1 100644
--- a/Examples/Patented/CMakeLists.txt
+++ b/Examples/Patented/CMakeLists.txt
@@ -45,19 +45,19 @@ SET(TOL 0.0)
 # ------- HybridSegmentationFuzzyVoronoiTest----------
 
 ADD_TEST(paTeHybridSegmentationFuzzyVoronoiTest ${EXE_TESTS}
-	--compare-n-images ${TOL} 1
-	${BASELINE}/HybridSegmentationFuzzyVoronoiOutput.png
-	${TEMP}/HybridSegmentationFuzzyVoronoiOutput.png
-	HybridSegmentationFuzzyVoronoiTest
-	${INPUTDATA}/QB_Suburb.png
-	${TEMP}/HybridSegmentationFuzzyVoronoiOutput.png
+        --compare-n-images ${TOL} 1
+        ${BASELINE}/HybridSegmentationFuzzyVoronoiOutput.png
+        ${TEMP}/HybridSegmentationFuzzyVoronoiOutput.png
+        HybridSegmentationFuzzyVoronoiTest
+        ${INPUTDATA}/QB_Suburb.png
+        ${TEMP}/HybridSegmentationFuzzyVoronoiOutput.png
     111 38 75 20 0.5 3.0
 )
 
 # -----EstimateAffineTransformationExampleTest---------
 
 ADD_TEST(dmTeEstimateAffineTransformationExampleTest ${EXE_TESTS}
-   --compare-image ${TOL} 
+   --compare-image ${TOL}
          ${BASELINE}/EstimateAffineTransformationOutput.png
          ${TEMP}/AffineTransformationOutput.png
          EstimateAffineTransformationExampleTest
@@ -65,7 +65,7 @@ ADD_TEST(dmTeEstimateAffineTransformationExampleTest ${EXE_TESTS}
          ${INPUTDATA}/QB_SuburbR10X13Y17.png
          ${TEMP}/AffineTransformationOutput.png
          ${TEMP}/AffineTransformationTxtOutput.txt
-   2 3 0 0 0.5 1   
+   2 3 0 0 0.5 1
 )
 
 # -----SIFTDisparityMapEstimationTest---------
diff --git a/Examples/Projections/CMakeLists.txt b/Examples/Projections/CMakeLists.txt
index d777533b11208b2625f44ac3d67164e1990a273f..196e8a1beb3d0d9310c29eb8ae5aaa569a843fbd 100644
--- a/Examples/Projections/CMakeLists.txt
+++ b/Examples/Projections/CMakeLists.txt
@@ -57,88 +57,88 @@ SET(EPSILON_4 0.0001)
 
 IF(OTB_DATA_USE_LARGEINPUT)
 ADD_TEST(prTeOrthoRectificationExampleTest ${EXE_TESTS}
-	--compare-image ${TOL}
-	${BASELINE}/panOrthoToul.tif
-	${TEMP}/panOrthoToul.tif
+        --compare-image ${TOL}
+        ${BASELINE}/panOrthoToul.tif
+        ${TEMP}/panOrthoToul.tif
     OrthoRectificationExampleTest
-	 ${INPUTLARGEDATA}/QUICKBIRD/TOULOUSE/000000128955_01_P001_PAN/02APR01105228-P1BS-000000128955_01_P001.TIF
-	${TEMP}/panOrthoToul.tif
-	31
-	N
-	375000
-	4828100
-	500
-	500
-	0.6
-	-0.6
+         ${INPUTLARGEDATA}/QUICKBIRD/TOULOUSE/000000128955_01_P001_PAN/02APR01105228-P1BS-000000128955_01_P001.TIF
+        ${TEMP}/panOrthoToul.tif
+        31
+        N
+        375000
+        4828100
+        500
+        500
+        0.6
+        -0.6
 
 )
 
 ADD_TEST(prTeOrthoRectificationExampleXSTest ${EXE_TESTS}
-	--compare-image ${TOL}
-	${BASELINE}/xsOrthoToul.tif
-	${TEMP}/xsOrthoToul.tif
+        --compare-image ${TOL}
+        ${BASELINE}/xsOrthoToul.tif
+        ${TEMP}/xsOrthoToul.tif
     OrthoRectificationExampleTest
-	 ${INPUTLARGEDATA}/QUICKBIRD/TOULOUSE/000000128955_01_P001_MUL/02APR01105228-M1BS-000000128955_01_P001.TIF
-	${TEMP}/xsOrthoToul.tif
-	31
-	N
-	375000
-	4828100
-	500
-	500
-	0.6
-	-0.6
+         ${INPUTLARGEDATA}/QUICKBIRD/TOULOUSE/000000128955_01_P001_MUL/02APR01105228-M1BS-000000128955_01_P001.TIF
+        ${TEMP}/xsOrthoToul.tif
+        31
+        N
+        375000
+        4828100
+        500
+        500
+        0.6
+        -0.6
 
 )
 ENDIF(OTB_DATA_USE_LARGEINPUT)
 
 ADD_TEST(prTeMapProjectionExampleTest ${EXE_TESTS}
-	--compare-ascii ${TOL}
-	${BASELINE}/mapProjectionExample.txt
-	${TEMP}/mapProjectionExample.txt
+        --compare-ascii ${TOL}
+        ${BASELINE}/mapProjectionExample.txt
+        ${TEMP}/mapProjectionExample.txt
     MapProjectionExampleTest
-    	${TEMP}/mapProjectionExample.txt
+            ${TEMP}/mapProjectionExample.txt
 )
 
 IF(OTB_DATA_USE_LARGEINPUT)
 ADD_TEST(prTeVectorDataProjectionExampleTest ${EXE_TESTS}
-	--compare-binary
-	${BASELINE}/vectorDataProjectionExample.shp
-	${TEMP}/vectorDataProjectionExample.shp
+        --compare-binary
+        ${BASELINE}/vectorDataProjectionExample.shp
+        ${TEMP}/vectorDataProjectionExample.shp
     VectorDataProjectionExampleTest
         ${INPUTDATA}/Capitole-Shadows.kml
         ${INPUTLARGEDATA}/QUICKBIRD/TOULOUSE/000000128955_01_P001_PAN/02APR01105228-P1BS-000000128955_01_P001.TIF
-    	${TEMP}/vectorDataProjectionExample.shp
+            ${TEMP}/vectorDataProjectionExample.shp
 )
 ENDIF(OTB_DATA_USE_LARGEINPUT)
 
 IF(OTB_DATA_USE_LARGEINPUT)
 #TODO change the example by using a SPOT4 roamnia
 ADD_TEST(prTeEstimateRPCSensorModelExampleTest ${EXE_TESTS}
-         --compare-ascii ${EPSILON_4} 
+         --compare-ascii ${EPSILON_4}
          ${BASELINE}/otbGCPsToRPCSensorModelImageFilterWithoutDEMOutput.txt
          ${TEMP}/otbGCPsToRPCSensorModelImageFilterWithoutDEMOutput.txt
          --ignore-lines-with 5 PipelineMTime ImportImageContaine Source: Image Time:
     EstimateRPCSensorModelExample
-	 ${INPUTLARGEDATA}/SPOT4/RIO_DE_JANEIRO/IMAG_01.DAT
-	 ${TEMP}/otbGCPsToRPCSensorModelImageFilterWithoutDEMOutput.txt
-	 1199 1259 -22.76847 -43.168043 0.
-	 1497 727  -22.688931 -43.066686 0.
-	 699 1146 -22.7254 -43.288651 0.
-	 1379 2457 -22.986073 -43.193502 0.
-	 2592 1846 -22.932684 -42.854215 0.
-	 1430 1797 -22.872988 -43.136813 0.
-	 587 2654 -22.983847  -43.393297 0.
-	 2398 2422 -23.025664 -42.928778 0.
-	 1436 2946 -23.074483 -43.192431 0.
-	 963 2915  -23.047382 -43.310011 0.
-	 1081 1024 -22.721919 -43.18523  0.
-	 1395 1213 -22.769191 -43.116752 0.
-	 1781 2202 -22.959556 -43.069911 0.
-	 2803 1942 -22.958868 -42.808235 0.
-	 980 2734 -22.99534 -43.309672 0.
-	 713 2754 -23.007862 -43.365307 0.
+         ${INPUTLARGEDATA}/SPOT4/RIO_DE_JANEIRO/IMAG_01.DAT
+         ${TEMP}/otbGCPsToRPCSensorModelImageFilterWithoutDEMOutput.txt
+         1199 1259 -22.76847 -43.168043 0.
+         1497 727  -22.688931 -43.066686 0.
+         699 1146 -22.7254 -43.288651 0.
+         1379 2457 -22.986073 -43.193502 0.
+         2592 1846 -22.932684 -42.854215 0.
+         1430 1797 -22.872988 -43.136813 0.
+         587 2654 -22.983847  -43.393297 0.
+         2398 2422 -23.025664 -42.928778 0.
+         1436 2946 -23.074483 -43.192431 0.
+         963 2915  -23.047382 -43.310011 0.
+         1081 1024 -22.721919 -43.18523  0.
+         1395 1213 -22.769191 -43.116752 0.
+         1781 2202 -22.959556 -43.069911 0.
+         2803 1942 -22.958868 -42.808235 0.
+         980 2734 -22.99534 -43.309672 0.
+         713 2754 -23.007862 -43.365307 0.
 )
 
 ENDIF(OTB_DATA_USE_LARGEINPUT)
diff --git a/Examples/Radiometry/CMakeLists.txt b/Examples/Radiometry/CMakeLists.txt
index b2fbe85617ab72b95e36ef3c87a71f423cf4c3d3..c5bf6055b6f0b9e6b6f37ff08ee0163aea997ba6 100644
--- a/Examples/Radiometry/CMakeLists.txt
+++ b/Examples/Radiometry/CMakeLists.txt
@@ -32,18 +32,18 @@ SET(EPSILON 0.000000000001)
 
 ADD_TEST(raTeARVIMultiChannelRAndBAndNIRVegetationIndexImageFilterTest ${EXE_TESTS}
   --compare-image ${EPSILON}
-  		  ${BASELINE}/ARVIMultiChannelRAndBAndNIRVegetationIndex.tif
+                    ${BASELINE}/ARVIMultiChannelRAndBAndNIRVegetationIndex.tif
                   ${TEMP}/ARVIMultiChannelRAndBAndNIRVegetationIndex.tif
        ARVIMultiChannelRAndBAndNIRVegetationIndexImageFilterTest
-        	  ${INPUTDATA}/poupees_sub.png
-	          ${TEMP}/ARVIMultiChannelRAndBAndNIRVegetationIndex.tif
+                  ${INPUTDATA}/poupees_sub.png
+                  ${TEMP}/ARVIMultiChannelRAndBAndNIRVegetationIndex.tif
               ${TEMP}/ARVIMultiChannelRAndBAndNIRVegetationIndex3.tif
-	          ${TEMP}/ARVIMultiChannelRAndBAndNIRVegetationIndex2.tif
- 	          1
- 	          2
- 	          3
-         	  0.6 # Gamma parameter
- 	)
+                  ${TEMP}/ARVIMultiChannelRAndBAndNIRVegetationIndex2.tif
+                   1
+                   2
+                   3
+                   0.6 # Gamma parameter
+         )
 
 
 
@@ -72,26 +72,26 @@ ADD_TEST(raTeAVIMultiChannelRAndGAndNIRVegetationIndexImageFilterTest ${EXE_TEST
 
 ADD_TEST(raTeNDVIRAndNIRVegetationIndexImageFilterTest ${EXE_TESTS}
   --compare-image ${TOL}
-  	          ${BASELINE}/NDVIRAndNIRVegetationIndex.tif
+                    ${BASELINE}/NDVIRAndNIRVegetationIndex.tif
                   ${TEMP}/NDVIRAndNIRVegetationIndex.tif
        NDVIRAndNIRVegetationIndexImageFilterTest
- 	${INPUTDATA}/poupees_sub_c1.png
-	${INPUTDATA}/poupees_sub_c2.png
- 	${TEMP}/NDVIRAndNIRVegetationIndex.tif
- 	${TEMP}/NDVIRAndNIRVegetationIndex2.tif
- 	${TEMP}/NDVIRAndNIRVegetationIndex3.tif
-	${TEMP}/NDVIRAndNIRVegetationIndex4.tif
- 	)
+         ${INPUTDATA}/poupees_sub_c1.png
+        ${INPUTDATA}/poupees_sub_c2.png
+         ${TEMP}/NDVIRAndNIRVegetationIndex.tif
+         ${TEMP}/NDVIRAndNIRVegetationIndex2.tif
+         ${TEMP}/NDVIRAndNIRVegetationIndex3.tif
+        ${TEMP}/NDVIRAndNIRVegetationIndex4.tif
+         )
 
 
 
 ADD_TEST(raTeAtmosphericCorrectionSequencementTest ${EXE_TESTS}
         --compare-image ${EPSILON}
-		${BASELINE}/Example_RomaniaAtmosphericCorrectionSequencement.tif
+                ${BASELINE}/Example_RomaniaAtmosphericCorrectionSequencement.tif
                 ${TEMP}/Example_RomaniaAtmosphericCorrectionSequencement.tif
         AtmosphericCorrectionSequencementTest
         ${INPUTDATA}/Romania_Extract.tif
-	${TEMP}/Example_RomaniaAtmosphericCorrectionSequencement.tif
+        ${TEMP}/Example_RomaniaAtmosphericCorrectionSequencement.tif
         ${INPUTDATA}/atmosphericCorrectionSequencement_alpha_beta.txt
         ${INPUTDATA}/atmosphericCorrectionSequencement_solar_illumination.txt
         ${INPUTDATA}/atmosphericCorrectionSequencement_wavelength_spectral_bands_spot4_1.txt
@@ -99,11 +99,11 @@ ADD_TEST(raTeAtmosphericCorrectionSequencementTest ${EXE_TESTS}
 # ImageToLuminance parameters
 # LuminanceToReflectance parameters
         27.3    #solar azimuthal elevation
-	4       #day
-	12      #mounth
+        4       #day
+        12      #mounth
 # AtmosphericCorrectionParametersTo6SAtmosphericRadiativeTerms parameters
         152.7
-	2.5
+        2.5
         -77.0
         1013.
         2.48134
@@ -112,8 +112,8 @@ ADD_TEST(raTeAtmosphericCorrectionSequencementTest ${EXE_TESTS}
         0.199854
 # ReflectanceToSurfaceReflectance parameters
 # SurfaceAdjacencyEffect6SCorrectionSchemeFilter parameters
-	2       # Radius;
-	0.020   # pixel spacing in kilometers
+        2       # Radius;
+        0.020   # pixel spacing in kilometers
         )
 
 
diff --git a/Examples/Registration/CMakeLists.txt b/Examples/Registration/CMakeLists.txt
index 5eb161eb07bbd5b37541219866847d6edb944e9d..f73ea83ede6739b9b1e522731df66c12b31120e3 100644
--- a/Examples/Registration/CMakeLists.txt
+++ b/Examples/Registration/CMakeLists.txt
@@ -30,11 +30,11 @@ ADD_TEST(reTeImageRegistration1ExampleTest ${EXE_TESTS}
         --compare-image ${TOL}
         ${BASELINE}/ImageRegistration1Output.png
         ${TEMP}/ImageRegistration1Output.png
-	ImageRegistration1ExampleTest
-	${INPUTDATA}/QB_Suburb.png
+        ImageRegistration1ExampleTest
+        ${INPUTDATA}/QB_Suburb.png
         ${INPUTDATA}/QB_Suburb13x17y.png
-	${TEMP}/ImageRegistration1Output.png
-	${TEMP}/ImageRegistration1DifferenceAfter.png
+        ${TEMP}/ImageRegistration1Output.png
+        ${TEMP}/ImageRegistration1DifferenceAfter.png
         ${TEMP}/ImageRegistration1DifferenceBefore.png
 )
 
@@ -42,11 +42,11 @@ ADD_TEST(reTeImageRegistration2ExampleTest ${EXE_TESTS}
         --compare-image ${TOL}
         ${BASELINE}/ImageRegistration2Output.png
         ${TEMP}/ImageRegistration2Output.png
-	ImageRegistration2ExampleTest
-	${INPUTDATA}/RamsesROISmall.png
+        ImageRegistration2ExampleTest
+        ${INPUTDATA}/RamsesROISmall.png
         ${INPUTDATA}/ADS40RoiSmall.png
-	${TEMP}/ImageRegistration2Output.png
-	${TEMP}/ImageRegistration2CheckerboardBefore.png
+        ${TEMP}/ImageRegistration2Output.png
+        ${TEMP}/ImageRegistration2CheckerboardBefore.png
         ${TEMP}/ImageRegistration2CheckerboardAfter.png
 )
 
@@ -54,22 +54,22 @@ ADD_TEST(reTeImageRegistration5Cas1ExampleTest ${EXE_TESTS}
         --compare-image ${TOL}
         ${BASELINE}/ImageRegistration5Output1.png
         ${TEMP}/ImageRegistration5Output1.png
-	ImageRegistration5ExampleTest
-	${INPUTDATA}/QB_Suburb.png
+        ImageRegistration5ExampleTest
+        ${INPUTDATA}/QB_Suburb.png
         ${INPUTDATA}/QB_SuburbRotated10.png
-	${TEMP}/ImageRegistration5Output1.png
-	${TEMP}/ImageRegistration5DifferenceBefore1.png
+        ${TEMP}/ImageRegistration5Output1.png
+        ${TEMP}/ImageRegistration5DifferenceBefore1.png
         ${TEMP}/ImageRegistration5DifferenceAfter1.png
 )
 ADD_TEST(reTeImageRegistration5Cas2ExampleTest ${EXE_TESTS}
         --compare-image ${TOL}
         ${BASELINE}/ImageRegistration5Output2.png
         ${TEMP}/ImageRegistration5Output2.png
-	ImageRegistration5ExampleTest
-	${INPUTDATA}/QB_Suburb.png
+        ImageRegistration5ExampleTest
+        ${INPUTDATA}/QB_Suburb.png
         ${INPUTDATA}/QB_SuburbR10X13Y17.png
-	${TEMP}/ImageRegistration5Output2.png
-	${TEMP}/ImageRegistration5DifferenceBefore2.png
+        ${TEMP}/ImageRegistration5Output2.png
+        ${TEMP}/ImageRegistration5DifferenceBefore2.png
         ${TEMP}/ImageRegistration5DifferenceAfter2.png
 )
 
diff --git a/Examples/SARPolarimetry/CMakeLists.txt b/Examples/SARPolarimetry/CMakeLists.txt
index e2abceac3166faee63e162b2c8d8cd1fc5a5372f..f828b2594c0167229b229369b7a8245c13a8fefa 100644
--- a/Examples/SARPolarimetry/CMakeLists.txt
+++ b/Examples/SARPolarimetry/CMakeLists.txt
@@ -24,7 +24,7 @@ SET(EPSILON 0.000000000001)
 # Tutorial example . pi / 4
 ADD_TEST(rdTePiOver4ExamplePolarimetricSynthesisFilterTest ${SARPOLARIMETRY_TESTS1}
   --compare-image ${EPSILON}
-		  ${BASELINE}/refPiOver4PolarimetricSynthesis.tif
+                  ${BASELINE}/refPiOver4PolarimetricSynthesis.tif
                   ${TEMP}/resPiOver4PolarimetricSynthesis.tif
        PiOver4ExamplePolarimetricSynthesisFilter
         ${INPUTDATA}/RSAT_imagery_HH.tif
@@ -32,7 +32,7 @@ ADD_TEST(rdTePiOver4ExamplePolarimetricSynthesisFilterTest ${SARPOLARIMETRY_TEST
         ${INPUTDATA}/RSAT_imagery_VH.tif
         ${INPUTDATA}/RSAT_imagery_VV.tif
         ${TEMP}/resPiOver4PolarimetricSynthesis.tif
-	)
+        )
 
 INCLUDE_DIRECTORIES(${OTB_SOURCE_DIR}/Testing/Code)
 ADD_EXECUTABLE(otbSARPolarimetryExamplesTests otbSARPolarimetryExamplesTests.cxx )
diff --git a/Examples/Segmentation/CMakeLists.txt b/Examples/Segmentation/CMakeLists.txt
index b977ef1b17093a3cbeb8b7bdea4fbf8ec6f75e31..1101855cd519f2c6b1f42e540d06c3f17dd8966d 100644
--- a/Examples/Segmentation/CMakeLists.txt
+++ b/Examples/Segmentation/CMakeLists.txt
@@ -142,108 +142,108 @@ SET(TOL 0.0)
 # ------- IsolatedConnectedImageFilterTest----------
 
 ADD_TEST(seTeIsolatedConnectedImageFilterTest ${EXE_TESTS}
-	--compare-n-images ${TOL} 1
-	${BASELINE}/ConnectedThresholdOutput1.png
-	${TEMP}/ConnectedThresholdOutput1.png
-	IsolatedConnectedImageFilterTest
-	${INPUTDATA}/QB_Suburb.png
-	${TEMP}/ConnectedThresholdOutput1.png
+        --compare-n-images ${TOL} 1
+        ${BASELINE}/ConnectedThresholdOutput1.png
+        ${TEMP}/ConnectedThresholdOutput1.png
+        IsolatedConnectedImageFilterTest
+        ${INPUTDATA}/QB_Suburb.png
+        ${TEMP}/ConnectedThresholdOutput1.png
   110 38 50 100
 )
 
 # ------- IsolatedConnectedImageFilterTest----------
 
 ADD_TEST(seTeIsolatedConnectedImageFilterTest ${EXE_TESTS}
-	--compare-n-images ${TOL} 1
-	${BASELINE}/IsolatedConnectedImageFilterOutput1.png
-	${TEMP}/IsolatedConnectedImageFilterOutput1.png
-	IsolatedConnectedImageFilterTest
-	${INPUTDATA}/QB_Suburb.png
-	${TEMP}/IsolatedConnectedImageFilterOutput1.png
+        --compare-n-images ${TOL} 1
+        ${BASELINE}/IsolatedConnectedImageFilterOutput1.png
+        ${TEMP}/IsolatedConnectedImageFilterOutput1.png
+        IsolatedConnectedImageFilterTest
+        ${INPUTDATA}/QB_Suburb.png
+        ${TEMP}/IsolatedConnectedImageFilterOutput1.png
   61 140 150 63 43
 )
 
 # ------- FastMarchingImageFilterTest----------
 
 ADD_TEST(seTeFastMarchingImageFilterTest ${EXE_TESTS}
-	--compare-n-images ${TOL} 1
-	${BASELINE}/FastMarchingImageFilterOutput5.png
-	${TEMP}/FastMarchingImageFilterOutput5.png
-	FastMarchingImageFilterTest
-	${INPUTDATA}/QB_Suburb.png
-	${TEMP}/FastMarchingImageFilterOutput5.png
+        --compare-n-images ${TOL} 1
+        ${BASELINE}/FastMarchingImageFilterOutput5.png
+        ${TEMP}/FastMarchingImageFilterOutput5.png
+        FastMarchingImageFilterTest
+        ${INPUTDATA}/QB_Suburb.png
+        ${TEMP}/FastMarchingImageFilterOutput5.png
     91 176 0.5 -0.5 3.0 10000 10000
 )
 
 # ------- FastMarchingImageFilterTest----------
 
 ADD_TEST(seTeFastMarchingImageFilterTest ${EXE_TESTS}
-	--compare-n-images ${TOL} 1
-	${BASELINE}/FastMarchingImageFilterOutput6.png
-	${TEMP}/FastMarchingImageFilterOutput6.png
-	FastMarchingImageFilterTest
-	${INPUTDATA}/QB_Suburb.png
-	${TEMP}/FastMarchingImageFilterOutput6.png
+        --compare-n-images ${TOL} 1
+        ${BASELINE}/FastMarchingImageFilterOutput6.png
+        ${TEMP}/FastMarchingImageFilterOutput6.png
+        FastMarchingImageFilterTest
+        ${INPUTDATA}/QB_Suburb.png
+        ${TEMP}/FastMarchingImageFilterOutput6.png
     118 100 1.0 -0.5 3.0 10000 10000
 )
 
 # ------- FastMarchingImageFilterTest----------
 
 ADD_TEST(seTeFastMarchingImageFilterTest ${EXE_TESTS}
-	--compare-n-images ${TOL} 1
-	${BASELINE}/FastMarchingImageFilterOutput7.png
-	${TEMP}/FastMarchingImageFilterOutput7.png
-	FastMarchingImageFilterTest
-	${INPUTDATA}/QB_Suburb.png
-	${TEMP}/FastMarchingImageFilterOutput7.png
+        --compare-n-images ${TOL} 1
+        ${BASELINE}/FastMarchingImageFilterOutput7.png
+        ${TEMP}/FastMarchingImageFilterOutput7.png
+        FastMarchingImageFilterTest
+        ${INPUTDATA}/QB_Suburb.png
+        ${TEMP}/FastMarchingImageFilterOutput7.png
     145 21 0.5 -0.5 3.0 10000 10000
 )
 
 # ------- OtsuThresholdImageFilterTest----------
 
 ADD_TEST(seTeOtsuThresholdImageFilterTest ${EXE_TESTS}
-	--compare-n-images ${TOL} 1
-	${BASELINE}/OtsuThresholdImageFilterOutput.png
-	${TEMP}/OtsuThresholdImageFilterOutput.png
-	OtsuThresholdImageFilterTest
-	${INPUTDATA}/QB_Suburb.png
-	${TEMP}/OtsuThresholdImageFilterOutput.png
+        --compare-n-images ${TOL} 1
+        ${BASELINE}/OtsuThresholdImageFilterOutput.png
+        ${TEMP}/OtsuThresholdImageFilterOutput.png
+        OtsuThresholdImageFilterTest
+        ${INPUTDATA}/QB_Suburb.png
+        ${TEMP}/OtsuThresholdImageFilterOutput.png
     255 0
 )
 
 # ------- ConfidenceConnectedTest----------
 
 ADD_TEST(seTeConfidenceConnectedTest1 ${EXE_TESTS}
-	--compare-n-images ${TOL} 1
-	${BASELINE}/ConfidenceConnectedOutput1.png
-	${TEMP}/ConfidenceConnectedOutput1.png
-	ConfidenceConnectedTest
-	${INPUTDATA}/QB_Suburb.png
-	${TEMP}/ConfidenceConnectedOutput1.png
+        --compare-n-images ${TOL} 1
+        ${BASELINE}/ConfidenceConnectedOutput1.png
+        ${TEMP}/ConfidenceConnectedOutput1.png
+        ConfidenceConnectedTest
+        ${INPUTDATA}/QB_Suburb.png
+        ${TEMP}/ConfidenceConnectedOutput1.png
   110 38
 )
 
 # ------- ConfidenceConnectedTest----------
 
 ADD_TEST(seTeConfidenceConnectedTest2 ${EXE_TESTS}
-	--compare-n-images ${TOL} 1
-	${BASELINE}/ConfidenceConnectedOutput2.png
-	${TEMP}/ConfidenceConnectedOutput2.png
-	ConfidenceConnectedTest
-	${INPUTDATA}/QB_Suburb.png
-	${TEMP}/ConfidenceConnectedOutput2.png
+        --compare-n-images ${TOL} 1
+        ${BASELINE}/ConfidenceConnectedOutput2.png
+        ${TEMP}/ConfidenceConnectedOutput2.png
+        ConfidenceConnectedTest
+        ${INPUTDATA}/QB_Suburb.png
+        ${TEMP}/ConfidenceConnectedOutput2.png
   118 100
 )
 
 # ------- ConfidenceConnectedTest----------
 
 ADD_TEST(seTeConfidenceConnectedTest3 ${EXE_TESTS}
-	--compare-n-images ${TOL} 1
-	${BASELINE}/ConfidenceConnectedOutput3.png
-	${TEMP}/ConfidenceConnectedOutput3.png
-	ConfidenceConnectedTest
-	${INPUTDATA}/QB_Suburb.png
-	${TEMP}/ConfidenceConnectedOutput3.png
+        --compare-n-images ${TOL} 1
+        ${BASELINE}/ConfidenceConnectedOutput3.png
+        ${TEMP}/ConfidenceConnectedOutput3.png
+        ConfidenceConnectedTest
+        ${INPUTDATA}/QB_Suburb.png
+        ${TEMP}/ConfidenceConnectedOutput3.png
   169 146
 )
 
@@ -252,24 +252,24 @@ ADD_TEST(seTeConfidenceConnectedTest3 ${EXE_TESTS}
 # ------- VectorConfidenceConnectedTest----------
 
 ADD_TEST(seTeVectorConfidenceConnectedTest1 ${EXE_TESTS}
-	--compare-n-images ${TOL} 1
-	${BASELINE}/VectorConfidenceConnectedOutput1.png
-	${TEMP}/VectorConfidenceConnectedOutput1.png
-	VectorConfidenceConnectedTest
-	${INPUTDATA}/maur_rgb.png
-	${TEMP}/VectorConfidenceConnectedOutput1.png
+        --compare-n-images ${TOL} 1
+        ${BASELINE}/VectorConfidenceConnectedOutput1.png
+        ${TEMP}/VectorConfidenceConnectedOutput1.png
+        VectorConfidenceConnectedTest
+        ${INPUTDATA}/maur_rgb.png
+        ${TEMP}/VectorConfidenceConnectedOutput1.png
   3.5 # multiplier
   10 # iterations
   113 234 # seed index
 )
 
 ADD_TEST(seTeVectorConfidenceConnectedTest2 ${EXE_TESTS}
-	--compare-n-images ${TOL} 1
-	${BASELINE}/VectorConfidenceConnectedOutput2.png
-	${TEMP}/VectorConfidenceConnectedOutput2.png
-	VectorConfidenceConnectedTest
-	${INPUTDATA}/maur_rgb.png
-	${TEMP}/VectorConfidenceConnectedOutput2.png
+        --compare-n-images ${TOL} 1
+        ${BASELINE}/VectorConfidenceConnectedOutput2.png
+        ${TEMP}/VectorConfidenceConnectedOutput2.png
+        VectorConfidenceConnectedTest
+        ${INPUTDATA}/maur_rgb.png
+        ${TEMP}/VectorConfidenceConnectedOutput2.png
   3.5 # multiplier
   10 # iterations
   216 30 # seed index
@@ -292,127 +292,127 @@ ADD_TEST(seTeVectorConfidenceConnectedTest3 ${EXE_TESTS}
 # ------- NeighborhoodConnectedImageFilterTest----------
 
 ADD_TEST(seTeNeighborhoodConnectedImageFilterTest ${EXE_TESTS}
-	--compare-n-images ${TOL} 1
-	${BASELINE}/NeighborhoodConnectedThresholdOutput1.png
-	${TEMP}/NeighborhoodConnectedThresholdOutput1.png
-	NeighborhoodConnectedImageFilterTest
-	${INPUTDATA}/QB_Suburb.png
-	${TEMP}/NeighborhoodConnectedThresholdOutput1.png
+        --compare-n-images ${TOL} 1
+        ${BASELINE}/NeighborhoodConnectedThresholdOutput1.png
+        ${TEMP}/NeighborhoodConnectedThresholdOutput1.png
+        NeighborhoodConnectedImageFilterTest
+        ${INPUTDATA}/QB_Suburb.png
+        ${TEMP}/NeighborhoodConnectedThresholdOutput1.png
   110 38 50 100
 )
 
 # ------- NeighborhoodConnectedImageFilterTest----------
 
 ADD_TEST(seTeNeighborhoodConnectedImageFilterTest ${EXE_TESTS}
-	--compare-n-images ${TOL} 1
-	${BASELINE}/NeighborhoodConnectedThresholdOutput2.png
-	${TEMP}/NeighborhoodConnectedThresholdOutput2.png
-	NeighborhoodConnectedImageFilterTest
-	${INPUTDATA}/QB_Suburb.png
-	${TEMP}/NeighborhoodConnectedThresholdOutput2.png
+        --compare-n-images ${TOL} 1
+        ${BASELINE}/NeighborhoodConnectedThresholdOutput2.png
+        ${TEMP}/NeighborhoodConnectedThresholdOutput2.png
+        NeighborhoodConnectedImageFilterTest
+        ${INPUTDATA}/QB_Suburb.png
+        ${TEMP}/NeighborhoodConnectedThresholdOutput2.png
   118 100 0 10
 )
 
 # ------- NeighborhoodConnectedImageFilterTest----------
 
 ADD_TEST(seTeNeighborhoodConnectedImageFilterTest ${EXE_TESTS}
-	--compare-n-images ${TOL} 1
-	${BASELINE}/NeighborhoodConnectedThresholdOutput3.png
-	${TEMP}/NeighborhoodConnectedThresholdOutput3.png
-	NeighborhoodConnectedImageFilterTest
-	${INPUTDATA}/QB_Suburb.png
-	${TEMP}/NeighborhoodConnectedThresholdOutput3.png
+        --compare-n-images ${TOL} 1
+        ${BASELINE}/NeighborhoodConnectedThresholdOutput3.png
+        ${TEMP}/NeighborhoodConnectedThresholdOutput3.png
+        NeighborhoodConnectedImageFilterTest
+        ${INPUTDATA}/QB_Suburb.png
+        ${TEMP}/NeighborhoodConnectedThresholdOutput3.png
   169 146 220 255
 )
 
 # ------- WatershedSegmentationTest----------
 
 ADD_TEST(seTeWatershedSegmentationTest ${EXE_TESTS}
-	--compare-n-images ${TOL} 1
-	${BASELINE}/WatershedSegmentation1Output1.png
-	${TEMP}/WatershedSegmentation1Output1.png
-	WatershedSegmentationTest
-	${INPUTDATA}/ROI_QB_MUL_3.tif
-	${TEMP}/WatershedSegmentation1Output1.png
+        --compare-n-images ${TOL} 1
+        ${BASELINE}/WatershedSegmentation1Output1.png
+        ${TEMP}/WatershedSegmentation1Output1.png
+        WatershedSegmentationTest
+        ${INPUTDATA}/ROI_QB_MUL_3.tif
+        ${TEMP}/WatershedSegmentation1Output1.png
   2 10 0 0.05 1
 )
 
 # ------- WatershedSegmentationTest----------
 
 ADD_TEST(seTeWatershedSegmentationTest ${EXE_TESTS}
-	--compare-n-images ${TOL} 1
-	${BASELINE}/WatershedSegmentation1Output2.png
-	${TEMP}/WatershedSegmentation1Output2.png
-	WatershedSegmentationTest
-	${INPUTDATA}/ROI_QB_MUL_3.tif
-	${TEMP}/WatershedSegmentation1Output2.png
+        --compare-n-images ${TOL} 1
+        ${BASELINE}/WatershedSegmentation1Output2.png
+        ${TEMP}/WatershedSegmentation1Output2.png
+        WatershedSegmentationTest
+        ${INPUTDATA}/ROI_QB_MUL_3.tif
+        ${TEMP}/WatershedSegmentation1Output2.png
   2 10 0.001 0.15 0
 )
 
 # ------- ConnectedThresholdImageFilterTest----------
 
 ADD_TEST(seTeConnectedThresholdImageFilterTest ${EXE_TESTS}
-	--compare-n-images ${TOL} 1
-	${BASELINE}/ConnectedThresholdOutput1.png
-	${TEMP}/ConnectedThresholdOutput1.png
-	ConnectedThresholdImageFilterTest
-	${INPUTDATA}/QB_Suburb.png
-	${TEMP}/ConnectedThresholdOutput1.png
+        --compare-n-images ${TOL} 1
+        ${BASELINE}/ConnectedThresholdOutput1.png
+        ${TEMP}/ConnectedThresholdOutput1.png
+        ConnectedThresholdImageFilterTest
+        ${INPUTDATA}/QB_Suburb.png
+        ${TEMP}/ConnectedThresholdOutput1.png
   110 38 50 100
 )
 
 # ------- ConnectedThresholdImageFilterTest----------
 
 ADD_TEST(seTeConnectedThresholdImageFilterTest ${EXE_TESTS}
-	--compare-n-images ${TOL} 1
-	${BASELINE}/ConnectedThresholdOutput2.png
-	${TEMP}/ConnectedThresholdOutput2.png
-	ConnectedThresholdImageFilterTest
-	${INPUTDATA}/QB_Suburb.png
-	${TEMP}/ConnectedThresholdOutput2.png
+        --compare-n-images ${TOL} 1
+        ${BASELINE}/ConnectedThresholdOutput2.png
+        ${TEMP}/ConnectedThresholdOutput2.png
+        ConnectedThresholdImageFilterTest
+        ${INPUTDATA}/QB_Suburb.png
+        ${TEMP}/ConnectedThresholdOutput2.png
   118 100 0 10
 )
 
 # ------- ConnectedThresholdImageFilterTest----------
 
 ADD_TEST(seTeConnectedThresholdImageFilterTest ${EXE_TESTS}
-	--compare-n-images ${TOL} 1
-	${BASELINE}/ConnectedThresholdOutput3.png
-	${TEMP}/ConnectedThresholdOutput3.png
-	ConnectedThresholdImageFilterTest
-	${INPUTDATA}/QB_Suburb.png
-	${TEMP}/ConnectedThresholdOutput3.png
+        --compare-n-images ${TOL} 1
+        ${BASELINE}/ConnectedThresholdOutput3.png
+        ${TEMP}/ConnectedThresholdOutput3.png
+        ConnectedThresholdImageFilterTest
+        ${INPUTDATA}/QB_Suburb.png
+        ${TEMP}/ConnectedThresholdOutput3.png
   169 146 220 255
 )
 
 # ------- OtsuMultipleThresholdImageFilterTest----------
 
 ADD_TEST(seTeOtsuMultipleThresholdImageFilterTest ${EXE_TESTS}
-	--compare-n-images ${TOL} 3
-	${BASELINE}/OtsuMultipleThresholdsOutput000.png
-	${TEMP}/OtsuMultipleThresholdsOutput000.png
-	${BASELINE}/OtsuMultipleThresholdsOutput001.png
-	${TEMP}/OtsuMultipleThresholdsOutput001.png
-	${BASELINE}/OtsuMultipleThresholdsOutput002.png
-	${TEMP}/OtsuMultipleThresholdsOutput002.png
-	OtsuMultipleThresholdImageFilterTest
-	${INPUTDATA}/QB_Suburb.png
-	${TEMP}/OtsuMultipleThresholdsOutput000.png
-	${TEMP}/OtsuMultipleThresholdsOutput001.png
-	${TEMP}/OtsuMultipleThresholdsOutput002.png
+        --compare-n-images ${TOL} 3
+        ${BASELINE}/OtsuMultipleThresholdsOutput000.png
+        ${TEMP}/OtsuMultipleThresholdsOutput000.png
+        ${BASELINE}/OtsuMultipleThresholdsOutput001.png
+        ${TEMP}/OtsuMultipleThresholdsOutput001.png
+        ${BASELINE}/OtsuMultipleThresholdsOutput002.png
+        ${TEMP}/OtsuMultipleThresholdsOutput002.png
+        OtsuMultipleThresholdImageFilterTest
+        ${INPUTDATA}/QB_Suburb.png
+        ${TEMP}/OtsuMultipleThresholdsOutput000.png
+        ${TEMP}/OtsuMultipleThresholdsOutput001.png
+        ${TEMP}/OtsuMultipleThresholdsOutput002.png
 )
 
 # ------- LabelizeNeighborhoodConnectedImageFilterTest----------
 
 ADD_TEST(seTeLabelizeNeighborhoodConnectedImageFilterTest ${EXE_TESTS}
-	--compare-n-images ${TOL} 1
-	${BASELINE}/LabelizeNeighborhoodConnectedImageFilterOutput.png
-	${TEMP}/LabelizeNeighborhoodConnectedImageFilterOutput.png
-	LabelizeNeighborhoodConnectedImageFilterTest
-	${INPUTDATA}/QB_Suburb.png
-	${TEMP}/LabelizeNeighborhoodConnectedImageFilterOutput.png
-	170 170
-	80 80
+        --compare-n-images ${TOL} 1
+        ${BASELINE}/LabelizeNeighborhoodConnectedImageFilterOutput.png
+        ${TEMP}/LabelizeNeighborhoodConnectedImageFilterOutput.png
+        LabelizeNeighborhoodConnectedImageFilterTest
+        ${INPUTDATA}/QB_Suburb.png
+        ${TEMP}/LabelizeNeighborhoodConnectedImageFilterOutput.png
+        170 170
+        80 80
 )
 
 INCLUDE_DIRECTORIES(${OTB_SOURCE_DIR}/Testing/Code)
diff --git a/Examples/Tutorials/CMakeLists.txt b/Examples/Tutorials/CMakeLists.txt
index 647e8ba89c6826ec01ef5e01fba2c903d1303b41..364497e09777675d6e02bb4f07e6b49e0a309fb0 100644
--- a/Examples/Tutorials/CMakeLists.txt
+++ b/Examples/Tutorials/CMakeLists.txt
@@ -24,7 +24,7 @@ IF(OTB_USE_VISU_GUI)
   TARGET_LINK_LIBRARIES(SimpleViewer OTBCommon OTBIO OTBGui OTBVisualization ${OTB_VISU_GUI_LIBRARIES})
 
 # The basic application tutorial makes use of the otbApplicationsCommon library which is built in OTB-Applications package.
-# Therefore this tutorial will not compile until we move the OTBApplcationsCommon lib to the OTB. Until then, 
+# Therefore this tutorial will not compile until we move the OTBApplcationsCommon lib to the OTB. Until then,
 # the following line will be commented out.
 # SUBDIRS(BasicApplication)
 
@@ -112,11 +112,11 @@ ADD_TEST( trTeTutorialsOrthoFusionTest ${EXE_TESTS}
         31
         N
         375000
-	4828100
-	500
-	500
-	0.6
-	-0.6
+        4828100
+        500
+        500
+        0.6
+        -0.6
         )
 ENDIF(OTB_DATA_USE_LARGEINPUT)
 
diff --git a/Examples/Visualization/CMakeLists.txt b/Examples/Visualization/CMakeLists.txt
index 355f42aafc2264ec78f211f07d70614f64ccf23b..ebe3adf9c8bde5e4aab5618c33aeb4b5cd268c35 100644
--- a/Examples/Visualization/CMakeLists.txt
+++ b/Examples/Visualization/CMakeLists.txt
@@ -37,7 +37,7 @@ IF(OTB_DATA_USE_LARGEINPUT)
       0
       ${INPUTDATA}/DejaVuSans.ttf
       )
-  ENDIF(OTB_USE_MAPNIK) 
+  ENDIF(OTB_USE_MAPNIK)
 ENDIF(OTB_DATA_USE_LARGEINPUT)
 
 # Without Font file
@@ -50,7 +50,7 @@ IF(OTB_DATA_USE_LARGEINPUT)
       ${OTB_DATA_ROOT}/Input/DEM/srtm_directory
       0
       )
-  ENDIF(OTB_USE_MAPNIK) 
+  ENDIF(OTB_USE_MAPNIK)
 ENDIF(OTB_DATA_USE_LARGEINPUT)
 
 
diff --git a/Testing/Code/BasicFilters/CMakeLists.txt b/Testing/Code/BasicFilters/CMakeLists.txt
index 0d01535a85f96cdcfc7116ad1d4bab8cbdbd5fb5..97a8c9003d23c073656986d9814e8b883f46fa0e 100644
--- a/Testing/Code/BasicFilters/CMakeLists.txt
+++ b/Testing/Code/BasicFilters/CMakeLists.txt
@@ -41,17 +41,17 @@ ADD_TEST(bfTvFiltreLee1CanalPoupees ${BASICFILTERS_TESTS1}
   --compare-image ${EPSILON_7}  ${BASELINE}/bfFiltreLee_05_05_04.tif
                           ${TEMP}/bfFiltreLee_05_05_04.tif
         otbLeeFilter
-	${INPUTDATA}/GomaAvant.png                  #poupees_1canal.c1.hdr
-	${TEMP}/bfFiltreLee_05_05_04.tif
-	05 05 4.0)
+        ${INPUTDATA}/GomaAvant.png                  #poupees_1canal.c1.hdr
+        ${TEMP}/bfFiltreLee_05_05_04.tif
+        05 05 4.0)
 
 ADD_TEST(bfTvFiltreLee ${BASICFILTERS_TESTS1}
   --compare-image ${EPSILON_7}  ${BASELINE}/bfFiltreLee_05_05_12.tif
                            ${TEMP}/bfFiltreLee_05_05_12.tif
         otbLeeFilter
-	${INPUTDATA}/GomaAvant.png    #poupees.hdr
-	${TEMP}/bfFiltreLee_05_05_12.tif
-	05 05 12.0)
+        ${INPUTDATA}/GomaAvant.png    #poupees.hdr
+        ${TEMP}/bfFiltreLee_05_05_12.tif
+        05 05 12.0)
 
 #
 # Filtre de FROST:
@@ -63,9 +63,9 @@ ADD_TEST(bfTvFrostFilter ${BASICFILTERS_TESTS1}
   --compare-image ${EPSILON_7}  ${BASELINE}/bfFiltreFrost_poupees_05_05_01.tif
                           ${TEMP}/bfFiltreFrost_poupees_05_05_01.tif
         otbFrostFilter
-	${INPUTDATA}/GomaAvant.png   #poupees.hdr
-	${TEMP}/bfFiltreFrost_poupees_05_05_01.tif
-	05 05 0.1)
+        ${INPUTDATA}/GomaAvant.png   #poupees.hdr
+        ${TEMP}/bfFiltreFrost_poupees_05_05_01.tif
+        05 05 0.1)
 
 # -------            otb::PointSetFilter   ------------------------------
 
@@ -83,8 +83,8 @@ ADD_TEST(bfTvOpeningClosingFilter ${BASICFILTERS_TESTS1}
                            ${TEMP}/bfFiltreOpeningClosing_1.tif
         otbOpeningClosingMorphologicalFilter
         ${INPUTDATA}/ROI_IKO_PAN_LesHalles.tif
-	${TEMP}/bfFiltreOpeningClosing_1.tif
-	1)
+        ${TEMP}/bfFiltreOpeningClosing_1.tif
+        1)
 
 # -------            otb::ClosingOpeningMorphologicalFilter   ------------------------------
 
@@ -96,8 +96,8 @@ ADD_TEST(bfTvClosingOpeningFilter ${BASICFILTERS_TESTS1}
                            ${TEMP}/bfFiltreClosingOpening_1.tif
         otbClosingOpeningMorphologicalFilter
         ${INPUTDATA}/ROI_IKO_PAN_LesHalles.tif
-	${TEMP}/bfFiltreClosingOpening_1.tif
-	1)
+        ${TEMP}/bfFiltreClosingOpening_1.tif
+        1)
 
 
 # -------            otb::BinaryImageMinimalBoundingRegionCalculator   ----------------------------
@@ -109,16 +109,16 @@ ADD_TEST(bfTuBoundingRegionCalculatorNew ${BASICFILTERS_TESTS1}
 
 ADD_TEST(bfTvBoundingRegionCalculator ${BASICFILTERS_TESTS1}
    --compare-ascii ${NOTOL}
- 		   ${BASELINE_FILES}/bfBoundingRegionCalculatorOutput.txt
- 		   ${TEMP}/bfBoundingRegionCalculatorOutput.txt
+                    ${BASELINE_FILES}/bfBoundingRegionCalculatorOutput.txt
+                    ${TEMP}/bfBoundingRegionCalculatorOutput.txt
         otbBinaryImageMinimalBoundingRegionCalculator
-	4
-	${TEMP}/bfBoundingRegionCalculatorOutput.txt
-	${INPUTDATA}/rcc8_mire1.png
-	${INPUTDATA}/rcc8_mire2.png
-	${INPUTDATA}/rcc8_mire3.png
-	${INPUTDATA}/rcc8_mire4.png
-	)
+        4
+        ${TEMP}/bfBoundingRegionCalculatorOutput.txt
+        ${INPUTDATA}/rcc8_mire1.png
+        ${INPUTDATA}/rcc8_mire2.png
+        ${INPUTDATA}/rcc8_mire3.png
+        ${INPUTDATA}/rcc8_mire4.png
+        )
 
 
 ADD_TEST(bfTvMeanFunctorImageTest ${BASICFILTERS_TESTS1}
@@ -150,20 +150,20 @@ ADD_TEST(bfTuLogPolarTransformNew ${BASICFILTERS_TESTS2}
 
 ADD_TEST(bfTvLogPolarTransform ${BASICFILTERS_TESTS2}
    --compare-ascii ${NOTOL}
- 		   ${BASELINE_FILES}/bfLogPolarTransformResults.txt
- 		   ${TEMP}/bfLogPolarTransformResults.txt
+                    ${BASELINE_FILES}/bfLogPolarTransformResults.txt
+                    ${TEMP}/bfLogPolarTransformResults.txt
         otbLogPolarTransform
-	1 1
-	${TEMP}/bfLogPolarTransformResults.txt
-	5 0 0 0 10 45 0 3.14 3.14 18 1
-	)
+        1 1
+        ${TEMP}/bfLogPolarTransformResults.txt
+        5 0 0 0 10 45 0 3.14 3.14 18 1
+        )
 
 ADD_TEST(bfTvLogPolarTransformResample ${BASICFILTERS_TESTS2}
   --compare-image ${EPSILON_7}  ${BASELINE}/bfLogPolarTransformResampleOutput.hdr
                           ${TEMP}/bfLogPolarTransformResampleOutput.hdr
         otbLogPolarTransformResample
         ${INPUTDATA}/circle.hdr
-	${TEMP}/bfLogPolarTransformResampleOutput.hdr
+        ${TEMP}/bfLogPolarTransformResampleOutput.hdr
 )
 
 
@@ -174,20 +174,20 @@ ADD_TEST(bfTuInverseLogPolarTransformNew ${BASICFILTERS_TESTS2}
 
 ADD_TEST(bfTvInverseLogPolarTransform ${BASICFILTERS_TESTS2}
      --compare-ascii ${NOTOL}
-		     ${BASELINE_FILES}/bfInverseLogPolarTransformResults.txt
-		     ${TEMP}/bfInverseLogPolarTransformResults.txt
+                     ${BASELINE_FILES}/bfInverseLogPolarTransformResults.txt
+                     ${TEMP}/bfInverseLogPolarTransformResults.txt
         otbInverseLogPolarTransform
-	1. 1.
-	${TEMP}/bfInverseLogPolarTransformResults.txt
-	6 0 0 10 20 45 60 3.14 3.14 1 0 0 1
-	)
+        1. 1.
+        ${TEMP}/bfInverseLogPolarTransformResults.txt
+        6 0 0 10 20 45 60 3.14 3.14 1 0 0 1
+        )
 
 ADD_TEST(bfTvInverseLogPolarTransformResample ${BASICFILTERS_TESTS2}
 --compare-image ${NOTOL}  ${BASELINE}/bfInverseLogPolarTransformResampleOutput.hdr
                           ${TEMP}/bfInverseLogPolarTransformResampleOutput.hdr
         otbInverseLogPolarTransformResample
-	${BASELINE}/bfLogPolarTransformResampleOutput.hdr
-	${TEMP}/bfInverseLogPolarTransformResampleOutput.hdr
+        ${BASELINE}/bfLogPolarTransformResampleOutput.hdr
+        ${TEMP}/bfInverseLogPolarTransformResampleOutput.hdr
 )
 
 # -------            otb::StreamingShrinkImageFilter   ----------------------------
@@ -199,22 +199,22 @@ IF(OTB_DATA_USE_LARGEINPUT)
 
  ADD_TEST(bfTvStreamingShrinkImageFilterQBPAN ${BASICFILTERS_TESTS2}
 --compare-image ${NOTOL}
-		${BASELINE}/bfTvStreamingShrinkImageFilterQBPANOutput.hdr
-		${TEMP}/bfTvStreamingShrinkImageFilterQBPANOutput.hdr
-	otbStreamingShrinkImageFilter
-	${IMAGEDATA}/QUICKBIRD/TOULOUSE/000000128955_01_P001_PAN/02APR01105228-P1BS-000000128955_01_P001.TIF
-	${TEMP}/bfTvStreamingShrinkImageFilterQBPANOutput.hdr
-	50
+                ${BASELINE}/bfTvStreamingShrinkImageFilterQBPANOutput.hdr
+                ${TEMP}/bfTvStreamingShrinkImageFilterQBPANOutput.hdr
+        otbStreamingShrinkImageFilter
+        ${IMAGEDATA}/QUICKBIRD/TOULOUSE/000000128955_01_P001_PAN/02APR01105228-P1BS-000000128955_01_P001.TIF
+        ${TEMP}/bfTvStreamingShrinkImageFilterQBPANOutput.hdr
+        50
 )
 
 ADD_TEST(bfTvStreamingShrinkImageFilterQBMUL ${BASICFILTERS_TESTS2}
 --compare-image ${NOTOL}
-		${BASELINE}/bfTvStreamingShrinkImageFilterQBMULOutput.hdr
-		${TEMP}/bfTvStreamingShrinkImageFilterQBMULOutput.hdr
-		otbStreamingShrinkImageFilter
-	${IMAGEDATA}/QUICKBIRD/TOULOUSE/000000128955_01_P001_MUL/02APR01105228-M1BS-000000128955_01_P001.TIF
-	${TEMP}/bfTvStreamingShrinkImageFilterQBMULOutput.hdr
-	20
+                ${BASELINE}/bfTvStreamingShrinkImageFilterQBMULOutput.hdr
+                ${TEMP}/bfTvStreamingShrinkImageFilterQBMULOutput.hdr
+                otbStreamingShrinkImageFilter
+        ${IMAGEDATA}/QUICKBIRD/TOULOUSE/000000128955_01_P001_MUL/02APR01105228-M1BS-000000128955_01_P001.TIF
+        ${TEMP}/bfTvStreamingShrinkImageFilterQBMULOutput.hdr
+        20
 )
 ENDIF(OTB_DATA_USE_LARGEINPUT)
 
@@ -226,12 +226,12 @@ ENDIF(OTB_DATA_USE_LARGEINPUT)
 
  ADD_TEST(bfTvSpatialObjectToImageDrawingFilterWithoutInputImage ${BASICFILTERS_TESTS2}
  --compare-image ${NOTOL}
-		${BASELINE}/bfTvSpatialObjectDrawingNoInput.png
-		${TEMP}/bfTvSpatialObjectDrawingNoInput.png
-	otbSpatialObjectToImageDrawingFilter
-	${TEMP}/bfTvSpatialObjectDrawingNoInput.png
-	100
-	50
+                ${BASELINE}/bfTvSpatialObjectDrawingNoInput.png
+                ${TEMP}/bfTvSpatialObjectDrawingNoInput.png
+        otbSpatialObjectToImageDrawingFilter
+        ${TEMP}/bfTvSpatialObjectDrawingNoInput.png
+        100
+        50
 )
 
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -247,22 +247,22 @@ ENDIF(OTB_DATA_USE_LARGEINPUT)
 
  ADD_TEST(bfTvImportGeoInformationImageFilter ${BASICFILTERS_TESTS3}
  --compare-metadata ${NOTOL}
-		    ${INPUTDATA}/HFAGeoreferenced.img
-		    ${TEMP}/bfTvImportGeoInformationOutput.img
-	otbImportGeoInformationImageFilter
-		    ${INPUTDATA}/HFAGeoreferenced.img
-	            ${TEMP}/bfTvImportGeoInformationOutput.img
+                    ${INPUTDATA}/HFAGeoreferenced.img
+                    ${TEMP}/bfTvImportGeoInformationOutput.img
+        otbImportGeoInformationImageFilter
+                    ${INPUTDATA}/HFAGeoreferenced.img
+                    ${TEMP}/bfTvImportGeoInformationOutput.img
 )
 
 
 IF(OTB_DATA_USE_LARGEINPUT)
  ADD_TEST(bfTvImportGeoInformationImageFilterWithKeywordList ${BASICFILTERS_TESTS3}
 --compare-ascii ${EPSILON_7}
-		${BASELINE_FILES}/bfTvImportGeoInformationKeywordListOutput.txt
+                ${BASELINE_FILES}/bfTvImportGeoInformationKeywordListOutput.txt
                 ${TEMP}/bfTvImportGeoInformationKeywordListOutput.txt
          otbImportGeoInformationImageFilterWithKeywordList
          ${IMAGEDATA}/QUICKBIRD/TOULOUSE/000000128955_01_P001_PAN/02APR01105228-P1BS-000000128955_01_P001.TIF
-	 ${TEMP}/bfTvImportGeoInformationKeywordListOutput.txt
+         ${TEMP}/bfTvImportGeoInformationKeywordListOutput.txt
 )
 ENDIF(OTB_DATA_USE_LARGEINPUT)
 
@@ -273,20 +273,20 @@ ENDIF(OTB_DATA_USE_LARGEINPUT)
 
 
  ADD_TEST(bfTvSpectralAngleDistanceImageFilter ${BASICFILTERS_TESTS3}
-		--compare-image ${EPSILON_7}
-		    ${BASELINE}/bfTvSpectralAngleDistanceOutput.hdr
-		    ${TEMP}/bfTvSpectralAngleDistanceOutput.hdr
-		    otbSpectralAngleDistanceImageFilter
-		    ${INPUTDATA}/qb_RoadExtract.img.hdr
-	            ${TEMP}/bfTvSpectralAngleDistanceOutput.hdr
-		    337 557 432 859
+                --compare-image ${EPSILON_7}
+                    ${BASELINE}/bfTvSpectralAngleDistanceOutput.hdr
+                    ${TEMP}/bfTvSpectralAngleDistanceOutput.hdr
+                    otbSpectralAngleDistanceImageFilter
+                    ${INPUTDATA}/qb_RoadExtract.img.hdr
+                    ${TEMP}/bfTvSpectralAngleDistanceOutput.hdr
+                    337 557 432 859
 )
 
  ADD_TEST(bfTvSpectralAngleDistanceImageFilterOneChannel ${BASICFILTERS_TESTS3}
-		    otbSpectralAngleDistanceImageFilter
-		    ${INPUTDATA}/DeuxCercles.hdr
-	            ${TEMP}/bfTvSpectralAngleDistanceOneChannelOutput.hdr
-		    100
+                    otbSpectralAngleDistanceImageFilter
+                    ${INPUTDATA}/DeuxCercles.hdr
+                    ${TEMP}/bfTvSpectralAngleDistanceOneChannelOutput.hdr
+                    100
 )
 
 SET_TESTS_PROPERTIES(bfTvSpectralAngleDistanceImageFilterOneChannel PROPERTIES WILL_FAIL true)
@@ -298,13 +298,13 @@ ADD_TEST(bfTuVectorRescaleIntensityImageFilterNew ${BASICFILTERS_TESTS3}
 
 
 ADD_TEST(bfTVectorRescaleIntensityImageFilter ${BASICFILTERS_TESTS3}
-		--compare-image ${EPSILON_7}
-		    ${BASELINE}/bfTvVectorRescaleIntensityOutput.png
-		    ${TEMP}/bfTvVectorRescaleIntensityOutput.png
-		    otbVectorRescaleIntensityImageFilter
-		    ${INPUTDATA}/qb_RoadExtract.img.hdr
-	            ${TEMP}/bfTvVectorRescaleIntensityOutput.png
-		    0 255
+                --compare-image ${EPSILON_7}
+                    ${BASELINE}/bfTvVectorRescaleIntensityOutput.png
+                    ${TEMP}/bfTvVectorRescaleIntensityOutput.png
+                    otbVectorRescaleIntensityImageFilter
+                    ${INPUTDATA}/qb_RoadExtract.img.hdr
+                    ${TEMP}/bfTvVectorRescaleIntensityOutput.png
+                    0 255
 )
 
 # -------            otb::ShiftScaleVectorImageFilter   ----------------------------
@@ -314,12 +314,12 @@ ADD_TEST(bfTuShiftScaleVectorImageFilterNew ${BASICFILTERS_TESTS3}
 
 
 ADD_TEST(bfTvShiftScaleVectorImageFilter ${BASICFILTERS_TESTS3}
-		--compare-image ${EPSILON_7}
-		    ${BASELINE}/bfTvShiftScaleVImageOutput.tif
-		    ${TEMP}/bfTvShiftScaleVImageOutput.tif
-		otbShiftScaleVectorImageFilterTest
-		    ${INPUTDATA}/qb_RoadExtract.img.hdr
-	        ${TEMP}/bfTvShiftScaleVImageOutput.tif
+                --compare-image ${EPSILON_7}
+                    ${BASELINE}/bfTvShiftScaleVImageOutput.tif
+                    ${TEMP}/bfTvShiftScaleVImageOutput.tif
+                otbShiftScaleVectorImageFilterTest
+                    ${INPUTDATA}/qb_RoadExtract.img.hdr
+                ${TEMP}/bfTvShiftScaleVImageOutput.tif
 )
 
 
@@ -330,18 +330,18 @@ ADD_TEST(bfTuVectorImageToImageListFilterNew ${BASICFILTERS_TESTS3}
 
 
 ADD_TEST(bfTvVectorImageToImageListFilter ${BASICFILTERS_TESTS3}
-		--compare-n-images ${EPSILON_7} 3
-		    ${BASELINE}/bfTvVectorImageToImageListFilterBand1.png
-		    ${TEMP}/bfTvVectorImageToImageListFilterBand1.png
-		    ${BASELINE}/bfTvVectorImageToImageListFilterBand2.png
-		    ${TEMP}/bfTvVectorImageToImageListFilterBand2.png
-		    ${BASELINE}/bfTvVectorImageToImageListFilterBand3.png
-		    ${TEMP}/bfTvVectorImageToImageListFilterBand3.png
-		    otbVectorImageToImageListFilter
-		    ${INPUTDATA}/poupees.png
-	            ${TEMP}/bfTvVectorImageToImageListFilterBand1.png
-		    ${TEMP}/bfTvVectorImageToImageListFilterBand2.png
-		    ${TEMP}/bfTvVectorImageToImageListFilterBand3.png
+                --compare-n-images ${EPSILON_7} 3
+                    ${BASELINE}/bfTvVectorImageToImageListFilterBand1.png
+                    ${TEMP}/bfTvVectorImageToImageListFilterBand1.png
+                    ${BASELINE}/bfTvVectorImageToImageListFilterBand2.png
+                    ${TEMP}/bfTvVectorImageToImageListFilterBand2.png
+                    ${BASELINE}/bfTvVectorImageToImageListFilterBand3.png
+                    ${TEMP}/bfTvVectorImageToImageListFilterBand3.png
+                    otbVectorImageToImageListFilter
+                    ${INPUTDATA}/poupees.png
+                    ${TEMP}/bfTvVectorImageToImageListFilterBand1.png
+                    ${TEMP}/bfTvVectorImageToImageListFilterBand2.png
+                    ${TEMP}/bfTvVectorImageToImageListFilterBand3.png
 )
 
 
@@ -352,21 +352,21 @@ ADD_TEST(bfTuImageListToVectorImageFilterNew ${BASICFILTERS_TESTS3}
 
 
 ADD_TEST(bfTvImageListToVectorImageFilter ${BASICFILTERS_TESTS3}
-		--compare-image ${EPSILON_7}
-		    ${BASELINE}/bfTvImageListToVectorImageFilter.png
-		    ${TEMP}/bfTvImageListToVectorImageFilter.png
-		    otbImageListToVectorImageFilter
+                --compare-image ${EPSILON_7}
+                    ${BASELINE}/bfTvImageListToVectorImageFilter.png
+                    ${TEMP}/bfTvImageListToVectorImageFilter.png
+                    otbImageListToVectorImageFilter
           ${INPUTDATA}/poupees_c1.hdr
           ${INPUTDATA}/poupees_c2.hdr
           ${INPUTDATA}/poupees_c3.hdr
             #${INPUTDATA}/poupees.c1.hdr
-		    #${INPUTDATA}/poupees.c2.hdr
-		    #${INPUTDATA}/poupees.c3.hdr
-		    ${TEMP}/bfTvImageListToVectorImageFilter.png
+                    #${INPUTDATA}/poupees.c2.hdr
+                    #${INPUTDATA}/poupees.c3.hdr
+                    ${TEMP}/bfTvImageListToVectorImageFilter.png
 )
 
 ADD_TEST(bfTvImageListToVectorImageFilter2 ${BASICFILTERS_TESTS3}
-		    otbImageListToVectorImageFilter2
+                    otbImageListToVectorImageFilter2
           ${INPUTDATA}/poupees_c1.hdr
           ${INPUTDATA}/poupees_c2.hdr
           ${INPUTDATA}/poupees_c3.hdr
@@ -383,20 +383,20 @@ ADD_TEST(bfTuImageListToImageListApplyFilterNew ${BASICFILTERS_TESTS4}
 
 
 ADD_TEST(bfTvImageListToImageListApplyFilter ${BASICFILTERS_TESTS4}
-		--compare-n-images ${EPSILON_7} 3
-		    ${BASELINE}/bfTvImageListToImageListApplyFilterBand1.png
-		    ${TEMP}/bfTvImageListToImageListApplyFilterBand1.png
-		    ${BASELINE}/bfTvImageListToImageListApplyFilterBand2.png
-		    ${TEMP}/bfTvImageListToImageListApplyFilterBand2.png
-		    ${BASELINE}/bfTvImageListToImageListApplyFilterBand3.png
-		    ${TEMP}/bfTvImageListToImageListApplyFilterBand3.png
-		    otbImageListToImageListApplyFilter
-	      ${INPUTDATA}/poupees_c1.hdr
-		    ${INPUTDATA}/poupees_c2.hdr
-		    ${INPUTDATA}/poupees_c3.hdr
-		    ${TEMP}/bfTvImageListToImageListApplyFilterBand1.png
-		    ${TEMP}/bfTvImageListToImageListApplyFilterBand2.png
-		    ${TEMP}/bfTvImageListToImageListApplyFilterBand3.png
+                --compare-n-images ${EPSILON_7} 3
+                    ${BASELINE}/bfTvImageListToImageListApplyFilterBand1.png
+                    ${TEMP}/bfTvImageListToImageListApplyFilterBand1.png
+                    ${BASELINE}/bfTvImageListToImageListApplyFilterBand2.png
+                    ${TEMP}/bfTvImageListToImageListApplyFilterBand2.png
+                    ${BASELINE}/bfTvImageListToImageListApplyFilterBand3.png
+                    ${TEMP}/bfTvImageListToImageListApplyFilterBand3.png
+                    otbImageListToImageListApplyFilter
+              ${INPUTDATA}/poupees_c1.hdr
+                    ${INPUTDATA}/poupees_c2.hdr
+                    ${INPUTDATA}/poupees_c3.hdr
+                    ${TEMP}/bfTvImageListToImageListApplyFilterBand1.png
+                    ${TEMP}/bfTvImageListToImageListApplyFilterBand2.png
+                    ${TEMP}/bfTvImageListToImageListApplyFilterBand3.png
 )
 
 # -------            otb::PerBandVectorImageFilter   ----------------------------
@@ -405,21 +405,21 @@ ADD_TEST(bfTuPerBandVectorImageFilterNew ${BASICFILTERS_TESTS4}
          otbPerBandVectorImageFilterNew)
 
 ADD_TEST(bfTvPerBandVectorImageFilterWithMeanFilter ${BASICFILTERS_TESTS4}
-	--compare-image ${EPSILON_7}
-			${BASELINE}/bfTvPerBandVectorImageFilterWithMeanFilterOutput.hdr
-			${TEMP}/bfTvPerBandVectorImageFilterWithMeanFilterOutput.hdr
-	otbPerBandVectorImageFilterWithMeanFilter
-			${INPUTDATA}/poupees.png
-			${TEMP}/bfTvPerBandVectorImageFilterWithMeanFilterOutput.hdr
+        --compare-image ${EPSILON_7}
+                        ${BASELINE}/bfTvPerBandVectorImageFilterWithMeanFilterOutput.hdr
+                        ${TEMP}/bfTvPerBandVectorImageFilterWithMeanFilterOutput.hdr
+        otbPerBandVectorImageFilterWithMeanFilter
+                        ${INPUTDATA}/poupees.png
+                        ${TEMP}/bfTvPerBandVectorImageFilterWithMeanFilterOutput.hdr
 )
 
 ADD_TEST(bfTvPerBandVectorImageFilterWithSobelFilter ${BASICFILTERS_TESTS4}
-	--compare-image ${EPSILON_7}
-			${BASELINE}/bfTvPerBandVectorImageFilterWithSobelFilterOutput.hdr
-			${TEMP}/bfTvPerBandVectorImageFilterWithSobelFilterOutput.hdr
-	otbPerBandVectorImageFilterWithSobelFilter
-			${INPUTDATA}/poupees.png
-			${TEMP}/bfTvPerBandVectorImageFilterWithSobelFilterOutput.hdr
+        --compare-image ${EPSILON_7}
+                        ${BASELINE}/bfTvPerBandVectorImageFilterWithSobelFilterOutput.hdr
+                        ${TEMP}/bfTvPerBandVectorImageFilterWithSobelFilterOutput.hdr
+        otbPerBandVectorImageFilterWithSobelFilter
+                        ${INPUTDATA}/poupees.png
+                        ${TEMP}/bfTvPerBandVectorImageFilterWithSobelFilterOutput.hdr
 )
 
 
@@ -429,13 +429,13 @@ ADD_TEST(bfTuStreamingStatisticsImageFilterNew ${BASICFILTERS_TESTS4}
          otbStreamingStatisticsImageFilterNew)
 
 ADD_TEST(bfTvStreamingStatisticsImageFilter ${BASICFILTERS_TESTS4}
-	--compare-ascii ${NOTOL}
- 		   ${BASELINE_FILES}/bfStreamingStatisticsImageFilterResults.txt
- 		   ${TEMP}/bfStreamingStatisticsImageFilterResults.txt
+        --compare-ascii ${NOTOL}
+                    ${BASELINE_FILES}/bfStreamingStatisticsImageFilterResults.txt
+                    ${TEMP}/bfStreamingStatisticsImageFilterResults.txt
          otbStreamingStatisticsImageFilter
-#		${IMAGEDATA}/QUICKBIRD/TOULOUSE/000000128955_01_P001_PAN/02APR01105228-P1BS-000000128955_01_P001.TIF
+#                ${IMAGEDATA}/QUICKBIRD/TOULOUSE/000000128955_01_P001_PAN/02APR01105228-P1BS-000000128955_01_P001.TIF
                 ${INPUTDATA}/small_poupees_1canal.hd
-		${TEMP}/bfStreamingStatisticsImageFilterResults.txt)
+                ${TEMP}/bfStreamingStatisticsImageFilterResults.txt)
 
 # -------            otb::StreamingCompareImageFilter   ----------------------------
 
@@ -443,9 +443,9 @@ ADD_TEST(bfTuStreamingCompareImageFilterNew ${BASICFILTERS_TESTS4}
          otbStreamingCompareImageFilterNew)
 
 ADD_TEST(bfTvStreamingCompareImageFilter ${BASICFILTERS_TESTS4}
-	--compare-ascii ${NOTOL}
- 		   ${BASELINE_FILES}/bfStreamingCompareImageFilterResults.txt
- 		   ${TEMP}/bfStreamingCompareImageFilterResults.txt
+        --compare-ascii ${NOTOL}
+                    ${BASELINE_FILES}/bfStreamingCompareImageFilterResults.txt
+                    ${TEMP}/bfStreamingCompareImageFilterResults.txt
          otbStreamingCompareImageFilter
                 ${INPUTDATA}/small_poupees_1canal.hd
                 ${TEMP}/bfStreamingCompareImageFilterResults.txt)
@@ -456,12 +456,12 @@ ADD_TEST(bfTuVectorImageTo3DScalarImageFilterNew ${BASICFILTERS_TESTS4}
          otbVectorImageTo3DScalarImageFilterNew)
 
 ADD_TEST(bfTvVectorImageTo3DScalarImageFilter ${BASICFILTERS_TESTS4}
-	--compare-image ${NOTOL}
- 		   ${BASELINE}/bfTvVectorImageTo3DScalarImageFilterOutput.png
- 		   ${TEMP}/bfTvVectorImageTo3DScalarImageFilterOutput.png
+        --compare-image ${NOTOL}
+                    ${BASELINE}/bfTvVectorImageTo3DScalarImageFilterOutput.png
+                    ${TEMP}/bfTvVectorImageTo3DScalarImageFilterOutput.png
          otbVectorImageTo3DScalarImageFilter
-		${INPUTDATA}/poupees.png
-		${TEMP}/bfTvVectorImageTo3DScalarImageFilterOutput.png
+                ${INPUTDATA}/poupees.png
+                ${TEMP}/bfTvVectorImageTo3DScalarImageFilterOutput.png
 )
 
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -505,25 +505,25 @@ ADD_TEST(bfTvStreamingResampleImageFilter ${BASICFILTERS_TESTS5}
 )
 
 ADD_TEST(bfTvStreamingResampleImageFilterCompareWithITK ${BASICFILTERS_TESTS5}
-		--compare-image ${NOTOL}
-					${TEMP}/bfTvStreamingResamplePoupeesTestITK.tif
-					${TEMP}/bfTvStreamingResamplePoupeesTestOTB.tif
-				otbStreamingResampleImageFilterCompareWithITK
-					${INPUTDATA}/poupees.tif
-					3000 3000
-					${TEMP}/bfTvStreamingResamplePoupeesTestITK.tif
-					${TEMP}/bfTvStreamingResamplePoupeesTestOTB.tif
+                --compare-image ${NOTOL}
+                                        ${TEMP}/bfTvStreamingResamplePoupeesTestITK.tif
+                                        ${TEMP}/bfTvStreamingResamplePoupeesTestOTB.tif
+                                otbStreamingResampleImageFilterCompareWithITK
+                                        ${INPUTDATA}/poupees.tif
+                                        3000 3000
+                                        ${TEMP}/bfTvStreamingResamplePoupeesTestITK.tif
+                                        ${TEMP}/bfTvStreamingResamplePoupeesTestOTB.tif
 )
 
 #ADD_TEST(StreamingResampleImageFilterCompareWithITK ${BASICFILTERS_TESTS5}
-#		--compare-image ${NOTOL}
-#					${TEMP}/bfTvStreamingResampleSPOT5TestITK.tif
-#					${TEMP}/bfTvStreamingResampleSPOT5TestOTB.tif
-#				otbStreamingResampleImageFilterCompareWithITK
-#					${INPUTDATA}/spot5SubWithGcps.tif
-#					1100 1100
-#					${TEMP}/bfTvStreamingResampleSPOT5TestITK.tif
-#					${TEMP}/bfTvStreamingResampleSPOT5TestOTB.tif
+#                --compare-image ${NOTOL}
+#                                        ${TEMP}/bfTvStreamingResampleSPOT5TestITK.tif
+#                                        ${TEMP}/bfTvStreamingResampleSPOT5TestOTB.tif
+#                                otbStreamingResampleImageFilterCompareWithITK
+#                                        ${INPUTDATA}/spot5SubWithGcps.tif
+#                                        1100 1100
+#                                        ${TEMP}/bfTvStreamingResampleSPOT5TestITK.tif
+#                                        ${TEMP}/bfTvStreamingResampleSPOT5TestOTB.tif
 #)
 
 # -------            otb::StreamingMinMaxImageFilter   ----------------------------
@@ -560,14 +560,14 @@ ADD_TEST(bfTuStreamingStatisticsVectorImageFilterNew ${BASICFILTERS_TESTS5}
          otbStreamingStatisticsVectorImageFilterNew)
 
 ADD_TEST(bfTvStreamingStatisticsVectorImageFilter ${BASICFILTERS_TESTS5}
-	--compare-ascii ${NOTOL}
- 		   ${BASELINE_FILES}/bfTvStreamingStatisticsVectorImageFilterResults.txt
- 		   ${TEMP}/bfTvStreamingStatisticsVectorImageFilterResults.txt
+        --compare-ascii ${NOTOL}
+                    ${BASELINE_FILES}/bfTvStreamingStatisticsVectorImageFilterResults.txt
+                    ${TEMP}/bfTvStreamingStatisticsVectorImageFilterResults.txt
          otbStreamingStatisticsVectorImageFilter
-		#${IMAGEDATA}/SPOT5_SCENE01/IMAGERY.TIF
-		${INPUTDATA}/couleurs_extrait.png
-		${TEMP}/bfTvStreamingStatisticsVectorImageFilterResults.txt
-		)
+                #${IMAGEDATA}/SPOT5_SCENE01/IMAGERY.TIF
+                ${INPUTDATA}/couleurs_extrait.png
+                ${TEMP}/bfTvStreamingStatisticsVectorImageFilterResults.txt
+                )
 
 # -------            otb::MatrixTransposeMatrixImageFilter   ----------------------------
 
@@ -575,14 +575,14 @@ ADD_TEST(bfTuMatrixTransposeMatrixImageFilterNew ${BASICFILTERS_TESTS5}
          otbMatrixTransposeMatrixImageFilterNew)
 
 ADD_TEST(bfTvMatrixTransposeMatrixImageFilter ${BASICFILTERS_TESTS5}
-	--compare-ascii ${NOTOL}
- 		   ${BASELINE_FILES}/bfTvMatrixTransposeMatrixImageFilterResults.txt
- 		   ${TEMP}/bfTvMatrixTransposeMatrixImageFilterResults.txt
+        --compare-ascii ${NOTOL}
+                    ${BASELINE_FILES}/bfTvMatrixTransposeMatrixImageFilterResults.txt
+                    ${TEMP}/bfTvMatrixTransposeMatrixImageFilterResults.txt
          otbMatrixTransposeMatrixImageFilter
-		${INPUTDATA}/multiSpect.tif
-		${INPUTDATA}/multiSpectInterp.tif
-		${TEMP}/bfTvMatrixTransposeMatrixImageFilterResults.txt
-		)
+                ${INPUTDATA}/multiSpect.tif
+                ${INPUTDATA}/multiSpectInterp.tif
+                ${TEMP}/bfTvMatrixTransposeMatrixImageFilterResults.txt
+                )
 
 
 # -------            otb::UnaryImageFunctorWithVectorImageFilter   ----------------------------
@@ -592,12 +592,12 @@ ADD_TEST(bfTuUnaryImageFunctorWithVectorImageFilterNew ${BASICFILTERS_TESTS5}
 
 ADD_TEST(bfTvUnaryImageFunctorWithVectorImageFilter ${BASICFILTERS_TESTS5}
      --compare-image ${NOTOL}
-     		     ${BASELINE}/bfTvUnaryImageFunctorWithVectorImageFilter.tif
-		     ${TEMP}/bfTvUnaryImageFunctorWithVectorImageFilter.tif
+                          ${BASELINE}/bfTvUnaryImageFunctorWithVectorImageFilter.tif
+                     ${TEMP}/bfTvUnaryImageFunctorWithVectorImageFilter.tif
          otbUnaryImageFunctorWithVectorImageFilter
-		${INPUTDATA}/poupees_sub.png
-		${TEMP}/bfTvUnaryImageFunctorWithVectorImageFilter.tif
-		)
+                ${INPUTDATA}/poupees_sub.png
+                ${TEMP}/bfTvUnaryImageFunctorWithVectorImageFilter.tif
+                )
 
 # -------            otb::UnaryFunctorImageFilter   ----------------------------
 
@@ -611,23 +611,23 @@ ADD_TEST(bfTuPrintableImageFilterNew ${BASICFILTERS_TESTS5}
 
 ADD_TEST(bfTvPrintableImageFilter ${BASICFILTERS_TESTS5}
      --compare-image ${NOTOL}
-     		     ${BASELINE}/bfTvPrintableImageFilter.png
-		     ${TEMP}/bfTvPrintableImageFilter.png
+                          ${BASELINE}/bfTvPrintableImageFilter.png
+                     ${TEMP}/bfTvPrintableImageFilter.png
          otbPrintableImageFilter
-		${INPUTDATA}/QB_Toulouse_Ortho_XS.tif
-		${TEMP}/bfTvPrintableImageFilter.png
-		)
+                ${INPUTDATA}/QB_Toulouse_Ortho_XS.tif
+                ${TEMP}/bfTvPrintableImageFilter.png
+                )
 
 ADD_TEST(bfTvPrintableImageFilterWithMask ${BASICFILTERS_TESTS5}
      --compare-image ${NOTOL}
-     		     ${BASELINE}/bfTvPrintableImageFilterWithMask.png
-		     ${TEMP}/bfTvPrintableImageFilterWithMask.png
+                          ${BASELINE}/bfTvPrintableImageFilterWithMask.png
+                     ${TEMP}/bfTvPrintableImageFilterWithMask.png
          otbPrintableImageFilterWithMask
-		${INPUTDATA}/poupees.tif
-		${INPUTDATA}/carre.png
-		${TEMP}/bfTvPrintableImageFilterWithMask.png
-		0 # background
-		)
+                ${INPUTDATA}/poupees.tif
+                ${INPUTDATA}/carre.png
+                ${TEMP}/bfTvPrintableImageFilterWithMask.png
+                0 # background
+                )
 
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ otbBasicFiltersTests6 ~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -640,12 +640,12 @@ ADD_TEST(bfTuBSplineDecompositionImageFilterNew ${BASICFILTERS_TESTS6}
 
 ADD_TEST(bfTvBSplineDecompositionImageFilter ${BASICFILTERS_TESTS6}
      --compare-image ${EPSILON_7}
-     		     ${BASELINE}/bfBSplineDecompositionImageFilterOutput.tif
-		     ${TEMP}/bfBSplineDecompositionImageFilterOutput.tif
+                          ${BASELINE}/bfBSplineDecompositionImageFilterOutput.tif
+                     ${TEMP}/bfBSplineDecompositionImageFilterOutput.tif
          otbBSplineDecompositionImageFilter
-		${INPUTDATA}/poupees.tif
-		${TEMP}/bfBSplineDecompositionImageFilterOutput.tif
-		)
+                ${INPUTDATA}/poupees.tif
+                ${TEMP}/bfBSplineDecompositionImageFilterOutput.tif
+                )
 
 # -------            otb::BSplineInterpolateImageFunction  ------------------------------
 
@@ -654,20 +654,20 @@ ADD_TEST(bfTuBSplineInterpolateImageFunctionNew ${BASICFILTERS_TESTS6}
 
 ADD_TEST(bfTvBSplineInterpolateImageFunction ${BASICFILTERS_TESTS6}
      --compare-ascii ${EPSILON_7}
-     		     ${BASELINE_FILES}/bfBSplineInterpolateImageFunctionOutput.txt
-		     ${TEMP}/bfBSplineInterpolateImageFunctionOutput.txt
+                          ${BASELINE_FILES}/bfBSplineInterpolateImageFunctionOutput.txt
+                     ${TEMP}/bfBSplineInterpolateImageFunctionOutput.txt
         otbBSplineInterpolateImageFunction
-		${INPUTDATA}/poupees.tif
-		${TEMP}/bfBSplineInterpolateImageFunctionOutput.txt
-		0.5 0.5
-		127.33 44.9
-		259.67 21.43
-		12.13 61.79
-		89.5 11
-		128 128
-		127.255 128.73
-		-1 -1
-		)
+                ${INPUTDATA}/poupees.tif
+                ${TEMP}/bfBSplineInterpolateImageFunctionOutput.txt
+                0.5 0.5
+                127.33 44.9
+                259.67 21.43
+                12.13 61.79
+                89.5 11
+                128 128
+                127.255 128.73
+                -1 -1
+                )
 
 # -------            otb::ProlateInterpolateImageFunction  ------------------------------
 
@@ -676,24 +676,24 @@ ADD_TEST(bfTuProlateInterpolateImageFunctionNew ${BASICFILTERS_TESTS6}
 
 ADD_TEST(bfTvProlateInterpolateImageFunction ${BASICFILTERS_TESTS6}
      --compare-ascii ${NOTOL}
-     		     ${BASELINE_FILES}/bfProlateInterpolateImageFunctionOutput.txt
-		     ${TEMP}/bfProlateInterpolateImageFunctionOutput.txt
+                          ${BASELINE_FILES}/bfProlateInterpolateImageFunctionOutput.txt
+                     ${TEMP}/bfProlateInterpolateImageFunctionOutput.txt
         otbProlateInterpolateImageFunction
-		${INPUTDATA}/poupees.tif
-		${TEMP}/bfProlateInterpolateImageFunctionOutput.txt
-		${TEMP}/bfProlateInterpolateImageFunctionCosOutput.tif
-		${TEMP}/bfProlateInterpolateImageFunctionITKCosOutput.tif
-		${TEMP}/bfProlateInterpolateImageFunctionProOutput.tif
-		3 # radius
-		0.5 0.5
-		127.33 44.9
-		259.67 21.43
-		12.13 61.79
-		89.5 11
-		128 128
-		127.255 128.73
-		-1 -1
-		)
+                ${INPUTDATA}/poupees.tif
+                ${TEMP}/bfProlateInterpolateImageFunctionOutput.txt
+                ${TEMP}/bfProlateInterpolateImageFunctionCosOutput.tif
+                ${TEMP}/bfProlateInterpolateImageFunctionITKCosOutput.tif
+                ${TEMP}/bfProlateInterpolateImageFunctionProOutput.tif
+                3 # radius
+                0.5 0.5
+                127.33 44.9
+                259.67 21.43
+                12.13 61.79
+                89.5 11
+                128 128
+                127.255 128.73
+                -1 -1
+                )
 
 # -------            otb::WindowedSincInterpolateImageFunctionBase  ------------------------------
 ADD_TEST(bfTuWindowedSincInterpolateImageFunctionBaseNew ${BASICFILTERS_TESTS6}
@@ -705,21 +705,21 @@ ADD_TEST(bfTuWindowedSincInterpolateImageFunctionBaseNew ${BASICFILTERS_TESTS6}
 
 ADD_TEST(bfTvWindowedSincInterpolateImageGaussianFunction ${BASICFILTERS_TESTS6}
      --compare-ascii ${NOTOL}
-     		     ${BASELINE_FILES}/bfWindowedSincInterpolateImageGaussianFunctionOutput.txt
-		     ${TEMP}/bfWindowedSincInterpolateImageGaussianFunctionOutput.txt
+                          ${BASELINE_FILES}/bfWindowedSincInterpolateImageGaussianFunctionOutput.txt
+                     ${TEMP}/bfWindowedSincInterpolateImageGaussianFunctionOutput.txt
         otbWindowedSincInterpolateImageGaussianFunction
-		${INPUTDATA}/poupees.tif
-		${TEMP}/bfWindowedSincInterpolateImageGaussianFunctionOutput.txt
-		3 # radius
-		0.5 0.5
-		127.33 44.9
-		259.67 21.43
-		12.13 61.79
-		89.5 11
-		128 128
-		127.255 128.73
-		-1 -1
-		)
+                ${INPUTDATA}/poupees.tif
+                ${TEMP}/bfWindowedSincInterpolateImageGaussianFunctionOutput.txt
+                3 # radius
+                0.5 0.5
+                127.33 44.9
+                259.67 21.43
+                12.13 61.79
+                89.5 11
+                128 128
+                127.255 128.73
+                -1 -1
+                )
 
 
 # -------            otb::WindowedSincInterpolateImageHammingFunction  ------------------------------
@@ -728,21 +728,21 @@ ADD_TEST(bfTvWindowedSincInterpolateImageGaussianFunction ${BASICFILTERS_TESTS6}
 
 ADD_TEST(bfTvWindowedSincInterpolateImageHammingFunction ${BASICFILTERS_TESTS6}
      --compare-ascii ${NOTOL}
-     		     ${BASELINE_FILES}/bfWindowedSincInterpolateImageHammingFunctionOutput.txt
-		     ${TEMP}/bfWindowedSincInterpolateImageHammingFunctionOutput.txt
+                          ${BASELINE_FILES}/bfWindowedSincInterpolateImageHammingFunctionOutput.txt
+                     ${TEMP}/bfWindowedSincInterpolateImageHammingFunctionOutput.txt
         otbWindowedSincInterpolateImageHammingFunction
-		${INPUTDATA}/poupees.tif
-		${TEMP}/bfWindowedSincInterpolateImageHammingFunctionOutput.txt
-		3 # radius
-		0.5 0.5
-		127.33 44.9
-		259.67 21.43
-		12.13 61.79
-		89.5 11
-		128 128
-		127.255 128.73
-		-1 -1
-		)
+                ${INPUTDATA}/poupees.tif
+                ${TEMP}/bfWindowedSincInterpolateImageHammingFunctionOutput.txt
+                3 # radius
+                0.5 0.5
+                127.33 44.9
+                259.67 21.43
+                12.13 61.79
+                89.5 11
+                128 128
+                127.255 128.73
+                -1 -1
+                )
 
 # -------            otb::BCOInterpolateImageFunction  ------------------------------
 
@@ -752,8 +752,8 @@ ADD_TEST(bfTuBCOInterpolateImageFunctionNew ${BASICFILTERS_TESTS6}
 
 ADD_TEST(bfTvBCOInterpolateImageFunction ${BASICFILTERS_TESTS6}
 --compare-ascii ${NOTOL}
-     		     ${BASELINE_FILES}/bfTvBCOInterpolateImageFunctionOutput.txt
-		     ${TEMP}/bfTvBCOInterpolateImageFunctionOutput.txt
+                          ${BASELINE_FILES}/bfTvBCOInterpolateImageFunctionOutput.txt
+                     ${TEMP}/bfTvBCOInterpolateImageFunctionOutput.txt
   otbBCOInterpolateImageFunction
   ${INPUTDATA}/poupees.tif
   ${TEMP}/bfTvBCOInterpolateImageFunctionOutput.txt
@@ -774,8 +774,8 @@ ADD_TEST(bfTuBCOInterpolateImageFunctionOverVectorImageNew ${BASICFILTERS_TESTS6
 
 ADD_TEST(bfTvBCOInterpolateImageFunctionOverVectorImage ${BASICFILTERS_TESTS6}
 --compare-ascii ${NOTOL}
-     		     ${BASELINE_FILES}/bfTvBCOInterpolateImageFunctionOverVectorImageOutput.txt
-		     ${TEMP}/bfTvBCOInterpolateImageFunctionOverVectorImageOutput.txt
+                          ${BASELINE_FILES}/bfTvBCOInterpolateImageFunctionOverVectorImageOutput.txt
+                     ${TEMP}/bfTvBCOInterpolateImageFunctionOverVectorImageOutput.txt
   otbBCOInterpolateImageFunctionOverVectorImage
   ${INPUTDATA}/poupees.tif
   ${TEMP}/bfTvBCOInterpolateImageFunctionOverVectorImageOutput.txt
@@ -793,8 +793,8 @@ ADD_TEST(bfTvBCOInterpolateImageFunctionOverVectorImage ${BASICFILTERS_TESTS6}
 
 ADD_TEST(bfTvBCOInterpolateImageFunctionTest ${BASICFILTERS_TESTS6}
 --compare-image ${EPSILON_7}
-     		  ${BASELINE}/bfTvBCOInterpolateImageFunctionTest.tif
-		  ${TEMP}/bfTvBCOInterpolateImageFunctionTest.tif
+                       ${BASELINE}/bfTvBCOInterpolateImageFunctionTest.tif
+                  ${TEMP}/bfTvBCOInterpolateImageFunctionTest.tif
   otbBCOInterpolateImageFunctionTest
   ${INPUTDATA}/poupees.tif
   ${TEMP}/bfTvBCOInterpolateImageFunctionTest.tif
@@ -804,8 +804,8 @@ ADD_TEST(bfTvBCOInterpolateImageFunctionTest ${BASICFILTERS_TESTS6}
 
 ADD_TEST(bfTvBCOInterpolateImageFunctionVectorImageTest ${BASICFILTERS_TESTS6}
 --compare-image ${EPSILON_7}
-     		  ${BASELINE}/bfTvBCOInterpolateImageFunctionVectorImageTest.tif
-		  ${TEMP}/bfTvBCOInterpolateImageFunctionVectorImageTest.tif
+                       ${BASELINE}/bfTvBCOInterpolateImageFunctionVectorImageTest.tif
+                  ${TEMP}/bfTvBCOInterpolateImageFunctionVectorImageTest.tif
   otbBCOInterpolateImageFunctionVectorImageTest
   ${INPUTDATA}/poupees.tif
   ${TEMP}/bfTvBCOInterpolateImageFunctionVectorImageTest.tif
@@ -824,21 +824,21 @@ ADD_TEST(bfTvBCOInterpolateImageFunctionVectorImageTest ${BASICFILTERS_TESTS6}
 
 ADD_TEST(bfTvWindowedSincInterpolateImageCosineFunction ${BASICFILTERS_TESTS7}
      --compare-ascii ${NOTOL}
-     		     ${BASELINE_FILES}/bfWindowedSincInterpolateImageCosineFunctionOutput.txt
-		     ${TEMP}/bfWindowedSincInterpolateImageCosineFunctionOutput.txt
+                          ${BASELINE_FILES}/bfWindowedSincInterpolateImageCosineFunctionOutput.txt
+                     ${TEMP}/bfWindowedSincInterpolateImageCosineFunctionOutput.txt
         otbWindowedSincInterpolateImageCosineFunction
-		${INPUTDATA}/poupees.tif
-		${TEMP}/bfWindowedSincInterpolateImageCosineFunctionOutput.txt
-		3 # radius
-		0.5 0.5
-		127.33 44.9
-		259.67 21.43
-		12.13 61.79
-		89.5 11
-		128 128
-		127.255 128.73
-		-1 -1
-		)
+                ${INPUTDATA}/poupees.tif
+                ${TEMP}/bfWindowedSincInterpolateImageCosineFunctionOutput.txt
+                3 # radius
+                0.5 0.5
+                127.33 44.9
+                259.67 21.43
+                12.13 61.79
+                89.5 11
+                128 128
+                127.255 128.73
+                -1 -1
+                )
 
 # -------            otb::WindowedSincInterpolateImageWelchFunction  ------------------------------
  ADD_TEST(bfTuWindowedSincInterpolateImageWelchFunctionNew ${BASICFILTERS_TESTS7}
@@ -846,76 +846,76 @@ ADD_TEST(bfTvWindowedSincInterpolateImageCosineFunction ${BASICFILTERS_TESTS7}
 
 ADD_TEST(bfTvWindowedSincInterpolateImageWelchFunction ${BASICFILTERS_TESTS7}
      --compare-ascii ${NOTOL}
-     		     ${BASELINE_FILES}/bfWindowedSincInterpolateImageWelchFunctionOutput.txt
-		     ${TEMP}/bfWindowedSincInterpolateImageWelchFunctionOutput.txt
+                          ${BASELINE_FILES}/bfWindowedSincInterpolateImageWelchFunctionOutput.txt
+                     ${TEMP}/bfWindowedSincInterpolateImageWelchFunctionOutput.txt
         otbWindowedSincInterpolateImageWelchFunction
-		${INPUTDATA}/poupees.tif
-		${TEMP}/bfWindowedSincInterpolateImageWelchFunctionOutput.txt
-		3 # radius
-		0.5 0.5
-		127.33 44.9
-		259.67 21.43
-		12.13 61.79
-		89.5 11
-		128 128
-		127.255 128.73
-		-1 -1
-		)
+                ${INPUTDATA}/poupees.tif
+                ${TEMP}/bfWindowedSincInterpolateImageWelchFunctionOutput.txt
+                3 # radius
+                0.5 0.5
+                127.33 44.9
+                259.67 21.43
+                12.13 61.79
+                89.5 11
+                128 128
+                127.255 128.73
+                -1 -1
+                )
 # -------            otb::WindowedSincInterpolateImageLanczosFunction  ------------------------------
  ADD_TEST(bfTuWindowedSincInterpolateImageLanczosFunctionNew ${BASICFILTERS_TESTS7}
          otbWindowedSincInterpolateImageLanczosFunctionNew)
 
 ADD_TEST(bfTvWindowedSincInterpolateImageLanczosFunction ${BASICFILTERS_TESTS7}
      --compare-ascii ${NOTOL}
-     		     ${BASELINE_FILES}/bfWindowedSincInterpolateImageLanczosFunctionOutput.txt
-		     ${TEMP}/bfWindowedSincInterpolateImageLanczosFunctionOutput.txt
+                          ${BASELINE_FILES}/bfWindowedSincInterpolateImageLanczosFunctionOutput.txt
+                     ${TEMP}/bfWindowedSincInterpolateImageLanczosFunctionOutput.txt
         otbWindowedSincInterpolateImageLanczosFunction
-		${INPUTDATA}/poupees.tif
-		${TEMP}/bfWindowedSincInterpolateImageLanczosFunctionOutput.txt
-		3 # radius
-		0.5 0.5
-		127.33 44.9
-		259.67 21.43
-		12.13 61.79
-		89.5 11
-		128 128
-		127.255 128.73
-		-1 -1
-		)
+                ${INPUTDATA}/poupees.tif
+                ${TEMP}/bfWindowedSincInterpolateImageLanczosFunctionOutput.txt
+                3 # radius
+                0.5 0.5
+                127.33 44.9
+                259.67 21.43
+                12.13 61.79
+                89.5 11
+                128 128
+                127.255 128.73
+                -1 -1
+                )
 # -------            otb::WindowedSincInterpolateImageBlackmanFunction  ------------------------------
  ADD_TEST(bfTuWindowedSincInterpolateImageBlackmanFunctionNew ${BASICFILTERS_TESTS7}
          otbWindowedSincInterpolateImageBlackmanFunctionNew)
 
 ADD_TEST(bfTvWindowedSincInterpolateImageBlackmanFunction ${BASICFILTERS_TESTS7}
      --compare-ascii ${NOTOL}
-     		     ${BASELINE_FILES}/bfWindowedSincInterpolateImageBlackmanFunctionOutput.txt
-		     ${TEMP}/bfWindowedSincInterpolateImageBlackmanFunctionOutput.txt
+                          ${BASELINE_FILES}/bfWindowedSincInterpolateImageBlackmanFunctionOutput.txt
+                     ${TEMP}/bfWindowedSincInterpolateImageBlackmanFunctionOutput.txt
         otbWindowedSincInterpolateImageBlackmanFunction
-		${INPUTDATA}/poupees.tif
-		${TEMP}/bfWindowedSincInterpolateImageBlackmanFunctionOutput.txt
-		3 # radius
-		0.5 0.5
-		127.33 44.9
-		259.67 21.43
-		12.13 61.79
-		89.5 11
-		128 128
-		127.255 128.73
-		-1 -1
-		)
+                ${INPUTDATA}/poupees.tif
+                ${TEMP}/bfWindowedSincInterpolateImageBlackmanFunctionOutput.txt
+                3 # radius
+                0.5 0.5
+                127.33 44.9
+                259.67 21.43
+                12.13 61.79
+                89.5 11
+                128 128
+                127.255 128.73
+                -1 -1
+                )
 
 ADD_TEST(bfTvProlateValidationTest ${BASICFILTERS_TESTS7}
   --compare-image ${EPSILON_7}
-     		  ${BASELINE}/bfTvProlateValidationTest.tif
-		  ${TEMP}/bfTvProlateValidationTest.tif
+                       ${BASELINE}/bfTvProlateValidationTest.tif
+                  ${TEMP}/bfTvProlateValidationTest.tif
         otbProlateValidationTest
-		${INPUTDATA}/poupees.tif
-		${TEMP}/bfTvProlateValidationTest.tif
-		3 # radius
-		0.5 # factor
-		512 # size
-		${TEMP}/defaultprolatevalidationtest.tif # nearest neighborhood interpolator : NOT GENERATE IN THE TEST
-		)
+                ${INPUTDATA}/poupees.tif
+                ${TEMP}/bfTvProlateValidationTest.tif
+                3 # radius
+                0.5 # factor
+                512 # size
+                ${TEMP}/defaultprolatevalidationtest.tif # nearest neighborhood interpolator : NOT GENERATE IN THE TEST
+                )
 
 
 # -------            otb::VectorImageToAmplitudeImageFilter  ------------------------------
@@ -925,8 +925,8 @@ otbVectorImageToAmplitudeImageFilterNew)
 
 ADD_TEST(bfTvVectorImageToAmplitudeImageFilter ${BASICFILTERS_TESTS7}
  --compare-image ${EPSILON_7}
-     		  ${BASELINE}/bfTvVectorImageToAmplitudeImageFilterOutput.tif
-		  ${TEMP}/bfTvVectorImageToAmplitudeImageFilterOutput.tif
+                       ${BASELINE}/bfTvVectorImageToAmplitudeImageFilterOutput.tif
+                  ${TEMP}/bfTvVectorImageToAmplitudeImageFilterOutput.tif
 otbVectorImageToAmplitudeImageFilter
 ${INPUTDATA}/poupees.tif
 ${TEMP}/bfTvVectorImageToAmplitudeImageFilterOutput.tif
@@ -940,8 +940,8 @@ otbVectorImageToAmplitudeImageFilterNew)
 
 ADD_TEST(bfTvVectorImageToAmplitudeImageFilter ${BASICFILTERS_TESTS7}
  --compare-image ${EPSILON_7}
-     		  ${BASELINE}/bfTvVectorImageToAmplitudeImageFilterOutput.tif
-		  ${TEMP}/bfTvVectorImageToAmplitudeImageFilterOutput.tif
+                       ${BASELINE}/bfTvVectorImageToAmplitudeImageFilterOutput.tif
+                  ${TEMP}/bfTvVectorImageToAmplitudeImageFilterOutput.tif
 otbVectorImageToAmplitudeImageFilter
 ${INPUTDATA}/poupees.tif
 ${TEMP}/bfTvVectorImageToAmplitudeImageFilterOutput.tif
@@ -954,12 +954,12 @@ ${TEMP}/bfTvVectorImageToAmplitudeImageFilterOutput.tif
 
 
  ADD_TEST(bfTvVectorImageToIntensityImageFilter ${BASICFILTERS_TESTS7}
-		--compare-image ${EPSILON_7}
-		    ${BASELINE}/bfTvVectorImageToIntensityImageOutput.tif
-		    ${TEMP}/bfTvVectorImageToIntensityImageOutput.tif
-		    otbVectorImageToIntensityImageFilter
-		    ${INPUTDATA}/QB_Toulouse_Ortho_XS.tif
-	            ${TEMP}/bfTvVectorImageToIntensityImageOutput.tif
+                --compare-image ${EPSILON_7}
+                    ${BASELINE}/bfTvVectorImageToIntensityImageOutput.tif
+                    ${TEMP}/bfTvVectorImageToIntensityImageOutput.tif
+                    otbVectorImageToIntensityImageFilter
+                    ${INPUTDATA}/QB_Toulouse_Ortho_XS.tif
+                    ${TEMP}/bfTvVectorImageToIntensityImageOutput.tif
 )
 
 # -------            otb::LabelizeConnectedThresholdImageFilter   ----------------------------
@@ -968,14 +968,14 @@ ${TEMP}/bfTvVectorImageToAmplitudeImageFilterOutput.tif
          otbLabelizeConnectedThresholdImageFilterNew)
 
   ADD_TEST(bfTvLabelizeConnectedThresholdImageFilter ${BASICFILTERS_TESTS8}
-		--compare-image ${EPSILON_7}
-		    ${BASELINE}/bfTvLabelizeConnectedThresholdImageFilterOutput.png
-		    ${TEMP}/bfTvLabelizeConnectedThresholdImageFilterOutput.png
-		    otbLabelizeConnectedThresholdImageFilter
-		    ${INPUTDATA}/QB_Suburb.png
-	            ${TEMP}/bfTvLabelizeConnectedThresholdImageFilterOutput.png
-		    170 170
-		    80 80
+                --compare-image ${EPSILON_7}
+                    ${BASELINE}/bfTvLabelizeConnectedThresholdImageFilterOutput.png
+                    ${TEMP}/bfTvLabelizeConnectedThresholdImageFilterOutput.png
+                    otbLabelizeConnectedThresholdImageFilter
+                    ${INPUTDATA}/QB_Suburb.png
+                    ${TEMP}/bfTvLabelizeConnectedThresholdImageFilterOutput.png
+                    170 170
+                    80 80
 )
 
 # -------            otb::EuclideanDistanceWithMissingValue   ----------------------------
@@ -1003,14 +1003,14 @@ ${TEMP}/bfTvVectorImageToAmplitudeImageFilterOutput.tif
          otbLabelizeNeighborhoodConnectedImageFilterNew)
 
   ADD_TEST(bfTvLabelizeNeighborhoodConnectedImageFilter ${BASICFILTERS_TESTS8}
-		--compare-image ${EPSILON_7}
-		    ${BASELINE}/bfTvLabelizeNeighborhoodConnectedImageFilterOutput.png
-		    ${TEMP}/bfTvLabelizeNeighborhoodConnectedImageFilterOutput.png
-		    otbLabelizeNeighborhoodConnectedImageFilter
-		    ${INPUTDATA}/QB_Suburb.png
-	            ${TEMP}/bfTvLabelizeNeighborhoodConnectedImageFilterOutput.png
-		    170 170
-		    80 80
+                --compare-image ${EPSILON_7}
+                    ${BASELINE}/bfTvLabelizeNeighborhoodConnectedImageFilterOutput.png
+                    ${TEMP}/bfTvLabelizeNeighborhoodConnectedImageFilterOutput.png
+                    otbLabelizeNeighborhoodConnectedImageFilter
+                    ${INPUTDATA}/QB_Suburb.png
+                    ${TEMP}/bfTvLabelizeNeighborhoodConnectedImageFilterOutput.png
+                    170 170
+                    80 80
 )
 
 # -------            otb::LabelizeConfidenceConnectedImageFilter   ----------------------------
@@ -1019,13 +1019,13 @@ ${TEMP}/bfTvVectorImageToAmplitudeImageFilterOutput.tif
          otbLabelizeConfidenceConnectedImageFilterNew)
 
   ADD_TEST(bfTvLabelizeConfidenceConnectedImageFilter ${BASICFILTERS_TESTS8}
-		--compare-image ${EPSILON_7}
-		    ${BASELINE}/bfTvLabelizeConfidenceConnectedImageFilterOutput.png
-		    ${TEMP}/bfTvLabelizeConfidenceConnectedImageFilterOutput.png
-		    otbLabelizeConfidenceConnectedImageFilter
-		    ${INPUTDATA}/QB_Suburb.png
-		    ${TEMP}/bfTvLabelizeConfidenceConnectedImageFilterOutput.png
-		    127 127 2 3 1
+                --compare-image ${EPSILON_7}
+                    ${BASELINE}/bfTvLabelizeConfidenceConnectedImageFilterOutput.png
+                    ${TEMP}/bfTvLabelizeConfidenceConnectedImageFilterOutput.png
+                    otbLabelizeConfidenceConnectedImageFilter
+                    ${INPUTDATA}/QB_Suburb.png
+                    ${TEMP}/bfTvLabelizeConfidenceConnectedImageFilterOutput.png
+                    127 127 2 3 1
 )
 
 # -------            otb::ConvolutionImageFilter   ----------------------------
@@ -1034,12 +1034,12 @@ ADD_TEST(bfTuConvolutionImageFilterNew ${BASICFILTERS_TESTS8}
          otbConvolutionImageFilterNew)
 
 ADD_TEST(bfTvConvolutionImageFilter ${BASICFILTERS_TESTS8}
-		--compare-image ${EPSILON_7}
-		    ${BASELINE}/bfTvConvolutionImageFilter.tif
-		    ${TEMP}/bfTvConvolutionImageFilter.tif
-		    otbConvolutionImageFilter
-		    ${INPUTDATA}/QB_Suburb.png
-		    ${TEMP}/bfTvConvolutionImageFilter.tif
+                --compare-image ${EPSILON_7}
+                    ${BASELINE}/bfTvConvolutionImageFilter.tif
+                    ${TEMP}/bfTvConvolutionImageFilter.tif
+                    otbConvolutionImageFilter
+                    ${INPUTDATA}/QB_Suburb.png
+                    ${TEMP}/bfTvConvolutionImageFilter.tif
 )
 
 
@@ -1049,12 +1049,12 @@ ADD_TEST(bfTuScalarToRainbowRGBPixelFunctorNew ${BASICFILTERS_TESTS8}
          otbScalarToRainbowRGBPixelFunctorNew)
 
 ADD_TEST(bfTvScalarToRainbowRGBPixelFunctor ${BASICFILTERS_TESTS8}
-		--compare-image ${EPSILON_7}
-		    ${BASELINE}/bfTvScalarToRainbowRGBPixelFunctor.png
-		    ${TEMP}/bfTvScalarToRainbowRGBPixelFunctor.png
-		    otbScalarToRainbowRGBPixelFunctor
-		    ${INPUTDATA}/QB_Suburb.png
-		    ${TEMP}/bfTvScalarToRainbowRGBPixelFunctor.png
+                --compare-image ${EPSILON_7}
+                    ${BASELINE}/bfTvScalarToRainbowRGBPixelFunctor.png
+                    ${TEMP}/bfTvScalarToRainbowRGBPixelFunctor.png
+                    otbScalarToRainbowRGBPixelFunctor
+                    ${INPUTDATA}/QB_Suburb.png
+                    ${TEMP}/bfTvScalarToRainbowRGBPixelFunctor.png
 )
 
 # -------            otb::AmplitudePhaseToRGBFunctor  -----------------
@@ -1063,12 +1063,12 @@ ADD_TEST(bfTuAmplitudePhaseToRGBFunctorNew ${BASICFILTERS_TESTS8}
          otbAmplitudePhaseToRGBFunctorNew)
 
 ADD_TEST(bfTvAmplitudePhaseToRGBFunctor ${BASICFILTERS_TESTS8}
-		--compare-image ${EPSILON_7}
-		    ${BASELINE}/bfTvAmplitudePhaseToRGBFunctor.png
-		    ${TEMP}/bfTvAmplitudePhaseToRGBFunctor.png
-		    otbAmplitudePhaseToRGBFunctor
-		    ${INPUTDATA}/RSAT_imagery_HH.tif
-		    ${TEMP}/bfTvAmplitudePhaseToRGBFunctor.png
+                --compare-image ${EPSILON_7}
+                    ${BASELINE}/bfTvAmplitudePhaseToRGBFunctor.png
+                    ${TEMP}/bfTvAmplitudePhaseToRGBFunctor.png
+                    otbAmplitudePhaseToRGBFunctor
+                    ${INPUTDATA}/RSAT_imagery_HH.tif
+                    ${TEMP}/bfTvAmplitudePhaseToRGBFunctor.png
 )
 
 # -------            otb::VarianceImageFilter  -----------------
@@ -1091,13 +1091,13 @@ ADD_TEST(bfTuBoxAndWhiskerImageFilterNew ${BASICFILTERS_TESTS8}
          otbBoxAndWhiskerImageFilterNew )
          
 ADD_TEST(bfTvBoxAndWhiskerImageFilter ${BASICFILTERS_TESTS8}
-  --compare-image ${EPSILON_7}  
-  		${BASELINE}/bfBoxAndWhiskerImageFilter_05_05.tif
+  --compare-image ${EPSILON_7}
+                  ${BASELINE}/bfBoxAndWhiskerImageFilter_05_05.tif
         ${TEMP}/bfBoxAndWhiskerImageFilter_05_05.tif
-    	otbBoxAndWhiskerImageFilter
-     	${INPUTDATA}/poupees.tif
-		${TEMP}/bfBoxAndWhiskerImageFilter_05_05.tif
-		05 05)
+            otbBoxAndWhiskerImageFilter
+             ${INPUTDATA}/poupees.tif
+                ${TEMP}/bfBoxAndWhiskerImageFilter_05_05.tif
+                05 05)
          
 
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -1114,176 +1114,176 @@ ADD_TEST(bfTvContinuousMinimumMaximumImageCalculatorTest ${BASICFILTERS_TESTS9}
 
 ADD_TEST(bfTuMeanShiftImageFilterNew ${BASICFILTERS_TESTS9}
         otbMeanShiftImageFilterNew )
-# Nb Stream = not defined and Nb Thread = not defined 
+# Nb Stream = not defined and Nb Thread = not defined
 ADD_TEST(bfTvMeanShiftImageFilter ${BASICFILTERS_TESTS9}
 --compare-n-images ${EPSILON_7} 4
-		${BASELINE}/bfMeanShiftImageFilterOutput.tif
-		${TEMP}/bfMeanShiftImageFilterOutput.tif
-		${BASELINE}/bfMeanShiftImageFilterClusteredOutput.tif
-		${TEMP}/bfMeanShiftImageFilterClusteredOutput.tif
-		${BASELINE}/bfMeanShiftImageFilterLabeledClusteredOutput.tif
-		${TEMP}/bfMeanShiftImageFilterLabeledClusteredOutput.tif
-		${BASELINE}/bfMeanShiftImageFilterClusterBoundariesOutput.tif
-		${TEMP}/bfMeanShiftImageFilterClusterBoundariesOutput.tif
+                ${BASELINE}/bfMeanShiftImageFilterOutput.tif
+                ${TEMP}/bfMeanShiftImageFilterOutput.tif
+                ${BASELINE}/bfMeanShiftImageFilterClusteredOutput.tif
+                ${TEMP}/bfMeanShiftImageFilterClusteredOutput.tif
+                ${BASELINE}/bfMeanShiftImageFilterLabeledClusteredOutput.tif
+                ${TEMP}/bfMeanShiftImageFilterLabeledClusteredOutput.tif
+                ${BASELINE}/bfMeanShiftImageFilterClusterBoundariesOutput.tif
+                ${TEMP}/bfMeanShiftImageFilterClusterBoundariesOutput.tif
         otbMeanShiftImageFilter
-	${INPUTDATA}/QB_Suburb.png
-	${TEMP}/bfMeanShiftImageFilterOutput.tif
-	${TEMP}/bfMeanShiftImageFilterClusteredOutput.tif
-	${TEMP}/bfMeanShiftImageFilterLabeledClusteredOutput.tif
-	${TEMP}/bfMeanShiftImageFilterClusterBoundariesOutput.tif
-	16 16 10 1.0 0 0
-	)
+        ${INPUTDATA}/QB_Suburb.png
+        ${TEMP}/bfMeanShiftImageFilterOutput.tif
+        ${TEMP}/bfMeanShiftImageFilterClusteredOutput.tif
+        ${TEMP}/bfMeanShiftImageFilterLabeledClusteredOutput.tif
+        ${TEMP}/bfMeanShiftImageFilterClusterBoundariesOutput.tif
+        16 16 10 1.0 0 0
+        )
 # Nb Stream = 1 and Nb Thread = 1
 ADD_TEST(bfTvMeanShiftImageFilterNotStreamedNotThreaded ${BASICFILTERS_TESTS9}
 --compare-n-images ${EPSILON_7} 4
-		${BASELINE}/bfMeanShiftImageFilterOutput.tif
-		${TEMP}/bfMeanShiftImageFilterNotStreamedNotThreadedOutput.tif
-		${BASELINE}/bfMeanShiftImageFilterClusteredOutput.tif
-		${TEMP}/bfMeanShiftImageFilterNotStreamedNotThreadedClusteredOutput.tif
-		${BASELINE}/bfMeanShiftImageFilterLabeledClusteredOutput.tif
-		${TEMP}/bfMeanShiftImageFilterNotStreamedNotThreadedLabeledClusteredOutput.tif
-		${BASELINE}/bfMeanShiftImageFilterClusterBoundariesOutput.tif
-		${TEMP}/bfMeanShiftImageFilterNotStreamedNotThreadedClusterBoundariesOutput.tif
+                ${BASELINE}/bfMeanShiftImageFilterOutput.tif
+                ${TEMP}/bfMeanShiftImageFilterNotStreamedNotThreadedOutput.tif
+                ${BASELINE}/bfMeanShiftImageFilterClusteredOutput.tif
+                ${TEMP}/bfMeanShiftImageFilterNotStreamedNotThreadedClusteredOutput.tif
+                ${BASELINE}/bfMeanShiftImageFilterLabeledClusteredOutput.tif
+                ${TEMP}/bfMeanShiftImageFilterNotStreamedNotThreadedLabeledClusteredOutput.tif
+                ${BASELINE}/bfMeanShiftImageFilterClusterBoundariesOutput.tif
+                ${TEMP}/bfMeanShiftImageFilterNotStreamedNotThreadedClusterBoundariesOutput.tif
         otbMeanShiftImageFilter
-	${INPUTDATA}/QB_Suburb.png
-	${TEMP}/bfMeanShiftImageFilterNotStreamedNotThreadedOutput.tif
-	${TEMP}/bfMeanShiftImageFilterNotStreamedNotThreadedClusteredOutput.tif
-	${TEMP}/bfMeanShiftImageFilterNotStreamedNotThreadedLabeledClusteredOutput.tif
-	${TEMP}/bfMeanShiftImageFilterNotStreamedNotThreadedClusterBoundariesOutput.tif
-	16 16 10 1.0 1 1
-	)
+        ${INPUTDATA}/QB_Suburb.png
+        ${TEMP}/bfMeanShiftImageFilterNotStreamedNotThreadedOutput.tif
+        ${TEMP}/bfMeanShiftImageFilterNotStreamedNotThreadedClusteredOutput.tif
+        ${TEMP}/bfMeanShiftImageFilterNotStreamedNotThreadedLabeledClusteredOutput.tif
+        ${TEMP}/bfMeanShiftImageFilterNotStreamedNotThreadedClusterBoundariesOutput.tif
+        16 16 10 1.0 1 1
+        )
 # Nb Stream = 4 and Nb Thread = 1
 ADD_TEST(bfTvMeanShiftImageFilterStreamed4_Threaded1 ${BASICFILTERS_TESTS9}
 --compare-n-images ${EPSILON_7} 4
-		${BASELINE}/bfMeanShiftImageFilterStreamed4Threaded1Output.tif
-		${TEMP}/bfMeanShiftImageFilterStreamed4Threaded1Output.tif
-		${BASELINE}/bfMeanShiftImageFilterStreamed4Threaded1ClusteredOutput.tif
-		${TEMP}/bfMeanShiftImageFilterStreamed4Threaded1ClusteredOutput.tif
-		${BASELINE}/bfMeanShiftImageFilterStreamed4Threaded1LabeledClusteredOutput.tif
-		${TEMP}/bfMeanShiftImageFilterStreamed4Threaded1LabeledClusteredOutput.tif
-		${BASELINE}/bfMeanShiftImageFilterStreamed4Threaded1ClusterBoundariesOutput.tif
-		${TEMP}/bfMeanShiftImageFilterStreamed4Threaded1ClusterBoundariesOutput.tif
+                ${BASELINE}/bfMeanShiftImageFilterStreamed4Threaded1Output.tif
+                ${TEMP}/bfMeanShiftImageFilterStreamed4Threaded1Output.tif
+                ${BASELINE}/bfMeanShiftImageFilterStreamed4Threaded1ClusteredOutput.tif
+                ${TEMP}/bfMeanShiftImageFilterStreamed4Threaded1ClusteredOutput.tif
+                ${BASELINE}/bfMeanShiftImageFilterStreamed4Threaded1LabeledClusteredOutput.tif
+                ${TEMP}/bfMeanShiftImageFilterStreamed4Threaded1LabeledClusteredOutput.tif
+                ${BASELINE}/bfMeanShiftImageFilterStreamed4Threaded1ClusterBoundariesOutput.tif
+                ${TEMP}/bfMeanShiftImageFilterStreamed4Threaded1ClusterBoundariesOutput.tif
         otbMeanShiftImageFilter
-	${INPUTDATA}/QB_Suburb.png
-	${TEMP}/bfMeanShiftImageFilterStreamed4Threaded1Output.tif
-	${TEMP}/bfMeanShiftImageFilterStreamed4Threaded1ClusteredOutput.tif
-	${TEMP}/bfMeanShiftImageFilterStreamed4Threaded1LabeledClusteredOutput.tif
-	${TEMP}/bfMeanShiftImageFilterStreamed4Threaded1ClusterBoundariesOutput.tif
-	16 16 10 1.0 4 1
-	)
+        ${INPUTDATA}/QB_Suburb.png
+        ${TEMP}/bfMeanShiftImageFilterStreamed4Threaded1Output.tif
+        ${TEMP}/bfMeanShiftImageFilterStreamed4Threaded1ClusteredOutput.tif
+        ${TEMP}/bfMeanShiftImageFilterStreamed4Threaded1LabeledClusteredOutput.tif
+        ${TEMP}/bfMeanShiftImageFilterStreamed4Threaded1ClusterBoundariesOutput.tif
+        16 16 10 1.0 4 1
+        )
 # Nb Stream = 1 and Nb Thread = 4
 ADD_TEST(bfTvMeanShiftImageFilterStreamed1_Threaded4 ${BASICFILTERS_TESTS9}
 --compare-n-images ${EPSILON_7} 4
-		${BASELINE}/bfMeanShiftImageFilterStreamed1Threaded4Output.tif
-		${TEMP}/bfMeanShiftImageFilterStreamed1Threaded4Output.tif
-		${BASELINE}/bfMeanShiftImageFilterStreamed1Threaded4ClusteredOutput.tif
-		${TEMP}/bfMeanShiftImageFilterStreamed1Threaded4ClusteredOutput.tif
-		${BASELINE}/bfMeanShiftImageFilterStreamed1Threaded4LabeledClusteredOutput.tif
-		${TEMP}/bfMeanShiftImageFilterStreamed1Threaded4LabeledClusteredOutput.tif
-		${BASELINE}/bfMeanShiftImageFilterStreamed1Threaded4ClusterBoundariesOutput.tif
-		${TEMP}/bfMeanShiftImageFilterStreamed1Threaded4ClusterBoundariesOutput.tif
+                ${BASELINE}/bfMeanShiftImageFilterStreamed1Threaded4Output.tif
+                ${TEMP}/bfMeanShiftImageFilterStreamed1Threaded4Output.tif
+                ${BASELINE}/bfMeanShiftImageFilterStreamed1Threaded4ClusteredOutput.tif
+                ${TEMP}/bfMeanShiftImageFilterStreamed1Threaded4ClusteredOutput.tif
+                ${BASELINE}/bfMeanShiftImageFilterStreamed1Threaded4LabeledClusteredOutput.tif
+                ${TEMP}/bfMeanShiftImageFilterStreamed1Threaded4LabeledClusteredOutput.tif
+                ${BASELINE}/bfMeanShiftImageFilterStreamed1Threaded4ClusterBoundariesOutput.tif
+                ${TEMP}/bfMeanShiftImageFilterStreamed1Threaded4ClusterBoundariesOutput.tif
         otbMeanShiftImageFilter
-	${INPUTDATA}/QB_Suburb.png
-	${TEMP}/bfMeanShiftImageFilterStreamed1Threaded4Output.tif
-	${TEMP}/bfMeanShiftImageFilterStreamed1Threaded4ClusteredOutput.tif
-	${TEMP}/bfMeanShiftImageFilterStreamed1Threaded4LabeledClusteredOutput.tif
-	${TEMP}/bfMeanShiftImageFilterStreamed1Threaded4ClusterBoundariesOutput.tif
-	16 16 10 1.0 1 4
-	)
-# Nb Stream = 2 and Nb Thread = 2	
+        ${INPUTDATA}/QB_Suburb.png
+        ${TEMP}/bfMeanShiftImageFilterStreamed1Threaded4Output.tif
+        ${TEMP}/bfMeanShiftImageFilterStreamed1Threaded4ClusteredOutput.tif
+        ${TEMP}/bfMeanShiftImageFilterStreamed1Threaded4LabeledClusteredOutput.tif
+        ${TEMP}/bfMeanShiftImageFilterStreamed1Threaded4ClusterBoundariesOutput.tif
+        16 16 10 1.0 1 4
+        )
+# Nb Stream = 2 and Nb Thread = 2
 ADD_TEST(bfTvMeanShiftImageFilterStreamed2_Threaded2 ${BASICFILTERS_TESTS9}
 --compare-n-images ${EPSILON_7} 4
-		${BASELINE}/bfMeanShiftImageFilterStreamed2Threaded2Output.tif
-		${TEMP}/bfMeanShiftImageFilterStreamed2Threaded2Output.tif
-		${BASELINE}/bfMeanShiftImageFilterStreamed2Threaded2ClusteredOutput.tif
-		${TEMP}/bfMeanShiftImageFilterStreamed2Threaded2ClusteredOutput.tif
-		${BASELINE}/bfMeanShiftImageFilterStreamed2Threaded2LabeledClusteredOutput.tif
-		${TEMP}/bfMeanShiftImageFilterStreamed2Threaded2LabeledClusteredOutput.tif
-		${BASELINE}/bfMeanShiftImageFilterStreamed2Threaded2ClusterBoundariesOutput.tif
-		${TEMP}/bfMeanShiftImageFilterStreamed2Threaded2ClusterBoundariesOutput.tif
+                ${BASELINE}/bfMeanShiftImageFilterStreamed2Threaded2Output.tif
+                ${TEMP}/bfMeanShiftImageFilterStreamed2Threaded2Output.tif
+                ${BASELINE}/bfMeanShiftImageFilterStreamed2Threaded2ClusteredOutput.tif
+                ${TEMP}/bfMeanShiftImageFilterStreamed2Threaded2ClusteredOutput.tif
+                ${BASELINE}/bfMeanShiftImageFilterStreamed2Threaded2LabeledClusteredOutput.tif
+                ${TEMP}/bfMeanShiftImageFilterStreamed2Threaded2LabeledClusteredOutput.tif
+                ${BASELINE}/bfMeanShiftImageFilterStreamed2Threaded2ClusterBoundariesOutput.tif
+                ${TEMP}/bfMeanShiftImageFilterStreamed2Threaded2ClusterBoundariesOutput.tif
         otbMeanShiftImageFilter
-	${INPUTDATA}/QB_Suburb.png
-	${TEMP}/bfMeanShiftImageFilterStreamed2Threaded2Output.tif
-	${TEMP}/bfMeanShiftImageFilterStreamed2Threaded2ClusteredOutput.tif
-	${TEMP}/bfMeanShiftImageFilterStreamed2Threaded2LabeledClusteredOutput.tif
-	${TEMP}/bfMeanShiftImageFilterStreamed2Threaded2ClusterBoundariesOutput.tif
-	16 16 10 1.0 2 2
-	)
+        ${INPUTDATA}/QB_Suburb.png
+        ${TEMP}/bfMeanShiftImageFilterStreamed2Threaded2Output.tif
+        ${TEMP}/bfMeanShiftImageFilterStreamed2Threaded2ClusteredOutput.tif
+        ${TEMP}/bfMeanShiftImageFilterStreamed2Threaded2LabeledClusteredOutput.tif
+        ${TEMP}/bfMeanShiftImageFilterStreamed2Threaded2ClusterBoundariesOutput.tif
+        16 16 10 1.0 2 2
+        )
 
 # Nb Stream = 4 and Nb Thread = 4
 ADD_TEST(bfTvMeanShiftImageFilterStreamed4_Threaded4 ${BASICFILTERS_TESTS9}
 --compare-n-images ${EPSILON_7} 4
-		${BASELINE}/bfMeanShiftImageFilterStreamed4Threaded4Output.tif
-		${TEMP}/bfMeanShiftImageFilterStreamed4Threaded4Output.tif
-		${BASELINE}/bfMeanShiftImageFilterStreamed4Threaded4ClusteredOutput.tif
-		${TEMP}/bfMeanShiftImageFilterStreamed4Threaded4ClusteredOutput.tif
-		${BASELINE}/bfMeanShiftImageFilterStreamed4Threaded4LabeledClusteredOutput.tif
-		${TEMP}/bfMeanShiftImageFilterStreamed4Threaded4LabeledClusteredOutput.tif
-		${BASELINE}/bfMeanShiftImageFilterStreamed4Threaded4ClusterBoundariesOutput.tif
-		${TEMP}/bfMeanShiftImageFilterStreamed4Threaded4ClusterBoundariesOutput.tif
+                ${BASELINE}/bfMeanShiftImageFilterStreamed4Threaded4Output.tif
+                ${TEMP}/bfMeanShiftImageFilterStreamed4Threaded4Output.tif
+                ${BASELINE}/bfMeanShiftImageFilterStreamed4Threaded4ClusteredOutput.tif
+                ${TEMP}/bfMeanShiftImageFilterStreamed4Threaded4ClusteredOutput.tif
+                ${BASELINE}/bfMeanShiftImageFilterStreamed4Threaded4LabeledClusteredOutput.tif
+                ${TEMP}/bfMeanShiftImageFilterStreamed4Threaded4LabeledClusteredOutput.tif
+                ${BASELINE}/bfMeanShiftImageFilterStreamed4Threaded4ClusterBoundariesOutput.tif
+                ${TEMP}/bfMeanShiftImageFilterStreamed4Threaded4ClusterBoundariesOutput.tif
         otbMeanShiftImageFilter
-	${INPUTDATA}/QB_Suburb.png
-	${TEMP}/bfMeanShiftImageFilterStreamed4Threaded4Output.tif
-	${TEMP}/bfMeanShiftImageFilterStreamed4Threaded4ClusteredOutput.tif
-	${TEMP}/bfMeanShiftImageFilterStreamed4Threaded4LabeledClusteredOutput.tif
-	${TEMP}/bfMeanShiftImageFilterStreamed4Threaded4ClusterBoundariesOutput.tif
-	16 16 10 1.0 4 4
-	)
+        ${INPUTDATA}/QB_Suburb.png
+        ${TEMP}/bfMeanShiftImageFilterStreamed4Threaded4Output.tif
+        ${TEMP}/bfMeanShiftImageFilterStreamed4Threaded4ClusteredOutput.tif
+        ${TEMP}/bfMeanShiftImageFilterStreamed4Threaded4LabeledClusteredOutput.tif
+        ${TEMP}/bfMeanShiftImageFilterStreamed4Threaded4ClusterBoundariesOutput.tif
+        16 16 10 1.0 4 4
+        )
 
 ADD_TEST(bfTuMeanShiftVectorImageFilterNew ${BASICFILTERS_TESTS9}
         otbMeanShiftVectorImageFilterNew )
 
 ADD_TEST(bfTvMeanShiftVectorImageFilter ${BASICFILTERS_TESTS9}
 --compare-n-images ${EPSILON_7} 4
-		${BASELINE}/bfMeanShiftVectorImageFilterOutput.tif
-		${TEMP}/bfMeanShiftVectorImageFilterOutput.tif
-		${BASELINE}/bfMeanShiftVectorImageFilterClusteredOutput.tif
-		${TEMP}/bfMeanShiftVectorImageFilterClusteredOutput.tif
-		${BASELINE}/bfMeanShiftVectorImageFilterLabeledClusteredOutput.tif
-		${TEMP}/bfMeanShiftVectorImageFilterLabeledClusteredOutput.tif
-		${BASELINE}/bfMeanShiftVectorImageFilterClusterBoundariesOutput.tif
-		${TEMP}/bfMeanShiftVectorImageFilterClusterBoundariesOutput.tif
+                ${BASELINE}/bfMeanShiftVectorImageFilterOutput.tif
+                ${TEMP}/bfMeanShiftVectorImageFilterOutput.tif
+                ${BASELINE}/bfMeanShiftVectorImageFilterClusteredOutput.tif
+                ${TEMP}/bfMeanShiftVectorImageFilterClusteredOutput.tif
+                ${BASELINE}/bfMeanShiftVectorImageFilterLabeledClusteredOutput.tif
+                ${TEMP}/bfMeanShiftVectorImageFilterLabeledClusteredOutput.tif
+                ${BASELINE}/bfMeanShiftVectorImageFilterClusterBoundariesOutput.tif
+                ${TEMP}/bfMeanShiftVectorImageFilterClusterBoundariesOutput.tif
         otbMeanShiftVectorImageFilter
-	${INPUTDATA}/qb_RoadExtract2sub200x200.tif
-	${TEMP}/bfMeanShiftVectorImageFilterOutput.tif
-	${TEMP}/bfMeanShiftVectorImageFilterClusteredOutput.tif
-	${TEMP}/bfMeanShiftVectorImageFilterLabeledClusteredOutput.tif
-	${TEMP}/bfMeanShiftVectorImageFilterClusterBoundariesOutput.tif
-	16 16 10 1.0 1 1
-	)
+        ${INPUTDATA}/qb_RoadExtract2sub200x200.tif
+        ${TEMP}/bfMeanShiftVectorImageFilterOutput.tif
+        ${TEMP}/bfMeanShiftVectorImageFilterClusteredOutput.tif
+        ${TEMP}/bfMeanShiftVectorImageFilterLabeledClusteredOutput.tif
+        ${TEMP}/bfMeanShiftVectorImageFilterClusterBoundariesOutput.tif
+        16 16 10 1.0 1 1
+        )
 
 
 ADD_TEST(bfTvMeanShiftVectorImageFilterNotStreamedNotThreaded ${BASICFILTERS_TESTS9}
 --compare-n-images ${EPSILON_7} 4
-		${BASELINE}/bfMeanShiftVectorImageFilterOutput.tif
-		${TEMP}/bfMeanShiftVectorImageFilterNotStreamedNotThreadedOutput.tif
-		${BASELINE}/bfMeanShiftVectorImageFilterClusteredOutput.tif
-		${TEMP}/bfMeanShiftVectorImageFilterNotStreamedNotThreadedClusteredOutput.tif
-		${BASELINE}/bfMeanShiftVectorImageFilterLabeledClusteredOutput.tif
-		${TEMP}/bfMeanShiftVectorImageFilterNotStreamedNotThreadedLabeledClusteredOutput.tif
-		${BASELINE}/bfMeanShiftVectorImageFilterClusterBoundariesOutput.tif
-		${TEMP}/bfMeanShiftVectorImageFilterNotStreamedNotThreadedClusterBoundariesOutput.tif
+                ${BASELINE}/bfMeanShiftVectorImageFilterOutput.tif
+                ${TEMP}/bfMeanShiftVectorImageFilterNotStreamedNotThreadedOutput.tif
+                ${BASELINE}/bfMeanShiftVectorImageFilterClusteredOutput.tif
+                ${TEMP}/bfMeanShiftVectorImageFilterNotStreamedNotThreadedClusteredOutput.tif
+                ${BASELINE}/bfMeanShiftVectorImageFilterLabeledClusteredOutput.tif
+                ${TEMP}/bfMeanShiftVectorImageFilterNotStreamedNotThreadedLabeledClusteredOutput.tif
+                ${BASELINE}/bfMeanShiftVectorImageFilterClusterBoundariesOutput.tif
+                ${TEMP}/bfMeanShiftVectorImageFilterNotStreamedNotThreadedClusterBoundariesOutput.tif
         otbMeanShiftVectorImageFilter
-	${INPUTDATA}/qb_RoadExtract2sub200x200.tif
-	${TEMP}/bfMeanShiftVectorImageFilterNotStreamedNotThreadedOutput.tif
-	${TEMP}/bfMeanShiftVectorImageFilterNotStreamedNotThreadedClusteredOutput.tif
-	${TEMP}/bfMeanShiftVectorImageFilterNotStreamedNotThreadedLabeledClusteredOutput.tif
-	${TEMP}/bfMeanShiftVectorImageFilterNotStreamedNotThreadedClusterBoundariesOutput.tif
-	16 16 10 1.0 0 0
-	)
+        ${INPUTDATA}/qb_RoadExtract2sub200x200.tif
+        ${TEMP}/bfMeanShiftVectorImageFilterNotStreamedNotThreadedOutput.tif
+        ${TEMP}/bfMeanShiftVectorImageFilterNotStreamedNotThreadedClusteredOutput.tif
+        ${TEMP}/bfMeanShiftVectorImageFilterNotStreamedNotThreadedLabeledClusteredOutput.tif
+        ${TEMP}/bfMeanShiftVectorImageFilterNotStreamedNotThreadedClusterBoundariesOutput.tif
+        16 16 10 1.0 0 0
+        )
 
 ADD_TEST(bfTuFunctionToImageFilterNew ${BASICFILTERS_TESTS9}
         otbFunctionToImageFilterNew
 )
 
 ADD_TEST(bfTvFunctionToImageFilterTest ${BASICFILTERS_TESTS9}
-	--compare-image ${EPSILON_7}
-	    ${BASELINE}/bfTvFunctionToImageFilterTest.tif
-	    ${TEMP}/bfTvFunctionToImageFilterTest.tif
+        --compare-image ${EPSILON_7}
+            ${BASELINE}/bfTvFunctionToImageFilterTest.tif
+            ${TEMP}/bfTvFunctionToImageFilterTest.tif
         otbFunctionToImageFilter
-	    ${INPUTDATA}/poupees_1canal.hd
-	    ${TEMP}/bfTvFunctionToImageFilterTest.tif
-	    2 # radius
+            ${INPUTDATA}/poupees_1canal.hd
+            ${TEMP}/bfTvFunctionToImageFilterTest.tif
+            2 # radius
 )
 
 # -------            otb::BinaryImageDensityFunction   ----------------------------
@@ -1293,12 +1293,12 @@ ADD_TEST(bfTuBinaryImageDensityFunctionNew  ${BASICFILTERS_TESTS9}
 
 ADD_TEST(bfTvBinaryImageDensityFunction ${BASICFILTERS_TESTS9}
 --compare-ascii ${NOTOL}
-	     ${BASELINE_FILES}/bfTvBinaryImageDensityFunctionOutputAscii.txt
-	    ${TEMP}/bfTvBinaryImageDensityFunctionOutputAscii.txt
-	 otbBinaryImageDensityFunction
-	 ${INPUTDATA}/scene.png
-	 ${TEMP}/bfTvBinaryImageDensityFunctionOutputAscii.txt
-	 )
+             ${BASELINE_FILES}/bfTvBinaryImageDensityFunctionOutputAscii.txt
+            ${TEMP}/bfTvBinaryImageDensityFunctionOutputAscii.txt
+         otbBinaryImageDensityFunction
+         ${INPUTDATA}/scene.png
+         ${TEMP}/bfTvBinaryImageDensityFunctionOutputAscii.txt
+         )
 
 # -------            otb::BinaryImageToImageDensityFilter   ----------------------------
 ADD_TEST(bfTuBinaryImageToImageDensityFilterNew  ${BASICFILTERS_TESTS9}
@@ -1306,13 +1306,13 @@ ADD_TEST(bfTuBinaryImageToImageDensityFilterNew  ${BASICFILTERS_TESTS9}
 )
 
 ADD_TEST(bfTvBinaryImageToDensityImageFilter ${BASICFILTERS_TESTS9}
-	--compare-image ${EPSILON_7}
-	    ${BASELINE}/bfTvBinaryImageToDensityImageFilterOutputImage.tif
-	    ${TEMP}/bfTvBinaryImageToDensityImageFilterOutputImage.tif
+        --compare-image ${EPSILON_7}
+            ${BASELINE}/bfTvBinaryImageToDensityImageFilterOutputImage.tif
+            ${TEMP}/bfTvBinaryImageToDensityImageFilterOutputImage.tif
         otbBinaryImageToDensityImageFilter
-	    ${INPUTDATA}/scene.png
-	    ${TEMP}/bfTvBinaryImageToDensityImageFilterOutputImage.tif
-	    2 # radius
+            ${INPUTDATA}/scene.png
+            ${TEMP}/bfTvBinaryImageToDensityImageFilterOutputImage.tif
+            2 # radius
 )
 
 # -------            otb::EdgeDensityImageyFilter   ----------------------------
@@ -1321,14 +1321,14 @@ ADD_TEST(bfTuEdgeDensityImageFilterNew  ${BASICFILTERS_TESTS9}
 )
 
 ADD_TEST(bfTvEdgeDensityImageFilter ${BASICFILTERS_TESTS9}
-	--compare-image ${EPSILON_7}
-	    ${BASELINE}/bfTvEdgeDensityImageFilterOutputImage.tif
-	    ${TEMP}/bfTvEdgeDensityImageFilterOutputImage.tif
+        --compare-image ${EPSILON_7}
+            ${BASELINE}/bfTvEdgeDensityImageFilterOutputImage.tif
+            ${TEMP}/bfTvEdgeDensityImageFilterOutputImage.tif
         otbEdgeDensityImageFilter
-	    ${INPUTDATA}/scene.png
-	    ${TEMP}/bfTvEdgeDensityImageFilterOutputImage.tif
-	    1 # radius
-	    15 3  1. 0.01  #Canny Parameters
+            ${INPUTDATA}/scene.png
+            ${TEMP}/bfTvEdgeDensityImageFilterOutputImage.tif
+            1 # radius
+            15 3  1. 0.01  #Canny Parameters
 
 )
 
@@ -1341,20 +1341,20 @@ ADD_TEST(bfTvEdgeDensityImageFilter ${BASICFILTERS_TESTS9}
 # -------            otb::GaborFilterGenerator   ----------------------------
 
 ADD_TEST(bfTuGaborFilterGeneratorNew ${BASICFILTERS_TESTS10}
-	otbGaborFilterGeneratorNew
-	 )
+        otbGaborFilterGeneratorNew
+         )
 
 ADD_TEST(bfTvGaborFilterGenerator ${BASICFILTERS_TESTS10}
-	--compare-image ${EPSILON_7}
-	    ${BASELINE}/bfGaborFilterGeneratorTest.tif
-	    ${TEMP}/bfGaborFilterGeneratorTest.tif
-	 otbGaborFilterGenerator
-	 ${TEMP}/bfGaborFilterGeneratorTest.tif
-	 64 64 #Radius
-	 0.02 0.025 # a b
-	 -45 # theta
-	 0.0125 0.0125 #u0 v0
-	 0
+        --compare-image ${EPSILON_7}
+            ${BASELINE}/bfGaborFilterGeneratorTest.tif
+            ${TEMP}/bfGaborFilterGeneratorTest.tif
+         otbGaborFilterGenerator
+         ${TEMP}/bfGaborFilterGeneratorTest.tif
+         64 64 #Radius
+         0.02 0.025 # a b
+         -45 # theta
+         0.0125 0.0125 #u0 v0
+         0
 )
 
 # -------            otb::OverlapSaveConvolutionImageFilter   ----------------------------
@@ -1365,39 +1365,39 @@ IF(USE_FFTWD)
          otbOverlapSaveConvolutionImageFilterNew)
 
   ADD_TEST(bfTvOverlapSaveConvolutionImageFilter ${BASICFILTERS_TESTS10}
-		--compare-image ${EPSILON_7}
-		    ${BASELINE}/bfTvConvolutionImageFilter.tif
-		    ${TEMP}/bfTvOverlapSaveConvolutionImageFilter.tif
-		    otbOverlapSaveConvolutionImageFilter
-		    ${INPUTDATA}/QB_Suburb.png
-		    ${TEMP}/bfTvOverlapSaveConvolutionImageFilter.tif
+                --compare-image ${EPSILON_7}
+                    ${BASELINE}/bfTvConvolutionImageFilter.tif
+                    ${TEMP}/bfTvOverlapSaveConvolutionImageFilter.tif
+                    otbOverlapSaveConvolutionImageFilter
+                    ${INPUTDATA}/QB_Suburb.png
+                    ${TEMP}/bfTvOverlapSaveConvolutionImageFilter.tif
 )
 
  ADD_TEST(bfTvCompareOverlapSaveAndClassicalConvolutionWithGaborFilter ${BASICFILTERS_TESTS10}
-		--compare-image ${EPSILON_7}
-		    ${TEMP}/bfTvCompareConvolutionOutput.tif
-		    ${TEMP}/bfTvCompareOSConvolutionoutput.tif
-		    otbCompareOverlapSaveAndClassicalConvolutionWithGaborFilter
-		    ${INPUTDATA}/ROI_IKO_PAN_LesHalles_sub.tif
-		    ${TEMP}/bfTvCompareConvolutionOutput.tif
-		    ${TEMP}/bfTvCompareOSConvolutionoutput.tif
-		    64 64 #Radius
-		    0.02 0.025 # a b
-		    -45 # theta
-		    0.0125 0.0125 #u0 v0
-		    0
+                --compare-image ${EPSILON_7}
+                    ${TEMP}/bfTvCompareConvolutionOutput.tif
+                    ${TEMP}/bfTvCompareOSConvolutionoutput.tif
+                    otbCompareOverlapSaveAndClassicalConvolutionWithGaborFilter
+                    ${INPUTDATA}/ROI_IKO_PAN_LesHalles_sub.tif
+                    ${TEMP}/bfTvCompareConvolutionOutput.tif
+                    ${TEMP}/bfTvCompareOSConvolutionoutput.tif
+                    64 64 #Radius
+                    0.02 0.025 # a b
+                    -45 # theta
+                    0.0125 0.0125 #u0 v0
+                    0
 )
 
 ENDIF(USE_FFTWD)
 
 
 ADD_TEST(bfTvPolygonCompacityFunctor ${BASICFILTERS_TESTS10}
-	--compare-ascii ${NOTOL}
-	    ${BASELINE_FILES}/bfPolygonCompacityFunctorTest.txt
-	    ${TEMP}/bfPolygonCompacityFunctorTest.txt
-	 otbPolygonCompacityFunctor
-	 ${INPUTDATA}/polygon.png
-	 ${TEMP}/bfPolygonCompacityFunctorTest.txt
+        --compare-ascii ${NOTOL}
+            ${BASELINE_FILES}/bfPolygonCompacityFunctorTest.txt
+            ${TEMP}/bfPolygonCompacityFunctorTest.txt
+         otbPolygonCompacityFunctor
+         ${INPUTDATA}/polygon.png
+         ${TEMP}/bfPolygonCompacityFunctorTest.txt
 )
 
 ADD_TEST(bfTvPathLengthFunctor ${BASICFILTERS_TESTS10}
@@ -1421,16 +1421,16 @@ ADD_TEST(bfTvClosePathFunctor ${BASICFILTERS_TESTS10}
 # -------            otb::PersistentVectorizationImageFilter   ----------------------------
 
 ADD_TEST(bfTuPersistentVectorizationImageFilterNew ${BASICFILTERS_TESTS10}
-	otbPersistentVectorizationFilterNew
-	 )
+        otbPersistentVectorizationFilterNew
+         )
 
 ADD_TEST(bfTvPersistentVectorizationImageFilter ${BASICFILTERS_TESTS10}
 --compare-ascii ${NOTOL}
-	    ${BASELINE_FILES}/bfTvPersistentVectorizationImageFilterOutput.txt
-	    ${TEMP}/bfTvPersistentVectorizationImageFilterOutput.txt
-	 otbPersistentVectorizationFilter
-	 ${INPUTDATA}/Seg1InputForRCC8Graph.tif
-	 ${TEMP}/bfTvPersistentVectorizationImageFilterOutput.txt
+            ${BASELINE_FILES}/bfTvPersistentVectorizationImageFilterOutput.txt
+            ${TEMP}/bfTvPersistentVectorizationImageFilterOutput.txt
+         otbPersistentVectorizationFilter
+         ${INPUTDATA}/Seg1InputForRCC8Graph.tif
+         ${TEMP}/bfTvPersistentVectorizationImageFilterOutput.txt
 )
 
 
@@ -1442,44 +1442,44 @@ ADD_TEST(bfTvPersistentVectorizationImageFilter ${BASICFILTERS_TESTS10}
 
 ADD_TEST(bfTvExtractROIResample ${BASICFILTERS_TESTS11}
 --compare-image ${NOTOL}
-	    ${BASELINE}/bfTvExtractROIResample.tif
-	    ${TEMP}/bfTvExtractROIResample.tif
-	 otbExtractROIResample
-	 ${INPUTDATA}/ToulouseQuickBird_Extrait_1500_3750.tif
-	 ${TEMP}/bfTvExtractROIResample.tif
-	 0
+            ${BASELINE}/bfTvExtractROIResample.tif
+            ${TEMP}/bfTvExtractROIResample.tif
+         otbExtractROIResample
+         ${INPUTDATA}/ToulouseQuickBird_Extrait_1500_3750.tif
+         ${TEMP}/bfTvExtractROIResample.tif
+         0
 )
 
 ADD_TEST(bfTvExtractROIResample2 ${BASICFILTERS_TESTS11}
 --compare-image ${NOTOL}
-	    ${BASELINE}/bfTvExtractROIResample2.tif
-	    ${TEMP}/bfTvExtractROIResample2.tif
-	 otbExtractROIResample
-	 ${INPUTDATA}/ToulouseQuickBird_Extrait_1500_3750.tif
-	 ${TEMP}/bfTvExtractROIResample2.tif
-	 1
+            ${BASELINE}/bfTvExtractROIResample2.tif
+            ${TEMP}/bfTvExtractROIResample2.tif
+         otbExtractROIResample
+         ${INPUTDATA}/ToulouseQuickBird_Extrait_1500_3750.tif
+         ${TEMP}/bfTvExtractROIResample2.tif
+         1
 )
 # -------    otbPointSetFunction   ----------------------------
 #ADD_TEST(bfTuPointSetFunctionNew ${BASICFILTERS_TESTS11}
-#	 otbPointSetFunctionNew
-#	 )
+#         otbPointSetFunctionNew
+#         )
 
 
 
 # -------    otbPointSetDensityFunction   ----------------------------
 ADD_TEST(bfTuPointSetDensityFunctionNew ${BASICFILTERS_TESTS11}
-	 otbPointSetDensityFunctionNew
-	 )
+         otbPointSetDensityFunctionNew
+         )
 
 
 ADD_TEST(bfTvPointSetDensityFunctionTest ${BASICFILTERS_TESTS11}
 --compare-ascii ${NOTOL}
-	     ${BASELINE_FILES}/bfTvPointSetDensityFunctionOutputAscii.txt
-	    ${TEMP}/bfTvPointSetDensityFunctionOutputAscii.txt
-	 otbPointSetDensityFunctionTest
-	 ${TEMP}/bfTvPointSetDensityFunctionOutputAscii.txt
-	 )
-	 
+             ${BASELINE_FILES}/bfTvPointSetDensityFunctionOutputAscii.txt
+            ${TEMP}/bfTvPointSetDensityFunctionOutputAscii.txt
+         otbPointSetDensityFunctionTest
+         ${TEMP}/bfTvPointSetDensityFunctionOutputAscii.txt
+         )
+         
 # -------    otbPointSetDensityGaussianFunction   ----------------------------
 ADD_TEST(bfTuPointSetDensityGaussianFunctionNew ${BASICFILTERS_TESTS11}
      otbPointSetDensityGaussianFunctionNew
@@ -1517,27 +1517,27 @@ ADD_TEST(bfTuPointSetToDensityImageFilterNew ${BASICFILTERS_TESTS11}
 
 ADD_TEST(bfTvPointSetToDensityImageFilterTest ${BASICFILTERS_TESTS11}
 --compare-image ${NOTOL}
-	    ${BASELINE}/bfTvPointSetToDensityImageFilterOutputImage.tif
-	    ${TEMP}/bfTvPointSetToDensityImageFilterOutputImage.tif
-	    otbPointSetToDensityImageFilterTest
-	 ${INPUTDATA}/QB_Suburb.png
-	 ${TEMP}/bfTvPointSetToDensityImageFilterOutputImage.tif
-	 3 5 10
+            ${BASELINE}/bfTvPointSetToDensityImageFilterOutputImage.tif
+            ${TEMP}/bfTvPointSetToDensityImageFilterOutputImage.tif
+            otbPointSetToDensityImageFilterTest
+         ${INPUTDATA}/QB_Suburb.png
+         ${TEMP}/bfTvPointSetToDensityImageFilterOutputImage.tif
+         3 5 10
 )
 
 # -------    otbKeyPointDensityImageFilter   ----------------------------
 ADD_TEST(bfTuKeyPointDensityImageFilterNew ${BASICFILTERS_TESTS11}
-	 otbKeyPointDensityImageFilterNew
-	 )
+         otbKeyPointDensityImageFilterNew
+         )
 
 ADD_TEST(bfTvKeyPointDensityImageFilterOutputImage ${BASICFILTERS_TESTS11}
 --compare-image ${NOTOL}
-	    ${BASELINE}/bfTvKeyPointDensityImageFilterOutputImage.tif
-	    ${TEMP}/bfTvKeyPointDensityImageFilterOutputImage.tif
-	    otbKeyPointDensityImageFilterTest
-	 ${INPUTDATA}/QB_Suburb.png
-	 ${TEMP}/bfTvKeyPointDensityImageFilterOutputImage.tif
-	 3 5 10
+            ${BASELINE}/bfTvKeyPointDensityImageFilterOutputImage.tif
+            ${TEMP}/bfTvKeyPointDensityImageFilterOutputImage.tif
+            otbKeyPointDensityImageFilterTest
+         ${INPUTDATA}/QB_Suburb.png
+         ${TEMP}/bfTvKeyPointDensityImageFilterOutputImage.tif
+         3 5 10
 )
 
 ADD_TEST(bfTvFunctionWithNeighborhoodToImageFilterNew ${BASICFILTERS_TESTS11}
@@ -1545,13 +1545,13 @@ ADD_TEST(bfTvFunctionWithNeighborhoodToImageFilterNew ${BASICFILTERS_TESTS11}
 )
 
 ADD_TEST(bfTvFunctionWithNeighborhoodToImageFilter ${BASICFILTERS_TESTS11}
-	--compare-image ${EPSILON_7}
-	    ${BASELINE}/bfTvFunctionWithNeighborhoodToImageFilterTest.tif
-	    ${TEMP}/bfTvFunctionWithNeighborhoodToImageFilterTest.tif
+        --compare-image ${EPSILON_7}
+            ${BASELINE}/bfTvFunctionWithNeighborhoodToImageFilterTest.tif
+            ${TEMP}/bfTvFunctionWithNeighborhoodToImageFilterTest.tif
         otbFunctionWithNeighborhoodToImageFilter
-	    ${INPUTDATA}/poupees_1canal.hd
+            ${INPUTDATA}/poupees_1canal.hd
         ${TEMP}/bfTvFunctionWithNeighborhoodToImageFilterTest.tif
-	    2 # radius
+            2 # radius
 )
 
 
@@ -1760,31 +1760,31 @@ SET_TESTS_PROPERTIES(bfTvItkImagePCAShapeModelEstimatorTest PROPERTIES DEPENDS b
 # -------  otb::ListSampleToVariableDimensionHistogramGenerator ----------------------------
 
 ADD_TEST(bfTuListSampleToVariableDimensionHistogramGeneratorNew ${BASICFILTERS_TESTS11}
-	otbListSampleToVariableDimensionHistogramGeneratorNew)
+        otbListSampleToVariableDimensionHistogramGeneratorNew)
 
 ADD_TEST(bfTvListSampleToVariableDimensionHistogramGenerator ${BASICFILTERS_TESTS11}
 --compare-ascii ${NOTOL}
-	${BASELINE_FILES}/bfTvListSampleToVariableDimensionHistogramGeneratorOutput.txt
-	${TEMP}/bfTvListSampleToVariableDimensionHistogramGeneratorOutput.txt
-	otbListSampleToVariableDimensionHistogramGenerator
-	${INPUTDATA}/couleurs.tif
-	${TEMP}/bfTvListSampleToVariableDimensionHistogramGeneratorOutput.txt
-	10 1
+        ${BASELINE_FILES}/bfTvListSampleToVariableDimensionHistogramGeneratorOutput.txt
+        ${TEMP}/bfTvListSampleToVariableDimensionHistogramGeneratorOutput.txt
+        otbListSampleToVariableDimensionHistogramGenerator
+        ${INPUTDATA}/couleurs.tif
+        ${TEMP}/bfTvListSampleToVariableDimensionHistogramGeneratorOutput.txt
+        10 1
 )
 
 # -------  otb::ListSampleToVariableDimensionHistogramGenerator ----------------------------
 
 ADD_TEST(bfTuListSampleToHistogramListGeneratorNew ${BASICFILTERS_TESTS11}
-	otbListSampleToHistogramListGeneratorNew)
+        otbListSampleToHistogramListGeneratorNew)
 
 ADD_TEST(bfTvListSampleToHistogramListGenerator ${BASICFILTERS_TESTS11}
 --compare-ascii ${NOTOL}
-	${BASELINE_FILES}/bfTvListSampleToVariableDimensionHistogramGeneratorOutput.txt
-	${TEMP}/bfTvListSampleToHistogramListGeneratorOutput.txt
-	otbListSampleToHistogramListGenerator
-	${INPUTDATA}/couleurs.tif
-	${TEMP}/bfTvListSampleToHistogramListGeneratorOutput.txt
-	10 1
+        ${BASELINE_FILES}/bfTvListSampleToVariableDimensionHistogramGeneratorOutput.txt
+        ${TEMP}/bfTvListSampleToHistogramListGeneratorOutput.txt
+        otbListSampleToHistogramListGenerator
+        ${INPUTDATA}/couleurs.tif
+        ${TEMP}/bfTvListSampleToHistogramListGeneratorOutput.txt
+        10 1
 )
 
 
@@ -1794,18 +1794,18 @@ ADD_TEST(bfTvListSampleToHistogramListGenerator ${BASICFILTERS_TESTS11}
 
 # -------     otbEdgeDetectorImageFilter   ----------------------------
 ADD_TEST(bfTuEdgeDetectorImageFilterNew ${BASICFILTERS_TESTS12}
-	 otbEdgeDetectorImageFilterNew
-	 )
+         otbEdgeDetectorImageFilterNew
+         )
 
 ADD_TEST(bfTvEdgeDetectorImageFilter ${BASICFILTERS_TESTS12}
 --compare-image ${NOTOL}
-	    ${BASELINE}/bfTvEdgeDetectorImageFilter.tif
-	    ${TEMP}/bfTvEdgeDetectorImageFilter.tif
-	 otbEdgeDetectorImageFilter
-	 ${INPUTDATA}/poupees_sub_c1.png
-	 ${TEMP}/bfTvEdgeDetectorImageFilter.tif
-	 0   # lower threshold
-	 255 # upper  threshold
+            ${BASELINE}/bfTvEdgeDetectorImageFilter.tif
+            ${TEMP}/bfTvEdgeDetectorImageFilter.tif
+         otbEdgeDetectorImageFilter
+         ${INPUTDATA}/poupees_sub_c1.png
+         ${TEMP}/bfTvEdgeDetectorImageFilter.tif
+         0   # lower threshold
+         255 # upper  threshold
 )
 
 # -------     otbChangeLabelImageFilter   ----------------------------
@@ -1828,25 +1828,25 @@ ADD_TEST(bfTvChangeLabelImageFilter ${BASICFILTERS_TESTS12}
 
 # -----  otbImageAndVectorImageOperationFilter  --------------------------------------
 ADD_TEST(bfTuImageAndVectorImageOperationFilterNew ${BASICFILTERS_TESTS12}
-	otbImageAndVectorImageOperationFilterNew)
+        otbImageAndVectorImageOperationFilterNew)
 
 ADD_TEST(bfTvImageAndVectorImageOperationFilterTest ${BASICFILTERS_TESTS12}
-	--compare-n-images ${NOTOL} 4
-		${TEMP}/bfTvImageAndVectorImageOperationFilterTestAdd.tif
-		${BASELINE}/bfTvImageAndVectorImageOperationFilterTestAdd.tif
-		${TEMP}/bfTvImageAndVectorImageOperationFilterTestSub.tif
-		${BASELINE}/bfTvImageAndVectorImageOperationFilterTestSub.tif
-		${TEMP}/bfTvImageAndVectorImageOperationFilterTestMul.tif
-		${BASELINE}/bfTvImageAndVectorImageOperationFilterTestMul.tif
-		${TEMP}/bfTvImageAndVectorImageOperationFilterTestDiv.tif
-		${BASELINE}/bfTvImageAndVectorImageOperationFilterTestDiv.tif
-	otbImageAndVectorImageOperationFilterTest
-		${INPUTDATA}/checkerboard_128_128.png
-		${INPUTDATA}/poupees_sub.png
-		${TEMP}/bfTvImageAndVectorImageOperationFilterTestAdd.tif
-		${TEMP}/bfTvImageAndVectorImageOperationFilterTestSub.tif
-		${TEMP}/bfTvImageAndVectorImageOperationFilterTestMul.tif
-		${TEMP}/bfTvImageAndVectorImageOperationFilterTestDiv.tif
+        --compare-n-images ${NOTOL} 4
+                ${TEMP}/bfTvImageAndVectorImageOperationFilterTestAdd.tif
+                ${BASELINE}/bfTvImageAndVectorImageOperationFilterTestAdd.tif
+                ${TEMP}/bfTvImageAndVectorImageOperationFilterTestSub.tif
+                ${BASELINE}/bfTvImageAndVectorImageOperationFilterTestSub.tif
+                ${TEMP}/bfTvImageAndVectorImageOperationFilterTestMul.tif
+                ${BASELINE}/bfTvImageAndVectorImageOperationFilterTestMul.tif
+                ${TEMP}/bfTvImageAndVectorImageOperationFilterTestDiv.tif
+                ${BASELINE}/bfTvImageAndVectorImageOperationFilterTestDiv.tif
+        otbImageAndVectorImageOperationFilterTest
+                ${INPUTDATA}/checkerboard_128_128.png
+                ${INPUTDATA}/poupees_sub.png
+                ${TEMP}/bfTvImageAndVectorImageOperationFilterTestAdd.tif
+                ${TEMP}/bfTvImageAndVectorImageOperationFilterTestSub.tif
+                ${TEMP}/bfTvImageAndVectorImageOperationFilterTestMul.tif
+                ${TEMP}/bfTvImageAndVectorImageOperationFilterTestDiv.tif
 )
 
 
@@ -1867,7 +1867,7 @@ ADD_TEST(bfTvBandMathImageFilterWithIdx ${BASICFILTERS_TESTS13}
   ${TEMP}/bfTvBandMathImageFilterWithIdx2.tif
 )
 
-ADD_TEST(bfTvComplexToIntensityFilterTest ${BASICFILTERS_TESTS13} 
+ADD_TEST(bfTvComplexToIntensityFilterTest ${BASICFILTERS_TESTS13}
   otbComplexToIntensityFilterTest)
 
 ADD_TEST(bfTvRealAndImaginaryImageToComplexImageFilterTest ${BASICFILTERS_TESTS13}
@@ -1956,8 +1956,8 @@ ADD_TEST(bfTvMaskMuParserFilterTest ${BASICFILTERS_TESTS13}
   --compare-image ${NOTOL}
   ${TEMP}/bfTvMaskMuParserFilterTest.tif
   ${BASELINE}/bfTvMaskMuParserFilterTest.tif
-	otbMaskMuParserFilterTest
-    ${INPUTDATA}/ROI_QB_MUL_4.tif 
+        otbMaskMuParserFilterTest
+    ${INPUTDATA}/ROI_QB_MUL_4.tif
     ${TEMP}/bfTvMaskMuParserFilterTest.tif
     "(b1>100)*(b2>120)"
 )
@@ -1972,8 +1972,8 @@ ADD_TEST(bfTvConnectedComponentMuParserFunctorTest ${BASICFILTERS_TESTS14}
   --compare-image ${NOTOL}
   ${TEMP}/bfTvConnectedComponentMuParserFunctorTest_1.tif
   ${BASELINE}/bfTvConnectedComponentMuParserFunctorTest_1.tif
-	otbConnectedComponentMuParserFunctorTest
-    ${INPUTDATA}/ROI_QB_MUL_4.tif 
+        otbConnectedComponentMuParserFunctorTest
+    ${INPUTDATA}/ROI_QB_MUL_4.tif
     ${TEMP}/bfTvConnectedComponentMuParserFunctorTest_1.tif
     "distance<40"
 )
@@ -1984,11 +1984,11 @@ ADD_TEST(bfTvConnectedComponentMuParserFunctorTestMask ${BASICFILTERS_TESTS14}
   --compare-image ${NOTOL}
   ${TEMP}/bfTvConnectedComponentMuParserFunctorTest_2.tif
   ${BASELINE}/bfTvConnectedComponentMuParserFunctorTest_2.tif
-	otbConnectedComponentMuParserFunctorTest
-    ${INPUTDATA}/ROI_QB_MUL_4.tif 
+        otbConnectedComponentMuParserFunctorTest
+    ${INPUTDATA}/ROI_QB_MUL_4.tif
     ${TEMP}/bfTvConnectedComponentMuParserFunctorTest_2.tif
     "distance<40"
-    ${INPUTDATA}/ROI_QB_MUL_4_Mask.tif 
+    ${INPUTDATA}/ROI_QB_MUL_4_Mask.tif
 )
 
 # ----------------------------     otbLabelObjectOpeningMuParserFilter   ----------------------------
@@ -2003,9 +2003,9 @@ ADD_TEST(bfTvLabelObjectOpeningMuParserFilterTest ${BASICFILTERS_TESTS14}
   --compare-image ${NOTOL}
   ${TEMP}/bfTvLabelObjectOpeningMuParserFilterTest.tif
   ${BASELINE}/bfTvLabelObjectOpeningMuParserFilterTest.tif
-	otbLabelObjectOpeningMuParserFilterTest
-    ${INPUTDATA}/ROI_QB_MUL_4.tif 
-    ${INPUTDATA}/ROI_QB_MUL_4_Label.tif 
+        otbLabelObjectOpeningMuParserFilterTest
+    ${INPUTDATA}/ROI_QB_MUL_4.tif
+    ${INPUTDATA}/ROI_QB_MUL_4_Label.tif
     ${TEMP}/bfTvLabelObjectOpeningMuParserFilterTest.tif
     "SHAPE_Elongation>8"
 )
@@ -2059,11 +2059,11 @@ ADD_TEST(bfTvNDVIDataNodeFeatureFunction_Line ${BASICFILTERS_TESTS15}
   ${BASELINE_FILES}/bfTvNDVIDataNodeFeatureFunctionOutput_Line.shp
   ${TEMP}/bfTvNDVIDataNodeFeatureFunctionOutput_Line.shp
   otbNDVIDataNodeFeatureFunction
-  	${INPUTDATA}/Dempster-Shafer/ROI_QB_TOULOUSE_ROADS.shp
-	${INPUTDATA}/Dempster-Shafer/ROI_QB_TOULOUSE.TIF
-	${INPUTDATA}/DEM/srtm_directory
-	${TEMP}/bfTvNDVIDataNodeFeatureFunctionOutput_Line.shp
-	0
+          ${INPUTDATA}/Dempster-Shafer/ROI_QB_TOULOUSE_ROADS.shp
+        ${INPUTDATA}/Dempster-Shafer/ROI_QB_TOULOUSE.TIF
+        ${INPUTDATA}/DEM/srtm_directory
+        ${TEMP}/bfTvNDVIDataNodeFeatureFunctionOutput_Line.shp
+        0
 )
 
 ADD_TEST(bfTvNDVIDataNodeFeatureFunction_Polygon ${BASICFILTERS_TESTS15}
@@ -2071,11 +2071,11 @@ ADD_TEST(bfTvNDVIDataNodeFeatureFunction_Polygon ${BASICFILTERS_TESTS15}
   ${BASELINE_FILES}/bfTvNDVIDataNodeFeatureFunctionOutput_Polygon.shp
   ${TEMP}/bfTvNDVIDataNodeFeatureFunctionOutput_Polygon.shp
   otbNDVIDataNodeFeatureFunction
-  	${INPUTDATA}/Dempster-Shafer/ROI_QB_TOULOUSE_BUILDINGS.shp
-	${INPUTDATA}/Dempster-Shafer/ROI_QB_TOULOUSE.TIF
-	${INPUTDATA}/DEM/srtm_directory
-	${TEMP}/bfTvNDVIDataNodeFeatureFunctionOutput_Polygon.shp
-	0
+          ${INPUTDATA}/Dempster-Shafer/ROI_QB_TOULOUSE_BUILDINGS.shp
+        ${INPUTDATA}/Dempster-Shafer/ROI_QB_TOULOUSE.TIF
+        ${INPUTDATA}/DEM/srtm_directory
+        ${TEMP}/bfTvNDVIDataNodeFeatureFunctionOutput_Polygon.shp
+        0
 )
 
 
@@ -2114,24 +2114,24 @@ ADD_TEST(bfTvSpectralAngleDataNodeFeatureFunction_Line ${BASICFILTERS_TESTS15}
   --compare-ogr ${NOTOL}
   ${BASELINE_FILES}/bfTvSpectralAngleDataNodeFeatureFunctionOutput_Line.shp
   ${TEMP}/bfTvSpectralAngleDataNodeFeatureFunctionOutput_Line.shp
- 	otbSpectralAngleDataNodeFeatureFunction
-  	${INPUTDATA}/Dempster-Shafer/ROI_QB_TOULOUSE_ROADS.shp
-	${INPUTDATA}/Dempster-Shafer/ROI_QB_TOULOUSE.TIF
-	${INPUTDATA}/DEM/srtm_directory
-	${TEMP}/bfTvSpectralAngleDataNodeFeatureFunctionOutput_Line.shp
-	0
+         otbSpectralAngleDataNodeFeatureFunction
+          ${INPUTDATA}/Dempster-Shafer/ROI_QB_TOULOUSE_ROADS.shp
+        ${INPUTDATA}/Dempster-Shafer/ROI_QB_TOULOUSE.TIF
+        ${INPUTDATA}/DEM/srtm_directory
+        ${TEMP}/bfTvSpectralAngleDataNodeFeatureFunctionOutput_Line.shp
+        0
 )
 
 ADD_TEST(bfTvSpectralAngleDataNodeFeatureFunction_Polygon ${BASICFILTERS_TESTS15}
   --compare-ogr ${NOTOL}
   ${BASELINE_FILES}/bfTvSpectralAngleDataNodeFeatureFunctionOutput_Polygon.shp
   ${TEMP}/bfTvSpectralAngleDataNodeFeatureFunctionOutput_Polygon.shp
- 	otbSpectralAngleDataNodeFeatureFunction
-  	${INPUTDATA}/Dempster-Shafer/ROI_QB_TOULOUSE_BUILDINGS.shp
-	  ${INPUTDATA}/Dempster-Shafer/ROI_QB_TOULOUSE.TIF
-	  ${INPUTDATA}/DEM/srtm_directory
-	  ${TEMP}/bfTvSpectralAngleDataNodeFeatureFunctionOutput_Polygon.shp
-  	0 )
+         otbSpectralAngleDataNodeFeatureFunction
+          ${INPUTDATA}/Dempster-Shafer/ROI_QB_TOULOUSE_BUILDINGS.shp
+          ${INPUTDATA}/Dempster-Shafer/ROI_QB_TOULOUSE.TIF
+          ${INPUTDATA}/DEM/srtm_directory
+          ${TEMP}/bfTvSpectralAngleDataNodeFeatureFunctionOutput_Polygon.shp
+          0 )
 
 # ------------------  otbRadiometryHomogenousWithNeighborhoodDataNodeFeatureFunction   ------------------
 ADD_TEST(bfTuRadiometryHomogenousWithNeighborhoodDataNodeFeatureFunctionNew ${BASICFILTERS_TESTS15}
@@ -2169,11 +2169,11 @@ ADD_TEST(bfTvDBOverlapDataNodeFeatureFunction ${BASICFILTERS_TESTS15}
   --compare-ogr ${NOTOL}
   ${BASELINE_FILES}/bfTvDBOverlapDataNodeFeatureFunctionOutput.shp
   ${TEMP}/bfTvDBOverlapDataNodeFeatureFunctionOutput.shp
- 	otbDBOverlapDataNodeFeatureFunction
-  	${INPUTDATA}/Dempster-Shafer/ROI_QB_TOULOUSE_ROADS.shp
-	${INPUTDATA}/Dempster-Shafer/ROI_QB_TOULOUSE_BUILDINGS.shp
-	${TEMP}/bfTvDBOverlapDataNodeFeatureFunctionOutput.shp
-	0
+         otbDBOverlapDataNodeFeatureFunction
+          ${INPUTDATA}/Dempster-Shafer/ROI_QB_TOULOUSE_ROADS.shp
+        ${INPUTDATA}/Dempster-Shafer/ROI_QB_TOULOUSE_BUILDINGS.shp
+        ${TEMP}/bfTvDBOverlapDataNodeFeatureFunctionOutput.shp
+        0
 )
 
 
diff --git a/Testing/Code/ChangeDetection/CMakeLists.txt b/Testing/Code/ChangeDetection/CMakeLists.txt
index 9873cc68026b03d3223fda34cb08865fc0c43b60..e270d12fec3ed3a6727d2aa02e4798a7c7b4de2f 100644
--- a/Testing/Code/ChangeDetection/CMakeLists.txt
+++ b/Testing/Code/ChangeDetection/CMakeLists.txt
@@ -24,63 +24,63 @@ ADD_TEST(cdTvCBAMI ${CHANGEDETECTION_TESTS1}
   --compare-image ${TOL}   ${BASELINE}/cdCBAMIImage.png
                     ${TEMP}/cdCBAMIImage.png
         otbCBAMIChangeDetectionTest
-	 ${INPUTDATA}/GomaAvant.png
-	 ${INPUTDATA}/GomaApres.png
-	 2
-	 ${TEMP}/cdCBAMIImage.png
-	 )
+         ${INPUTDATA}/GomaAvant.png
+         ${INPUTDATA}/GomaApres.png
+         2
+         ${TEMP}/cdCBAMIImage.png
+         )
 
 ADD_TEST(cdTvCorrel ${CHANGEDETECTION_TESTS1}
   --compare-image ${TOL}   ${BASELINE}/cdCorrelImage.png
                     ${TEMP}/cdCorrelImage.png
-	otbCorrelChangeDetectionTest
-	 ${INPUTDATA}/GomaAvant.png
-	 ${INPUTDATA}/GomaApres.png
-	 2
-	 ${TEMP}/cdCorrelImage.png
-	 )
+        otbCorrelChangeDetectionTest
+         ${INPUTDATA}/GomaAvant.png
+         ${INPUTDATA}/GomaApres.png
+         2
+         ${TEMP}/cdCorrelImage.png
+         )
 
 ADD_TEST(cdTvMeanDiff ${CHANGEDETECTION_TESTS1}
   --compare-image ${EPSILON_10}
-		  ${BASELINE}/cdMeanDiffImage.hdr
-		  ${TEMP}/cdMeanDiffImage.hdr
-	otbMeanDiffChangeDetectionTest
-	 ${INPUTDATA}/GomaAvant.png
-	 ${INPUTDATA}/GomaApres.png
-	 2
-	 ${TEMP}/cdMeanDiffImage.hdr
-	 )
+                  ${BASELINE}/cdMeanDiffImage.hdr
+                  ${TEMP}/cdMeanDiffImage.hdr
+        otbMeanDiffChangeDetectionTest
+         ${INPUTDATA}/GomaAvant.png
+         ${INPUTDATA}/GomaApres.png
+         2
+         ${TEMP}/cdMeanDiffImage.hdr
+         )
 
 ADD_TEST(cdTvMeanRatio ${CHANGEDETECTION_TESTS1}
   --compare-image ${TOL}   ${BASELINE}/cdMeanRatioImage.png
                     ${TEMP}/cdMeanRatioImage.png
-	otbMeanRatioChangeDetectionTest
-	 ${INPUTDATA}/GomaAvant.png
-	 ${INPUTDATA}/GomaApres.png
-	 2
-	 ${TEMP}/cdMeanRatioImage.png
-	 )
+        otbMeanRatioChangeDetectionTest
+         ${INPUTDATA}/GomaAvant.png
+         ${INPUTDATA}/GomaApres.png
+         2
+         ${TEMP}/cdMeanRatioImage.png
+         )
 
 ADD_TEST(cdTvLHMI ${CHANGEDETECTION_TESTS1}
 #  --compare-image ${TOL}   ${BASELINE}/cdLHMIImage.png
 #                    ${TEMP}/cdLHMIImage.png
-	otbLHMIChangeDetectionTest
-	 ${INPUTDATA}/GomaAvantSousEch.png
-	 ${INPUTDATA}/GomaApresSousEch.png
-	 2
-	 ${TEMP}/cdLHMIImage.png
-	 )
+        otbLHMIChangeDetectionTest
+         ${INPUTDATA}/GomaAvantSousEch.png
+         ${INPUTDATA}/GomaApresSousEch.png
+         2
+         ${TEMP}/cdLHMIImage.png
+         )
 
 ADD_TEST(cdTvJHMI ${CHANGEDETECTION_TESTS1}
   --compare-image ${TOL}
-		  ${BASELINE}/cdJHMIImage.png
+                  ${BASELINE}/cdJHMIImage.png
                   ${TEMP}/cdJHMIImage.png
-	otbJHMIChangeDetectionTest
-	 ${INPUTDATA}/GomaAvant.png
-	 ${INPUTDATA}/GomaApres.png
-	 2
-	 ${TEMP}/cdJHMIImage.png
-	 )
+        otbJHMIChangeDetectionTest
+         ${INPUTDATA}/GomaAvant.png
+         ${INPUTDATA}/GomaApres.png
+         2
+         ${TEMP}/cdJHMIImage.png
+         )
 
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ CHANGEDETECTION_TESTS2 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -91,26 +91,26 @@ ADD_TEST(cdTuKullbackLeiblerDistanceImageFilterNew ${CHANGEDETECTION_TESTS2}
 
 ADD_TEST(cdTvKullbackLeiblerDistanceImageFilter ${CHANGEDETECTION_TESTS2}
          --compare-image ${EPSILON_10}
-			 ${BASELINE}/cdTVKullbackLeiblerDistanceImageFilterOutput.hdr
-			 ${TEMP}/cdTVKullbackLeiblerDistanceImageFilterOutput.hdr
-	 otbKullbackLeiblerDistanceImageFilter
-			${INPUTDATA}/GomaAvant.png
-			${INPUTDATA}/GomaApres.png
-			${TEMP}/cdTVKullbackLeiblerDistanceImageFilterOutput.hdr
-			35)
+                         ${BASELINE}/cdTVKullbackLeiblerDistanceImageFilterOutput.hdr
+                         ${TEMP}/cdTVKullbackLeiblerDistanceImageFilterOutput.hdr
+         otbKullbackLeiblerDistanceImageFilter
+                        ${INPUTDATA}/GomaAvant.png
+                        ${INPUTDATA}/GomaApres.png
+                        ${TEMP}/cdTVKullbackLeiblerDistanceImageFilterOutput.hdr
+                        35)
 
 ADD_TEST(cdTuKullbackLeiblerProfileImageFilterNew ${CHANGEDETECTION_TESTS2}
          otbKullbackLeiblerProfileImageFilterNew)
 
 ADD_TEST(cdTlKullbackLeiblerProfileImageFilter ${CHANGEDETECTION_TESTS2}
          --compare-image ${EPSILON_10}
-			 ${BASELINE}/cdTVKullbackLeiblerProfileImageFilterOutput.hdr
-			 ${TEMP}/cdTVKullbackLeiblerProfileImageFilterOutput.hdr
-	 otbKullbackLeiblerProfileImageFilter
-			${INPUTDATA}/GomaAvant.png
-			${INPUTDATA}/GomaApres.png
-			${TEMP}/cdTVKullbackLeiblerProfileImageFilterOutput.hdr
-			5 51)
+                         ${BASELINE}/cdTVKullbackLeiblerProfileImageFilterOutput.hdr
+                         ${TEMP}/cdTVKullbackLeiblerProfileImageFilterOutput.hdr
+         otbKullbackLeiblerProfileImageFilter
+                        ${INPUTDATA}/GomaAvant.png
+                        ${INPUTDATA}/GomaApres.png
+                        ${TEMP}/cdTVKullbackLeiblerProfileImageFilterOutput.hdr
+                        5 51)
 
 
 ADD_TEST(cdTuKullbackLeiblerSupervizedDistanceImageFilterNew ${CHANGEDETECTION_TESTS2}
@@ -119,7 +119,7 @@ ADD_TEST(cdTuKullbackLeiblerSupervizedDistanceImageFilterNew ${CHANGEDETECTION_T
 ADD_TEST(cdTlKullbackLeiblerSupervizedDistanceImageFilter ${CHANGEDETECTION_TESTS2}
          --compare-image ${TOL}
              ${BASELINE}/cdTVKullbackLeiblerSupervizedDistanceImageFilterOutput.png
-			 ${TEMP}/cdTVKullbackLeiblerSupervizedDistanceImageFilterOutput.png
+                         ${TEMP}/cdTVKullbackLeiblerSupervizedDistanceImageFilterOutput.png
          otbKullbackLeiblerSupervizedDistanceImageFilter
              ${INPUTDATA}/ERSBefore.png
              ${INPUTDATA}/ERSAfter.png
@@ -129,8 +129,8 @@ ADD_TEST(cdTlKullbackLeiblerSupervizedDistanceImageFilter ${CHANGEDETECTION_TEST
 
 
 # -------       Fichiers sources CXX -----------------------------------
-SET(BasicChangeDetection_SRCS1 
-otbChangeDetectionTests1.cxx 
+SET(BasicChangeDetection_SRCS1
+otbChangeDetectionTests1.cxx
 otbCBAMIChangeDetectionTest.cxx
 otbCorrelChangeDetectionTest.cxx
 otbMeanDiffChangeDetectionTest.cxx
@@ -141,7 +141,7 @@ otbJHMIChangeDetectionTest.cxx
 
 # -------       Fichiers sources CXX -----------------------------------
 SET(BasicChangeDetection_SRCS2
-otbChangeDetectionTests2.cxx 
+otbChangeDetectionTests2.cxx
 otbKullbackLeiblerDistanceImageFilterNew.cxx
 otbKullbackLeiblerDistanceImageFilter.cxx
 otbKullbackLeiblerProfileImageFilterNew.cxx
diff --git a/Testing/Code/Common/CMakeLists.txt b/Testing/Code/Common/CMakeLists.txt
index c1c2c00d0f4bf0d70320743cb7ec946dfc18f9b0..0d249308f0a6c783565af3a3f22bb4753d9d1cdc 100644
--- a/Testing/Code/Common/CMakeLists.txt
+++ b/Testing/Code/Common/CMakeLists.txt
@@ -58,7 +58,7 @@ ADD_TEST(coTuConfigurationTest ${COMMON_TESTS1}
         otbConfigurationTest
         )
 
-FILE(WRITE ${CMAKE_BINARY_DIR}/Testing/otbconf_OK  
+FILE(WRITE ${CMAKE_BINARY_DIR}/Testing/otbconf_OK
            "OTB_DEM_DIRECTORY = ${OTB_DATA_ROOT}/Input/DEM/srtm_directory")
 FILE(WRITE ${CMAKE_BINARY_DIR}/Testing/otbconf_NotOK
            "OTB_DEM_DIRECTORY = ${OTB_DATA_ROOT}/Input/DEM/egm96.grd")
@@ -148,7 +148,7 @@ ADD_TEST(coTuLineSpatialObjectList ${COMMON_TESTS2}
 # -------            otb::ExtractROI   ------------------------------
 
 ADD_TEST(coTuExtractROINew ${COMMON_TESTS2}
-	otbExtractROINew)
+        otbExtractROINew)
 
 ADD_TEST(coTvExtractROI ${COMMON_TESTS2}
   --compare-image ${NOTOL}   ${BASELINE}/coExtractROI_cthead1_26_97_209_100.png
@@ -181,38 +181,38 @@ ADD_TEST(coTvExtractROI_RGB2 ${COMMON_TESTS2}
         303 2 134 330 )
 
 ADD_TEST(coTvExtractROI_QB ${COMMON_TESTS2}
-  --compare-image ${NOTOL}   
+  --compare-image ${NOTOL}
   ${BASELINE}/coTvExtractROI_QB.png
   ${TEMP}/coTvExtractROI_QB.png
     otbExtractROI_RGB
   ${INPUTDATA}/QB_Suburb.png
   ${TEMP}/coTvExtractROI_QB.png
-  0 0 70 70 
+  0 0 70 70
   )
 
 
 ADD_TEST(coTvExtractROIQB ${COMMON_TESTS2}
-  --compare-image ${NOTOL}   
+  --compare-image ${NOTOL}
   ${BASELINE}/coTvExtractROIQB.png
   ${TEMP}/coTvExtractROIQB.png
     otbExtractROI
   ${INPUTDATA}/QB_Suburb.png
   ${TEMP}/coTvExtractROIQB.png
-  0 0 70 70 
+  0 0 70 70
   )
 
 # -------            otb::VectorDataExtractROI   ------------------------------
 ADD_TEST(coTuVectorDataExtractROINew ${COMMON_TESTS2}
-	otbVectorDataExtractROINew)
+        otbVectorDataExtractROINew)
 
 ADD_TEST(coTvVectorDataExtractROI ${COMMON_TESTS2}
   --compare-ogr ${NOTOL}
               ${BASELINE_FILES}/coVectorDataExtractROIOutput.shp
               ${TEMP}/coVectorDataExtractROIOutput.shp
-	 otbVectorDataExtractROI
-	${INPUTDATA}/ToulousePoints-examples.shp
-	${TEMP}/coVectorDataExtractROIOutput.shp
-	 374369.48850211215904 4853951.786124914  # Origin of the RemoteSensingRegion
+         otbVectorDataExtractROI
+        ${INPUTDATA}/ToulousePoints-examples.shp
+        ${TEMP}/coVectorDataExtractROIOutput.shp
+         374369.48850211215904 4853951.786124914  # Origin of the RemoteSensingRegion
          1000.25 -25000.2                               # Size of the Cartoregion
  )
 
@@ -224,10 +224,10 @@ ADD_TEST(coTvVectorDataExtractROI2 ${COMMON_TESTS2}
   --compare-ogr ${NOTOL}
               ${BASELINE_FILES}/coVectorDataExtractROIOutput2.shp
               ${TEMP}/coVectorDataExtractROIOutput2.shp
-	 otbVectorDataExtractROI
-	${INPUTDATA}/ToulousePoints-examples.shp
-	${TEMP}/coVectorDataExtractROIOutput2.shp
-	 374369.48850211215904 4828951.58612491376698  # Origin of the RemoteSensingRegion
+         otbVectorDataExtractROI
+        ${INPUTDATA}/ToulousePoints-examples.shp
+        ${TEMP}/coVectorDataExtractROIOutput2.shp
+         374369.48850211215904 4828951.58612491376698  # Origin of the RemoteSensingRegion
          1000.25 25000.2                               # Size of the Cartoregion
  )
 
@@ -306,7 +306,7 @@ SET_TESTS_PROPERTIES(coTvMultiChannelROI_3c_BSQ PROPERTIES DEPENDS coTvMultiChan
 
 ADD_TEST(coTvTestMultiExtractMultiUpdate ${COMMON_TESTS2}
 --compare-image  ${NOTOL}
-		 ${BASELINE}/coTvMultiExtractMultiUpdate.tif
+                 ${BASELINE}/coTvMultiExtractMultiUpdate.tif
                  ${TEMP}/coTvMultiExtractMultiUpdate.tif
      otbTestMultiExtractMultiUpdate
       ${INPUTDATA}/poupees.tif
@@ -321,8 +321,8 @@ ADD_TEST(coTvTestMultiExtractMultiUpdate ${COMMON_TESTS2}
 
 ADD_TEST(coTvMultiChannelExtractROI_Romania ${COMMON_TESTS2}
 --compare-image  ${NOTOL}
-		 ${BASELINE}/coTvMultiChannelExtractROI_Romania.tif
-                 ${TEMP}/coTvMultiChannelExtractROI_Romania.tif 
+                 ${BASELINE}/coTvMultiChannelExtractROI_Romania.tif
+                 ${TEMP}/coTvMultiChannelExtractROI_Romania.tif
      otbTestMultiExtractMultiUpdate
       ${INPUTDATA}/Romania_Extract.tif
       ${TEMP}/coTvMultiChannelExtractROI_Romania.tif
@@ -415,7 +415,7 @@ ADD_TEST(coTuMultiChannelExtractROITestRegion ${COMMON_TESTS3}
 ADD_TEST(coTuExtractROITestRegion ${COMMON_TESTS3}
          otbExtractROITestRegion)
          
-IF(OTB_DATA_USE_LARGEINPUT)       
+IF(OTB_DATA_USE_LARGEINPUT)
 ADD_TEST(coTvExtractROITestMetaData_TIFF ${COMMON_TESTS3}
          --compare-n-ascii ${NOTOL} 2
          ${TEMP}/coTvExtractROITestMetaData1.txt
@@ -449,7 +449,7 @@ ADD_TEST(coTvExtractROITestMetaData_HDR ${COMMON_TESTS3}
          ${TEMP}/coTvExtractROITestMetaData1_writeRead_hdr.txt
          ${TEMP}/coTvExtractROITestMetaData2_writeRead_hdr.txt
          )
-ENDIF(OTB_DATA_USE_LARGEINPUT)    
+ENDIF(OTB_DATA_USE_LARGEINPUT)
 
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ otbCommonTests4 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -483,10 +483,10 @@ ADD_TEST(coTuImageListNew ${COMMON_TESTS4}
          otbImageListNew)
 
 ADD_TEST(coTvImageList ${COMMON_TESTS4}
-	--compare-image ${NOTOL}   ${INPUTDATA}/amst.png
-				 ${TEMP}/amst.png
+        --compare-image ${NOTOL}   ${INPUTDATA}/amst.png
+                                 ${TEMP}/amst.png
          otbImageList
-	 ${INPUTDATA}/amst.png
+         ${INPUTDATA}/amst.png
          ${TEMP}/amst.png
 )
 
@@ -530,26 +530,26 @@ ADD_TEST(coTuConcatenateVectorImageFilterNew ${COMMON_TESTS5}
 
 ADD_TEST(coTvConcatenateVectorImageFilter ${COMMON_TESTS5}
          --compare-image ${NOTOL}
-	 ${BASELINE}/coConcatenateVectorImageFilterOutput1.hdr
+         ${BASELINE}/coConcatenateVectorImageFilterOutput1.hdr
          ${TEMP}/coConcatenateVectorImageFilterOutput1.hdr
-	 otbConcatenateVectorImageFilter
-	 ${INPUTDATA}/poupees.png
+         otbConcatenateVectorImageFilter
+         ${INPUTDATA}/poupees.png
          ${INPUTDATA}/poupees.png
-	 ${TEMP}/coConcatenateVectorImageFilterOutput1.hdr
+         ${TEMP}/coConcatenateVectorImageFilterOutput1.hdr
 )
 
 #------------    otbImageToVectorImageCastFilter --------------------------------
 
 ADD_TEST(coTuImageToVectorImageCastFilter ${COMMON_TESTS5}
-	otbImageToVectorImageCastFilterNew)
+        otbImageToVectorImageCastFilterNew)
 
 ADD_TEST(coTvImageToVectorImageCastFilter ${COMMON_TESTS5}
 --compare-image ${NOTOL}
-		${BASELINE}/coImageToVectorImageCastFilterOutput.tif
-		${TEMP}/coImageToVectorImageCastFilterOutput.tif
-		otbImageToVectorImageCastFilter
-		${INPUTDATA}/poupees.hdr
-		${TEMP}/coImageToVectorImageCastFilterOutput.tif
+                ${BASELINE}/coImageToVectorImageCastFilterOutput.tif
+                ${TEMP}/coImageToVectorImageCastFilterOutput.tif
+                otbImageToVectorImageCastFilter
+                ${INPUTDATA}/poupees.hdr
+                ${TEMP}/coImageToVectorImageCastFilterOutput.tif
 )
 
 # -------            otb::ImageToPathFilterNew  -------------------------------------------
@@ -583,32 +583,32 @@ ADD_TEST(coTuPolygonNew ${COMMON_TESTS6}
 
 ADD_TEST(coTvPolygon ${COMMON_TESTS6}
 --compare-ascii ${EPSILON_3}
-		${BASELINE_FILES}/otbPolygonTest.txt
+                ${BASELINE_FILES}/otbPolygonTest.txt
                 ${TEMP}/otbPolygonTest.txt
          otbPolygon
-	        ${TEMP}/otbPolygonTest.txt
-		2 10 7 10 7 9 5 9 5 8 7 8 7 6 9 6 9 5 7 5 7 3 2 3
-		next 6 10 11 10 11 2 4 2 3 4 8 4 8 7 6 7
+                ${TEMP}/otbPolygonTest.txt
+                2 10 7 10 7 9 5 9 5 8 7 8 7 6 9 6 9 5 7 5 7 3 2 3
+                next 6 10 11 10 11 2 4 2 3 4 8 4 8 7 6 7
 )
 
 #-------- otb::PolyLineImageIterator -----------------------------------------
 
  ADD_TEST(coTvPolyLineImageConstIterator ${COMMON_TESTS6}
     --compare-ascii ${NOTOL}
-		${BASELINE_FILES}/coTvPolyLineImageConstIterator.txt
-		 ${TEMP}/coTvPolyLineImageConstIterator.txt
+                ${BASELINE_FILES}/coTvPolyLineImageConstIterator.txt
+                 ${TEMP}/coTvPolyLineImageConstIterator.txt
          otbPolyLineImageConstIterator
-		 512 512 20
-		 ${TEMP}/coTvPolyLineImageConstIterator.txt
+                 512 512 20
+                 ${TEMP}/coTvPolyLineImageConstIterator.txt
 )
 
 ADD_TEST(coTvPolyLineImageIterator ${COMMON_TESTS6}
 --compare-image ${NOTOL}
-		${BASELINE}/coTvPolyLineImageIterator.png
-		${TEMP}/coTvPolyLineImageIterator.png
+                ${BASELINE}/coTvPolyLineImageIterator.png
+                ${TEMP}/coTvPolyLineImageIterator.png
          otbPolyLineImageIterator
-		512 512 20
-		${TEMP}/coTvPolyLineImageIterator.png
+                512 512 20
+                ${TEMP}/coTvPolyLineImageIterator.png
 )
 
 
@@ -619,20 +619,20 @@ ADD_TEST(coTuDrawPathListFilterNew ${COMMON_TESTS6}
 
 ADD_TEST(coTvDrawPathListFilter ${COMMON_TESTS6}
 --compare-image ${NOTOL}
-		${BASELINE}/coTvDrawPathListFilterOutput.png
-		${TEMP}/coTvDrawPathListFilterOutput.png
-		otbDrawPathListFilter
-		512 512 20
-		${TEMP}/coTvDrawPathListFilterOutput.png
+                ${BASELINE}/coTvDrawPathListFilterOutput.png
+                ${TEMP}/coTvDrawPathListFilterOutput.png
+                otbDrawPathListFilter
+                512 512 20
+                ${TEMP}/coTvDrawPathListFilterOutput.png
 )
 
 ADD_TEST(coTvDrawPathListFilterWithValue ${COMMON_TESTS6}
 --compare-image ${NOTOL}
-		${BASELINE}/coTvDrawPathListFilterWithValueOutput.png
-		${TEMP}/coTvDrawPathListFilterWithValueOutput.png
-		otbDrawPathListFilterWithValue
-		512 512 20
-		${TEMP}/coTvDrawPathListFilterWithValueOutput.png
+                ${BASELINE}/coTvDrawPathListFilterWithValueOutput.png
+                ${TEMP}/coTvDrawPathListFilterWithValueOutput.png
+                otbDrawPathListFilterWithValue
+                512 512 20
+                ${TEMP}/coTvDrawPathListFilterWithValueOutput.png
 )
 
 
@@ -644,11 +644,11 @@ otbDrawPathFilterNew
 
 ADD_TEST(coTvDrawPatFilter ${COMMON_TESTS6}
 --compare-image ${NOTOL}
-		${BASELINE}/coTvDrawPathFilterOutput.png
-		${TEMP}/coTvDrawPathFilterOutput.png
-		otbDrawPathFilter
-		512 512 20
-		${TEMP}/coTvDrawPathFilterOutput.png
+                ${BASELINE}/coTvDrawPathFilterOutput.png
+                ${TEMP}/coTvDrawPathFilterOutput.png
+                otbDrawPathFilter
+                512 512 20
+                ${TEMP}/coTvDrawPathFilterOutput.png
 )
 
 # -------  otb::UnaryFunctorNeighborhoodImageFilter ----------------------
@@ -658,12 +658,12 @@ otbUnaryFunctorNeighborhoodImageFilterNew
 
 ADD_TEST(coTvUnaryFunctorNeighborhoodImageFilter ${COMMON_TESTS6}
 --compare-image ${NOTOL}
-		${BASELINE}/coTvUnaryFunctorNeighborhoodImageFilter.png
-		${TEMP}/coTvUnaryFunctorNeighborhoodImageFilter.png
+                ${BASELINE}/coTvUnaryFunctorNeighborhoodImageFilter.png
+                ${TEMP}/coTvUnaryFunctorNeighborhoodImageFilter.png
     otbUnaryFunctorNeighborhoodImageFilter
         ${INPUTDATA}/amst.png
-	${TEMP}/coTvUnaryFunctorNeighborhoodImageFilter.png
-	3
+        ${TEMP}/coTvUnaryFunctorNeighborhoodImageFilter.png
+        3
 )
 
 #--------------------otb::Rectangle
@@ -672,11 +672,11 @@ ADD_TEST(coTuRectangleNew ${COMMON_TESTS6}
 
 ADD_TEST(coTvRectangle ${COMMON_TESTS6}
 --compare-ascii ${EPSILON_3}
-		${BASELINE_FILES}/otbRectangleTest.txt
+                ${BASELINE_FILES}/otbRectangleTest.txt
                 ${TEMP}/otbRectangleTest.txt
          otbRectangle
-	        ${TEMP}/otbRectangleTest.txt
-		2.12 2.35 12.54 2.45   3. 0.15  1. 1.
+                ${TEMP}/otbRectangleTest.txt
+                2.12 2.35 12.54 2.45   3. 0.15  1. 1.
 
 
 )
@@ -733,11 +733,11 @@ ADD_TEST(coTuShiftScaleImageAdaptorNew ${COMMON_TESTS7}
 
 ADD_TEST(coTvShiftScaleImageAdaptor ${COMMON_TESTS7}
   --compare-image ${EPSILON_9}
-	          ${BASELINE}/coTvShiftScaleImageAdaptor.tif    # copie the input image
-		  ${TEMP}/coTvShiftScaleImageAdaptor.tif
+                  ${BASELINE}/coTvShiftScaleImageAdaptor.tif    # copie the input image
+                  ${TEMP}/coTvShiftScaleImageAdaptor.tif
      otbShiftScaleImageAdaptor
         ${INPUTDATA}/ROI_IKO_PAN_LesHalles.tif
-	${TEMP}/coTvShiftScaleImageAdaptor.tif
+        ${TEMP}/coTvShiftScaleImageAdaptor.tif
 )
 
 # -------------  otb::StandardWriterWatcher ----------------------------
@@ -745,8 +745,8 @@ ADD_TEST(coTvShiftScaleImageAdaptor ${COMMON_TESTS7}
 ADD_TEST(coTvStandardWriterWatcher ${COMMON_TESTS7}
      otbStandardWriterWatcher
         ${INPUTDATA}/couleurs.tif
-	${TEMP}/coTvStandardWriterWatcherOutput.tif
-	20
+        ${TEMP}/coTvStandardWriterWatcherOutput.tif
+        20
 )
 
 # ------ otb::UnaryFunctorNeighborhoodWithOffsetImageFilterNew  ----
@@ -756,14 +756,14 @@ ADD_TEST(coTuUnaryFunctorNeighborhoodWithOffsetImageFilterNew ${COMMON_TESTS7}
 )
 ADD_TEST(coTvUnaryFunctorNeighborhoodWithOffsetImageFilter ${COMMON_TESTS7}
 --compare-image ${NOTOL}
-	        ${INPUTDATA}/poupees.tif
+                ${INPUTDATA}/poupees.tif
                 ${TEMP}/coTvUnaryFunctorNeighborhoodWithOffsetImageFilter.tif
     otbUnaryFunctorNeighborhoodWithOffsetImageFilter
         ${INPUTDATA}/poupees.tif
-	${TEMP}/coTvUnaryFunctorNeighborhoodWithOffsetImageFilter.tif
-	2 # radius
-	2 # offset[0]
-	2  #offset[1]
+        ${TEMP}/coTvUnaryFunctorNeighborhoodWithOffsetImageFilter.tif
+        2 # radius
+        2 # offset[0]
+        2  #offset[1]
 )
 
 
@@ -773,9 +773,9 @@ ADD_TEST(coTuRemoteSensingRegionNew ${COMMON_TESTS7}
                      otbRemoteSensingRegionNew )
 
 ADD_TEST(coTvRemoteSensingRegion ${COMMON_TESTS7}
-	 otbRemoteSensingRegion
-	 1.21 2.33 58.47 59.49  #size et index of the region
-	 0. 0.                  # Point to check
+         otbRemoteSensingRegion
+         1.21 2.33 58.47 59.49  #size et index of the region
+         0. 0.                  # Point to check
  )
 
 
@@ -791,16 +791,16 @@ otbQuickLookImageGeneratorNew
 
 ADD_TEST(coTvQuickLookImageGenerator ${COMMON_TESTS8}
      --compare-image ${EPSILON_9}
-	   	     ${BASELINE}/coQuickLookImageGenerator.tif
+                        ${BASELINE}/coQuickLookImageGenerator.tif
                      ${TEMP}/coQuickLookImageGenerator.tif
    otbQuickLookImageGenerator
         ${INPUTDATA}/qb_RoadExtract.img.hdr
-	${TEMP}/coQuickLookImageGenerator.tif
-	10 # sr
-	2 # variance
-	0.5 # max error
-	4 # max kernel width
-	1 # usespacing
+        ${TEMP}/coQuickLookImageGenerator.tif
+        10 # sr
+        2 # variance
+        0.5 # max error
+        4 # max kernel width
+        1 # usespacing
 )
 
 # -------------  otb::ImageRegionTileMapSplitter ----------------------------
@@ -882,30 +882,30 @@ otbVectorDataToImageFilterNew
 IF(OTB_DATA_USE_LARGEINPUT)
 ADD_TEST(coTvVectorDataToImageFilter ${COMMON_TESTS9}
      --compare-image ${NOTOL}
-	   	     ${BASELINE}/coTvVectorDataToImageFilter.png
+                        ${BASELINE}/coTvVectorDataToImageFilter.png
                      ${TEMP}/coTvVectorDataToImageFilter.png
    otbVectorDataToImageFilter
         ${LARGEINPUT}/VECTOR/MidiPyrenees/roads.shp
-	${TEMP}/coTvVectorDataToImageFilter.png
+        ${TEMP}/coTvVectorDataToImageFilter.png
         ${INPUTDATA}/DejaVuSans.ttf # font
 )
 
 ADD_TEST(coTvVectorDataToImageFilterBinary ${COMMON_TESTS9}
      --compare-image ${NOTOL}
-	   	     ${BASELINE}/coTvVectorDataToImageFilterBinary.png
+                        ${BASELINE}/coTvVectorDataToImageFilterBinary.png
                      ${TEMP}/coTvVectorDataToImageFilterBinary.png
    otbVectorDataToImageFilterBinary
         ${LARGEINPUT}/VECTOR/MidiPyrenees/roads.shp
-	${TEMP}/coTvVectorDataToImageFilterBinary.png
+        ${TEMP}/coTvVectorDataToImageFilterBinary.png
 )
 
 ADD_TEST(coTvVectorDataToImageFilterNoFonts ${COMMON_TESTS9}
      --compare-image ${NOTOL}
-	   	     ${BASELINE}/coTvVectorDataToImageFilterNoFonts.png
+                        ${BASELINE}/coTvVectorDataToImageFilterNoFonts.png
                      ${TEMP}/coTvVectorDataToImageFilterNoFonts.png
    otbVectorDataToImageFilterNoFonts
         ${LARGEINPUT}/VECTOR/MidiPyrenees/roads.shp
-	${TEMP}/coTvVectorDataToImageFilterNoFonts.png
+        ${TEMP}/coTvVectorDataToImageFilterNoFonts.png
 )
 
 ENDIF(OTB_DATA_USE_LARGEINPUT)
@@ -916,12 +916,12 @@ ENDIF(OTB_DATA_USE_LARGEINPUT)
 IF(OTB_DATA_USE_LARGEINPUT)
 ADD_TEST(coTvVectorDataToImageFilterSensorModel ${COMMON_TESTS9}
      --compare-image ${NOTOL}
-	   	     ${BASELINE}/coTvVectorDataToImageFilterSensorModel.png
+                        ${BASELINE}/coTvVectorDataToImageFilterSensorModel.png
                      ${TEMP}/coTvVectorDataToImageFilterSensorModel.png
    otbVectorDataToImageFilterSensorModel
         ${LARGEINPUT}/VECTOR/MidiPyrenees/roads.shp
         ${LARGEINPUT}/QUICKBIRD/TOULOUSE/000000128955_01_P001_PAN/02APR01105228-P1BS-000000128955_01_P001.TIF
-	${TEMP}/coTvVectorDataToImageFilterSensorModel.png
+        ${TEMP}/coTvVectorDataToImageFilterSensorModel.png
         ${INPUTDATA}/DejaVuSans.ttf # font
 )
 ENDIF(OTB_DATA_USE_LARGEINPUT)
diff --git a/Testing/Code/DisparityMap/CMakeLists.txt b/Testing/Code/DisparityMap/CMakeLists.txt
index df820aee955cd27691576bfc2fa971f2b3aada98..0cad7b02b95f0825e7fe30e29d8d140b3993b10e 100644
--- a/Testing/Code/DisparityMap/CMakeLists.txt
+++ b/Testing/Code/DisparityMap/CMakeLists.txt
@@ -24,7 +24,7 @@ SET(DISPARITYMAP_TESTS3 ${CXX_TEST_PATH}/otbDisparityMapTests3)
 # -------            otb::DisparityMapEstimationMethod   ----------
 
 ADD_TEST(dmTuDisparityMapEstimationMethodNew ${DISPARITYMAP_TESTS1}
-	 otbDisparityMapEstimationMethodNew)
+         otbDisparityMapEstimationMethodNew)
 
 ADD_TEST(dmTvDisparityMapEstimationMethod ${DISPARITYMAP_TESTS1}
    --compare-ascii ${NOTOL}
@@ -52,68 +52,68 @@ ADD_TEST(dmTlDisparityMapEstimationMethod ${DISPARITYMAP_TESTS1}
 # -------            otb::PointSetToDeformationFieldGenerator   ----------
 
 ADD_TEST(dmTuPointSetToDeformationFieldGeneratorNew ${DISPARITYMAP_TESTS1}
-	 otbPointSetToDeformationFieldGeneratorNew)
+         otbPointSetToDeformationFieldGeneratorNew)
 
 # -------            otb::NearestPointDeformationFieldGenerator   ----------
 
 ADD_TEST(dmTuNearestPointDeformationFieldGeneratorNew ${DISPARITYMAP_TESTS1}
-	 otbNearestPointDeformationFieldGeneratorNew)
+         otbNearestPointDeformationFieldGeneratorNew)
 
 ADD_TEST(dmTvNearestPointDeformationFieldGenerator ${DISPARITYMAP_TESTS1}
               --compare-image ${EPSILON_10}
-		${BASELINE}/dmTvNearestPointDeformationField.hdr
-		${TEMP}/dmTvNearestPointDeformationField.hdr
-	 otbNearestPointDeformationFieldGenerator
-	 ${TEMP}/dmTvNearestPointDeformationField.hdr
+                ${BASELINE}/dmTvNearestPointDeformationField.hdr
+                ${TEMP}/dmTvNearestPointDeformationField.hdr
+         otbNearestPointDeformationFieldGenerator
+         ${TEMP}/dmTvNearestPointDeformationField.hdr
 )
 
 # -------            otb::NCCRegistrationFilter   ----------
 
 ADD_TEST(dmTuNCCRegistrationFilterNew ${DISPARITYMAP_TESTS1}
-	 otbNCCRegistrationFilterNew)
+         otbNCCRegistrationFilterNew)
 
 ADD_TEST(dmTvNCCRegistrationFilter ${DISPARITYMAP_TESTS1}
 --compare-image ${EPSILON_10}
-		${BASELINE}/dmNCCRegistrationFilterOutput.tif
-		${TEMP}/dmNCCRegistrationFilterOutput.tif
-		otbNCCRegistrationFilter
-		${INPUTDATA}/ROI_IKO_PAN_LesHalles_sub.tif
-		${INPUTDATA}/ROI_IKO_PAN_LesHalles_sub_warped_sinus.tif
-		${TEMP}/dmNCCRegistrationFilterOutput.tif
-		5 1.0 2)
+                ${BASELINE}/dmNCCRegistrationFilterOutput.tif
+                ${TEMP}/dmNCCRegistrationFilterOutput.tif
+                otbNCCRegistrationFilter
+                ${INPUTDATA}/ROI_IKO_PAN_LesHalles_sub.tif
+                ${INPUTDATA}/ROI_IKO_PAN_LesHalles_sub_warped_sinus.tif
+                ${TEMP}/dmNCCRegistrationFilterOutput.tif
+                5 1.0 2)
 
 # -------  otb::NNearestPointsLinearInterpolateDeformationFieldGenerator   ----------
 
 ADD_TEST(dmTuNNearestPointsLinearInterpolateDeformationFieldGeneratorNew ${DISPARITYMAP_TESTS1}
-	 otbNNearestPointsLinearInterpolateDeformationFieldGeneratorNew)
+         otbNNearestPointsLinearInterpolateDeformationFieldGeneratorNew)
 
 ADD_TEST(dmTvNNearestPointsLinearInterpolateDeformationFieldGenerator ${DISPARITYMAP_TESTS1}
               --compare-image ${EPSILON_10}
-		${BASELINE}/dmTvNNearestPointsLinearInterpolateDeformationField.hdr
-		${TEMP}/dmTvNNearestPointsLinearInterpolateDeformationField.hdr
-	 otbNNearestPointsLinearInterpolateDeformationFieldGenerator
-	 ${TEMP}/dmTvNNearestPointsLinearInterpolateDeformationField.hdr
+                ${BASELINE}/dmTvNNearestPointsLinearInterpolateDeformationField.hdr
+                ${TEMP}/dmTvNNearestPointsLinearInterpolateDeformationField.hdr
+         otbNNearestPointsLinearInterpolateDeformationFieldGenerator
+         ${TEMP}/dmTvNNearestPointsLinearInterpolateDeformationField.hdr
 )
 
 
 # -------  otb::BSplinesInterpolateDeformationFieldGenerator   ----------
 
 ADD_TEST(dmTuBSplinesInterpolateDeformationFieldGeneratorNew ${DISPARITYMAP_TESTS1}
-	 otbNNearestPointsLinearInterpolateDeformationFieldGeneratorNew)
+         otbNNearestPointsLinearInterpolateDeformationFieldGeneratorNew)
 
 ADD_TEST(dmTvBSplinesInterpolateDeformationFieldGenerator ${DISPARITYMAP_TESTS1}
               --compare-image ${EPSILON_10}
-		${BASELINE}/dmTvBSplinesInterpolateDeformationField.hdr
-		${TEMP}/dmTvBSplinesInterpolateDeformationField.hdr
-	 otbBSplinesInterpolateDeformationFieldGenerator
-	 ${TEMP}/dmTvBSplinesInterpolateDeformationField.hdr
+                ${BASELINE}/dmTvBSplinesInterpolateDeformationField.hdr
+                ${TEMP}/dmTvBSplinesInterpolateDeformationField.hdr
+         otbBSplinesInterpolateDeformationFieldGenerator
+         ${TEMP}/dmTvBSplinesInterpolateDeformationField.hdr
 )
 
 
 # -------            otb::PointSetWithTransformToDeformationFieldGenerator   ----------
 
 ADD_TEST(dmTuPointSetWithTransformToDeformationFieldGeneratorNew ${DISPARITYMAP_TESTS1}
-	 otbPointSetWithTransformToDeformationFieldGeneratorNew)
+         otbPointSetWithTransformToDeformationFieldGeneratorNew)
 
 
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -123,59 +123,59 @@ ADD_TEST(dmTuPointSetWithTransformToDeformationFieldGeneratorNew ${DISPARITYMAP_
 # -------            otb::NearestTransformDeformationFieldGenerator   ----------
 
 ADD_TEST(dmTuNearestTransformDeformationFieldGeneratorNew ${DISPARITYMAP_TESTS2}
-	 otbNearestTransformDeformationFieldGeneratorNew)
+         otbNearestTransformDeformationFieldGeneratorNew)
 
 ADD_TEST(dmTvNearestTransformDeformationFieldGenerator ${DISPARITYMAP_TESTS2}
               --compare-image ${EPSILON_10}
-		${BASELINE}/dmTvNearestTransformDeformationField.hdr
-		${TEMP}/dmTvNearestTransformDeformationField.hdr
-	 otbNearestTransformDeformationFieldGenerator
-	 ${TEMP}/dmTvNearestTransformDeformationField.hdr
+                ${BASELINE}/dmTvNearestTransformDeformationField.hdr
+                ${TEMP}/dmTvNearestTransformDeformationField.hdr
+         otbNearestTransformDeformationFieldGenerator
+         ${TEMP}/dmTvNearestTransformDeformationField.hdr
 )
 
 
 # -------  otb::NNearestTransformsLinearInterpolateDeformationFieldGenerator   ----------
 
 ADD_TEST(dmTuNNearestTransformsLinearInterpolateDeformationFieldGeneratorNew ${DISPARITYMAP_TESTS2}
-	 otbNNearestTransformsLinearInterpolateDeformationFieldGeneratorNew)
+         otbNNearestTransformsLinearInterpolateDeformationFieldGeneratorNew)
 
 ADD_TEST(dmTvNNearestTransformsLinearInterpolateDeformationFieldGenerator ${DISPARITYMAP_TESTS2}
               --compare-image ${EPSILON_10}
-		${BASELINE}/dmTvNNearestTransformsLinearInterpolateDeformationField.hdr
-		${TEMP}/dmTvNNearestTransformsLinearInterpolateDeformationField.hdr
-	 otbNNearestTransformsLinearInterpolateDeformationFieldGenerator
-	 ${TEMP}/dmTvNNearestTransformsLinearInterpolateDeformationField.hdr
+                ${BASELINE}/dmTvNNearestTransformsLinearInterpolateDeformationField.hdr
+                ${TEMP}/dmTvNNearestTransformsLinearInterpolateDeformationField.hdr
+         otbNNearestTransformsLinearInterpolateDeformationFieldGenerator
+         ${TEMP}/dmTvNNearestTransformsLinearInterpolateDeformationField.hdr
 )
 
 # -------  otb::BSplinesInterpolateTransformDeformationFieldGenerator ----------
 
 ADD_TEST(dmTuBSplinesInterpolateTransformDeformationFieldGeneratorNew ${DISPARITYMAP_TESTS2}
-	 otbBSplinesInterpolateTransformDeformationFieldGeneratorNew)
+         otbBSplinesInterpolateTransformDeformationFieldGeneratorNew)
 
 ADD_TEST(dmTvBSplinesInterpolateTransformDeformationFieldGenerator ${DISPARITYMAP_TESTS2}
               --compare-image ${EPSILON_4}
-		${BASELINE}/dmTvBSplinesInterpolateTransformDeformationFieldGenerator.hdr
-		${TEMP}/dmTvBSplinesInterpolateTransformDeformationFieldGenerator.hdr
-	 otbBSplinesInterpolateTransformDeformationFieldGenerator
-	 ${TEMP}/dmTvBSplinesInterpolateTransformDeformationFieldGenerator.hdr
+                ${BASELINE}/dmTvBSplinesInterpolateTransformDeformationFieldGenerator.hdr
+                ${TEMP}/dmTvBSplinesInterpolateTransformDeformationFieldGenerator.hdr
+         otbBSplinesInterpolateTransformDeformationFieldGenerator
+         ${TEMP}/dmTvBSplinesInterpolateTransformDeformationFieldGenerator.hdr
 )
 
 # -------  Additional tests for deformation fields estimation   ----------
 
 ADD_TEST(dmTlTranslationDeformationFieldEstimation ${DISPARITYMAP_TESTS2}
               --compare-n-images ${EPSILON_4} 12
-	      ${BASELINE}/dmTvTranslationDeformationFieldEstimationOutput_bs_df.hdr
-	      ${TEMP}/dmTvTranslationDeformationFieldEstimationOutput_bs_df.hdr
-	      ${BASELINE}/dmTvTranslationDeformationFieldEstimationOutput_bs_oi.tif
-	      ${TEMP}/dmTvTranslationDeformationFieldEstimationOutput_bs_oi.tif
-	      ${BASELINE}/dmTvTranslationDeformationFieldEstimationOutput_np_df.hdr
-	      ${TEMP}/dmTvTranslationDeformationFieldEstimationOutput_np_df.hdr
-	      ${BASELINE}/dmTvTranslationDeformationFieldEstimationOutput_np_oi.tif
-	      ${TEMP}/dmTvTranslationDeformationFieldEstimationOutput_np_oi.tif
-	      ${BASELINE}/dmTvTranslationDeformationFieldEstimationOutput_nnp_df.hdr
-	      ${TEMP}/dmTvTranslationDeformationFieldEstimationOutput_nnp_df.hdr
-	      ${BASELINE}/dmTvTranslationDeformationFieldEstimationOutput_nnp_oi.tif
-	      ${TEMP}/dmTvTranslationDeformationFieldEstimationOutput_nnp_oi.tif
+              ${BASELINE}/dmTvTranslationDeformationFieldEstimationOutput_bs_df.hdr
+              ${TEMP}/dmTvTranslationDeformationFieldEstimationOutput_bs_df.hdr
+              ${BASELINE}/dmTvTranslationDeformationFieldEstimationOutput_bs_oi.tif
+              ${TEMP}/dmTvTranslationDeformationFieldEstimationOutput_bs_oi.tif
+              ${BASELINE}/dmTvTranslationDeformationFieldEstimationOutput_np_df.hdr
+              ${TEMP}/dmTvTranslationDeformationFieldEstimationOutput_np_df.hdr
+              ${BASELINE}/dmTvTranslationDeformationFieldEstimationOutput_np_oi.tif
+              ${TEMP}/dmTvTranslationDeformationFieldEstimationOutput_np_oi.tif
+              ${BASELINE}/dmTvTranslationDeformationFieldEstimationOutput_nnp_df.hdr
+              ${TEMP}/dmTvTranslationDeformationFieldEstimationOutput_nnp_df.hdr
+              ${BASELINE}/dmTvTranslationDeformationFieldEstimationOutput_nnp_oi.tif
+              ${TEMP}/dmTvTranslationDeformationFieldEstimationOutput_nnp_oi.tif
         ${BASELINE}/dmTvTranslationDeformationFieldEstimationOutput_nt_df.hdr
         ${TEMP}/dmTvTranslationDeformationFieldEstimationOutput_nt_df.hdr
         ${BASELINE}/dmTvTranslationDeformationFieldEstimationOutput_nt_oi.tif
@@ -188,60 +188,60 @@ ADD_TEST(dmTlTranslationDeformationFieldEstimation ${DISPARITYMAP_TESTS2}
         ${TEMP}/dmTvTranslationDeformationFieldEstimationOutput_bst_df.hdr
         ${BASELINE}/dmTvTranslationDeformationFieldEstimationOutput_bst_oi.tif
         ${TEMP}/dmTvTranslationDeformationFieldEstimationOutput_bst_oi.tif
-	 otbTranslationDeformationFieldEstimation
-	 ${INPUTDATA}/ROI_IKO_PAN_LesHalles_sub.tif
-	 ${INPUTDATA}/ROI_IKO_PAN_LesHalles_sub_warped_translation.tif
-	 ${TEMP}/dmTvTranslationDeformationFieldEstimationOutput
-	  15 10 10 250 0.95 4 50
+         otbTranslationDeformationFieldEstimation
+         ${INPUTDATA}/ROI_IKO_PAN_LesHalles_sub.tif
+         ${INPUTDATA}/ROI_IKO_PAN_LesHalles_sub_warped_translation.tif
+         ${TEMP}/dmTvTranslationDeformationFieldEstimationOutput
+          15 10 10 250 0.95 4 50
 )
 
 ADD_TEST(dmTlEuler2DDeformationFieldEstimation ${DISPARITYMAP_TESTS2}
               --compare-n-images ${EPSILON_4} 12
-	      ${BASELINE}/dmTvEuler2DDeformationFieldEstimationOutput_bs_df.hdr
-	      ${TEMP}/dmTvEuler2DDeformationFieldEstimationOutput_bs_df.hdr
-	      ${BASELINE}/dmTvEuler2DDeformationFieldEstimationOutput_bs_oi.tif
-	      ${TEMP}/dmTvEuler2DDeformationFieldEstimationOutput_bs_oi.tif
-	      ${BASELINE}/dmTvEuler2DDeformationFieldEstimationOutput_np_df.hdr
-	      ${TEMP}/dmTvEuler2DDeformationFieldEstimationOutput_np_df.hdr
-	      ${BASELINE}/dmTvEuler2DDeformationFieldEstimationOutput_np_oi.tif
-	      ${TEMP}/dmTvEuler2DDeformationFieldEstimationOutput_np_oi.tif
-	      ${BASELINE}/dmTvEuler2DDeformationFieldEstimationOutput_nnp_df.hdr
-	      ${TEMP}/dmTvEuler2DDeformationFieldEstimationOutput_nnp_df.hdr
-	      ${BASELINE}/dmTvEuler2DDeformationFieldEstimationOutput_nnp_oi.tif
-	      ${TEMP}/dmTvEuler2DDeformationFieldEstimationOutput_nnp_oi.tif
-	      ${BASELINE}/dmTvEuler2DDeformationFieldEstimationOutput_nt_df.hdr
-	      ${TEMP}/dmTvEuler2DDeformationFieldEstimationOutput_nt_df.hdr
-	      ${BASELINE}/dmTvEuler2DDeformationFieldEstimationOutput_nt_oi.tif
-	      ${TEMP}/dmTvEuler2DDeformationFieldEstimationOutput_nt_oi.tif
-	      ${BASELINE}/dmTvEuler2DDeformationFieldEstimationOutput_nnt_df.hdr
-	      ${TEMP}/dmTvEuler2DDeformationFieldEstimationOutput_nnt_df.hdr
-	      ${BASELINE}/dmTvEuler2DDeformationFieldEstimationOutput_nnt_oi.tif
-	      ${TEMP}/dmTvEuler2DDeformationFieldEstimationOutput_nnt_oi.tif
-	      ${BASELINE}/dmTvEuler2DDeformationFieldEstimationOutput_bst_df.hdr
-	      ${TEMP}/dmTvEuler2DDeformationFieldEstimationOutput_bst_df.hdr
-	      ${BASELINE}/dmTvEuler2DDeformationFieldEstimationOutput_bst_oi.tif
-	      ${TEMP}/dmTvEuler2DDeformationFieldEstimationOutput_bst_oi.tif
-	 otbEuler2DDeformationFieldEstimation
-	 ${INPUTDATA}/ROI_IKO_PAN_LesHalles_sub.tif
-	 ${INPUTDATA}/ROI_IKO_PAN_LesHalles_sub_warped_euler2D.tif
-	 ${TEMP}/dmTvEuler2DDeformationFieldEstimationOutput
-	 15 10 0.01 250 0.95 4 50 128 128
+              ${BASELINE}/dmTvEuler2DDeformationFieldEstimationOutput_bs_df.hdr
+              ${TEMP}/dmTvEuler2DDeformationFieldEstimationOutput_bs_df.hdr
+              ${BASELINE}/dmTvEuler2DDeformationFieldEstimationOutput_bs_oi.tif
+              ${TEMP}/dmTvEuler2DDeformationFieldEstimationOutput_bs_oi.tif
+              ${BASELINE}/dmTvEuler2DDeformationFieldEstimationOutput_np_df.hdr
+              ${TEMP}/dmTvEuler2DDeformationFieldEstimationOutput_np_df.hdr
+              ${BASELINE}/dmTvEuler2DDeformationFieldEstimationOutput_np_oi.tif
+              ${TEMP}/dmTvEuler2DDeformationFieldEstimationOutput_np_oi.tif
+              ${BASELINE}/dmTvEuler2DDeformationFieldEstimationOutput_nnp_df.hdr
+              ${TEMP}/dmTvEuler2DDeformationFieldEstimationOutput_nnp_df.hdr
+              ${BASELINE}/dmTvEuler2DDeformationFieldEstimationOutput_nnp_oi.tif
+              ${TEMP}/dmTvEuler2DDeformationFieldEstimationOutput_nnp_oi.tif
+              ${BASELINE}/dmTvEuler2DDeformationFieldEstimationOutput_nt_df.hdr
+              ${TEMP}/dmTvEuler2DDeformationFieldEstimationOutput_nt_df.hdr
+              ${BASELINE}/dmTvEuler2DDeformationFieldEstimationOutput_nt_oi.tif
+              ${TEMP}/dmTvEuler2DDeformationFieldEstimationOutput_nt_oi.tif
+              ${BASELINE}/dmTvEuler2DDeformationFieldEstimationOutput_nnt_df.hdr
+              ${TEMP}/dmTvEuler2DDeformationFieldEstimationOutput_nnt_df.hdr
+              ${BASELINE}/dmTvEuler2DDeformationFieldEstimationOutput_nnt_oi.tif
+              ${TEMP}/dmTvEuler2DDeformationFieldEstimationOutput_nnt_oi.tif
+              ${BASELINE}/dmTvEuler2DDeformationFieldEstimationOutput_bst_df.hdr
+              ${TEMP}/dmTvEuler2DDeformationFieldEstimationOutput_bst_df.hdr
+              ${BASELINE}/dmTvEuler2DDeformationFieldEstimationOutput_bst_oi.tif
+              ${TEMP}/dmTvEuler2DDeformationFieldEstimationOutput_bst_oi.tif
+         otbEuler2DDeformationFieldEstimation
+         ${INPUTDATA}/ROI_IKO_PAN_LesHalles_sub.tif
+         ${INPUTDATA}/ROI_IKO_PAN_LesHalles_sub_warped_euler2D.tif
+         ${TEMP}/dmTvEuler2DDeformationFieldEstimationOutput
+         15 10 0.01 250 0.95 4 50 128 128
 )
 
 ADD_TEST(dmTlCenteredRigidDeformationFieldEstimation ${DISPARITYMAP_TESTS2}
               --compare-n-images ${EPSILON_4} 12
-	      ${BASELINE}/dmTvCenteredRigidDeformationFieldEstimationOutput_bs_df.hdr
-	      ${TEMP}/dmTvCenteredRigidDeformationFieldEstimationOutput_bs_df.hdr
-	      ${BASELINE}/dmTvCenteredRigidDeformationFieldEstimationOutput_bs_oi.tif
-	      ${TEMP}/dmTvCenteredRigidDeformationFieldEstimationOutput_bs_oi.tif
-	      ${BASELINE}/dmTvCenteredRigidDeformationFieldEstimationOutput_np_df.hdr
-	      ${TEMP}/dmTvCenteredRigidDeformationFieldEstimationOutput_np_df.hdr
-	      ${BASELINE}/dmTvCenteredRigidDeformationFieldEstimationOutput_np_oi.tif
-	      ${TEMP}/dmTvCenteredRigidDeformationFieldEstimationOutput_np_oi.tif
-	      ${BASELINE}/dmTvCenteredRigidDeformationFieldEstimationOutput_nnp_df.hdr
-	      ${TEMP}/dmTvCenteredRigidDeformationFieldEstimationOutput_nnp_df.hdr
-	      ${BASELINE}/dmTvCenteredRigidDeformationFieldEstimationOutput_nnp_oi.tif
-	      ${TEMP}/dmTvCenteredRigidDeformationFieldEstimationOutput_nnp_oi.tif
+              ${BASELINE}/dmTvCenteredRigidDeformationFieldEstimationOutput_bs_df.hdr
+              ${TEMP}/dmTvCenteredRigidDeformationFieldEstimationOutput_bs_df.hdr
+              ${BASELINE}/dmTvCenteredRigidDeformationFieldEstimationOutput_bs_oi.tif
+              ${TEMP}/dmTvCenteredRigidDeformationFieldEstimationOutput_bs_oi.tif
+              ${BASELINE}/dmTvCenteredRigidDeformationFieldEstimationOutput_np_df.hdr
+              ${TEMP}/dmTvCenteredRigidDeformationFieldEstimationOutput_np_df.hdr
+              ${BASELINE}/dmTvCenteredRigidDeformationFieldEstimationOutput_np_oi.tif
+              ${TEMP}/dmTvCenteredRigidDeformationFieldEstimationOutput_np_oi.tif
+              ${BASELINE}/dmTvCenteredRigidDeformationFieldEstimationOutput_nnp_df.hdr
+              ${TEMP}/dmTvCenteredRigidDeformationFieldEstimationOutput_nnp_df.hdr
+              ${BASELINE}/dmTvCenteredRigidDeformationFieldEstimationOutput_nnp_oi.tif
+              ${TEMP}/dmTvCenteredRigidDeformationFieldEstimationOutput_nnp_oi.tif
         ${BASELINE}/dmTvCenteredRigidDeformationFieldEstimationOutput_nt_df.hdr
         ${TEMP}/dmTvCenteredRigidDeformationFieldEstimationOutput_nt_df.hdr
         ${BASELINE}/dmTvCenteredRigidDeformationFieldEstimationOutput_nt_oi.tif
@@ -254,28 +254,28 @@ ADD_TEST(dmTlCenteredRigidDeformationFieldEstimation ${DISPARITYMAP_TESTS2}
         ${TEMP}/dmTvCenteredRigidDeformationFieldEstimationOutput_bst_df.hdr
         ${BASELINE}/dmTvCenteredRigidDeformationFieldEstimationOutput_bst_oi.tif
         ${TEMP}/dmTvCenteredRigidDeformationFieldEstimationOutput_bst_oi.tif
-	 otbCenteredRigidDeformationFieldEstimation
-	 ${INPUTDATA}/ROI_IKO_PAN_LesHalles_sub.tif
-	 ${INPUTDATA}/ROI_IKO_PAN_LesHalles_sub_warped_centered_rigid.tif
-	 ${TEMP}/dmTvCenteredRigidDeformationFieldEstimationOutput
-	 15 5 0.01 250 0.95 4 50 127 65
+         otbCenteredRigidDeformationFieldEstimation
+         ${INPUTDATA}/ROI_IKO_PAN_LesHalles_sub.tif
+         ${INPUTDATA}/ROI_IKO_PAN_LesHalles_sub_warped_centered_rigid.tif
+         ${TEMP}/dmTvCenteredRigidDeformationFieldEstimationOutput
+         15 5 0.01 250 0.95 4 50 127 65
 )
 
 
 ADD_TEST(dmTlSinusoidDeformationFieldEstimation ${DISPARITYMAP_TESTS2}
               --compare-n-images ${EPSILON_4} 12
-	      ${BASELINE}/dmTvSinusoidDeformationFieldEstimationOutput_bs_df.hdr
-	      ${TEMP}/dmTvSinusoidDeformationFieldEstimationOutput_bs_df.hdr
-	      ${BASELINE}/dmTvSinusoidDeformationFieldEstimationOutput_bs_oi.tif
-	      ${TEMP}/dmTvSinusoidDeformationFieldEstimationOutput_bs_oi.tif
-	      ${BASELINE}/dmTvSinusoidDeformationFieldEstimationOutput_np_df.hdr
-	      ${TEMP}/dmTvSinusoidDeformationFieldEstimationOutput_np_df.hdr
-	      ${BASELINE}/dmTvSinusoidDeformationFieldEstimationOutput_np_oi.tif
-	      ${TEMP}/dmTvSinusoidDeformationFieldEstimationOutput_np_oi.tif
-	      ${BASELINE}/dmTvSinusoidDeformationFieldEstimationOutput_nnp_df.hdr
-	      ${TEMP}/dmTvSinusoidDeformationFieldEstimationOutput_nnp_df.hdr
-	      ${BASELINE}/dmTvSinusoidDeformationFieldEstimationOutput_nnp_oi.tif
-	      ${TEMP}/dmTvSinusoidDeformationFieldEstimationOutput_nnp_oi.tif
+              ${BASELINE}/dmTvSinusoidDeformationFieldEstimationOutput_bs_df.hdr
+              ${TEMP}/dmTvSinusoidDeformationFieldEstimationOutput_bs_df.hdr
+              ${BASELINE}/dmTvSinusoidDeformationFieldEstimationOutput_bs_oi.tif
+              ${TEMP}/dmTvSinusoidDeformationFieldEstimationOutput_bs_oi.tif
+              ${BASELINE}/dmTvSinusoidDeformationFieldEstimationOutput_np_df.hdr
+              ${TEMP}/dmTvSinusoidDeformationFieldEstimationOutput_np_df.hdr
+              ${BASELINE}/dmTvSinusoidDeformationFieldEstimationOutput_np_oi.tif
+              ${TEMP}/dmTvSinusoidDeformationFieldEstimationOutput_np_oi.tif
+              ${BASELINE}/dmTvSinusoidDeformationFieldEstimationOutput_nnp_df.hdr
+              ${TEMP}/dmTvSinusoidDeformationFieldEstimationOutput_nnp_df.hdr
+              ${BASELINE}/dmTvSinusoidDeformationFieldEstimationOutput_nnp_oi.tif
+              ${TEMP}/dmTvSinusoidDeformationFieldEstimationOutput_nnp_oi.tif
         ${BASELINE}/dmTvSinusoidDeformationFieldEstimationOutput_nt_df.hdr
         ${TEMP}/dmTvSinusoidDeformationFieldEstimationOutput_nt_df.hdr
         ${BASELINE}/dmTvSinusoidDeformationFieldEstimationOutput_nt_oi.tif
@@ -288,28 +288,28 @@ ADD_TEST(dmTlSinusoidDeformationFieldEstimation ${DISPARITYMAP_TESTS2}
         ${TEMP}/dmTvSinusoidDeformationFieldEstimationOutput_bst_df.hdr
         ${BASELINE}/dmTvSinusoidDeformationFieldEstimationOutput_bst_oi.tif
         ${TEMP}/dmTvSinusoidDeformationFieldEstimationOutput_bst_oi.tif
-	 otbTranslationDeformationFieldEstimation
-	 ${INPUTDATA}/ROI_IKO_PAN_LesHalles_sub.tif
-	 ${INPUTDATA}/ROI_IKO_PAN_LesHalles_sub_warped_sinus.tif
-	 ${TEMP}/dmTvSinusoidDeformationFieldEstimationOutput
-	  15 10 10 250 0.95 4 25
+         otbTranslationDeformationFieldEstimation
+         ${INPUTDATA}/ROI_IKO_PAN_LesHalles_sub.tif
+         ${INPUTDATA}/ROI_IKO_PAN_LesHalles_sub_warped_sinus.tif
+         ${TEMP}/dmTvSinusoidDeformationFieldEstimationOutput
+          15 10 10 250 0.95 4 25
 )
 
 # ------- otb::StreamingWarpImageFilter  ----------
 
 
 ADD_TEST(dmTuStreamingWarpImageFilterNew ${DISPARITYMAP_TESTS3}
-	otbStreamingWarpImageFilterNew)
+        otbStreamingWarpImageFilterNew)
 
 ADD_TEST(dmTvStreamingWarpImageFilter ${DISPARITYMAP_TESTS3}
-	--compare-image ${EPSILON_10}
-	${BASELINE}/dmStreamingWarpImageFilterOutput.tif
-	${TEMP}/dmStreamingWarpImageFilterOutput.tif
-	otbStreamingWarpImageFilter
-	${INPUTDATA}/ROI_IKO_PAN_LesHalles_sub.tif
-	${INPUTDATA}/ROI_IKO_PAN_LesHalles_sub_deformation_field.tif
-	${TEMP}/dmStreamingWarpImageFilterOutput.tif
-	5
+        --compare-image ${EPSILON_10}
+        ${BASELINE}/dmStreamingWarpImageFilterOutput.tif
+        ${TEMP}/dmStreamingWarpImageFilterOutput.tif
+        otbStreamingWarpImageFilter
+        ${INPUTDATA}/ROI_IKO_PAN_LesHalles_sub.tif
+        ${INPUTDATA}/ROI_IKO_PAN_LesHalles_sub_deformation_field.tif
+        ${TEMP}/dmStreamingWarpImageFilterOutput.tif
+        5
 )
 
 # ------- otb::FineRegistrationImageFilter ----------
@@ -325,18 +325,18 @@ ADD_TEST(feTvFineRegistrationImageFilterTestWithCorrelation ${DISPARITYMAP_TESTS
         ${BASELINE}/feTvFineRegistrationImageFilterTestWithCorrelationField.tif
         ${TEMP}/feTvFineRegistrationImageFilterTestWithCorrelationField.tif
         otbFineRegistrationImageFilterTest
-	    ${EXAMPLEDATA}/StereoFixed.png # fixedFileName
-	    ${EXAMPLEDATA}/StereoMoving.png # movingFileName
-	    ${TEMP}/feTvFineRegistrationImageFilterTestWithCorrelationMetric.tif # output correlFileName
+            ${EXAMPLEDATA}/StereoFixed.png # fixedFileName
+            ${EXAMPLEDATA}/StereoMoving.png # movingFileName
+            ${TEMP}/feTvFineRegistrationImageFilterTestWithCorrelationMetric.tif # output correlFileName
         ${TEMP}/feTvFineRegistrationImageFilterTestWithCorrelationField.tif  # output fieldFileName
         3 # radius
-	    2 # sradius
-	    0.1 # precision
-	    0 # Correlation
-	    1 # Grid step
-	    0 # Initial offset x
-	    0 # Initial offset y
-	    0 0 80 130 # region to proceed
+            2 # sradius
+            0.1 # precision
+            0 # Correlation
+            1 # Grid step
+            0 # Initial offset x
+            0 # Initial offset y
+            0 0 80 130 # region to proceed
 )
 
 ADD_TEST(feTvFineRegistrationImageFilterTestWithNormalizedCorrelation ${DISPARITYMAP_TESTS3}
@@ -346,18 +346,18 @@ ADD_TEST(feTvFineRegistrationImageFilterTestWithNormalizedCorrelation ${DISPARIT
         ${BASELINE}/feTvFineRegistrationImageFilterTestWithNormalizedCorrelationField.tif
         ${TEMP}/feTvFineRegistrationImageFilterTestWithNormalizedCorrelationField.tif
         otbFineRegistrationImageFilterTest
-	    ${EXAMPLEDATA}/StereoFixed.png # fixedFileName
-	    ${EXAMPLEDATA}/StereoMoving.png # movingFileName
-	    ${TEMP}/feTvFineRegistrationImageFilterTestWithNormalizedCorrelationMetric.tif # output correlFileName
+            ${EXAMPLEDATA}/StereoFixed.png # fixedFileName
+            ${EXAMPLEDATA}/StereoMoving.png # movingFileName
+            ${TEMP}/feTvFineRegistrationImageFilterTestWithNormalizedCorrelationMetric.tif # output correlFileName
         ${TEMP}/feTvFineRegistrationImageFilterTestWithNormalizedCorrelationField.tif  # output fieldFileName
         3 # radius
-	    2 # sradius
-	    0.1 # precision
-	    1 # Normalized Correlation    
-	    1 # Grid step
-	    0 # Initial offset x
-	    0 # Initial offset y
-	    0 0 80 130 # region to proceed
+            2 # sradius
+            0.1 # precision
+            1 # Normalized Correlation
+            1 # Grid step
+            0 # Initial offset x
+            0 # Initial offset y
+            0 0 80 130 # region to proceed
 )
 
 ADD_TEST(feTvFineRegistrationImageFilterTestWithMeanSquare ${DISPARITYMAP_TESTS3}
@@ -367,18 +367,18 @@ ADD_TEST(feTvFineRegistrationImageFilterTestWithMeanSquare ${DISPARITYMAP_TESTS3
         ${BASELINE}/feTvFineRegistrationImageFilterTestWithMeanSquareField.tif
         ${TEMP}/feTvFineRegistrationImageFilterTestWithMeanSquareField.tif
         otbFineRegistrationImageFilterTest
-	    ${EXAMPLEDATA}/StereoFixed.png # fixedFileName
-	    ${EXAMPLEDATA}/StereoMoving.png # movingFileName
-	    ${TEMP}/feTvFineRegistrationImageFilterTestWithMeanSquareMetric.tif # output correlFileName
+            ${EXAMPLEDATA}/StereoFixed.png # fixedFileName
+            ${EXAMPLEDATA}/StereoMoving.png # movingFileName
+            ${TEMP}/feTvFineRegistrationImageFilterTestWithMeanSquareMetric.tif # output correlFileName
         ${TEMP}/feTvFineRegistrationImageFilterTestWithMeanSquareField.tif  # output fieldFileName
         3 # radius
-	    2 # sradius
-	    0.1 # precision
-	    2 # Mean square
-	    1 # Grid step
-	    0 # Initial offset x
-	    0 # Initial offset y
-	    0 0 80 65 # region to proceed
+            2 # sradius
+            0.1 # precision
+            2 # Mean square
+            1 # Grid step
+            0 # Initial offset x
+            0 # Initial offset y
+            0 0 80 65 # region to proceed
 )
 
 ADD_TEST(feTvFineRegistrationImageFilterTestWithMeanReciprocalDifference ${DISPARITYMAP_TESTS3}
@@ -388,18 +388,18 @@ ADD_TEST(feTvFineRegistrationImageFilterTestWithMeanReciprocalDifference ${DISPA
         ${BASELINE}/feTvFineRegistrationImageFilterTestWithMeanReciprocalDifferenceField.tif
         ${TEMP}/feTvFineRegistrationImageFilterTestWithMeanReciprocalDifferenceField.tif
         otbFineRegistrationImageFilterTest
-	    ${EXAMPLEDATA}/StereoFixed.png # fixedFileName
-	    ${EXAMPLEDATA}/StereoMoving.png # movingFileName
-	    ${TEMP}/feTvFineRegistrationImageFilterTestWithMeanReciprocalDifferenceMetric.tif # output correlFileName
+            ${EXAMPLEDATA}/StereoFixed.png # fixedFileName
+            ${EXAMPLEDATA}/StereoMoving.png # movingFileName
+            ${TEMP}/feTvFineRegistrationImageFilterTestWithMeanReciprocalDifferenceMetric.tif # output correlFileName
         ${TEMP}/feTvFineRegistrationImageFilterTestWithMeanReciprocalDifferenceField.tif  # output fieldFileName
         3 # radius
-	    2 # sradius
-	    0.1 # precision
-	    3 # Mean reciprocal difference
-	    1 # Grid step
-	    0 # Initial offset x
-	    0 # Initial offset y
-	    0 0 80 130 # region to proceed
+            2 # sradius
+            0.1 # precision
+            3 # Mean reciprocal difference
+            1 # Grid step
+            0 # Initial offset x
+            0 # Initial offset y
+            0 0 80 130 # region to proceed
 )
 
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
diff --git a/Testing/Code/FeatureExtraction/CMakeLists.txt b/Testing/Code/FeatureExtraction/CMakeLists.txt
index 2a621b277a44f846eede6cb52a4df6c66bc52c5a..f67034e0292db56b956c0f99d389d4b69892f023 100644
--- a/Testing/Code/FeatureExtraction/CMakeLists.txt
+++ b/Testing/Code/FeatureExtraction/CMakeLists.txt
@@ -1355,7 +1355,7 @@ ADD_TEST(feTuMaskedScalarImageToGreyLevelRunLengthMatrixGeneratorNew ${FEATUREEX
 )
 
 ADD_TEST(feTvScalarImageToTexturesFilter ${FEATUREEXTRACTION_TESTS15}
-        --compare-n-images ${EPSILON_8} 8   
+        --compare-n-images ${EPSILON_8} 8
             ${BASELINE}/feTvScalarImageToTexturesFilterOutputEnergy.tif
             ${TEMP}/feTvScalarImageToTexturesFilterOutputEnergy.tif
             ${BASELINE}/feTvScalarImageToTexturesFilterOutputEntropy.tif
@@ -1390,7 +1390,7 @@ ADD_TEST(feTuScalarImageToAdvancedTexturesFilterNew ${FEATUREEXTRACTION_TESTS15}
 )
 
 ADD_TEST(feTvScalarImageToAdvancedTexturesFilter ${FEATUREEXTRACTION_TESTS15}
-        --compare-n-images ${EPSILON_8} 9   
+        --compare-n-images ${EPSILON_8} 9
             ${BASELINE}/feTvScalarImageToAdvancedTexturesFilterOutputVariance.tif
             ${TEMP}/feTvScalarImageToAdvancedTexturesFilterOutputVariance.tif
             ${BASELINE}/feTvScalarImageToAdvancedTexturesFilterOutputMean.tif
@@ -1420,7 +1420,7 @@ ADD_TEST(feTuScalarImageToHigherOrderTexturesFilterNew ${FEATUREEXTRACTION_TESTS
 )
 
 ADD_TEST(feTvScalarImageToHigherOrderTexturesFilter ${FEATUREEXTRACTION_TESTS15}
-        --compare-n-images ${EPSILON_8} 11   
+        --compare-n-images ${EPSILON_8} 11
             ${BASELINE}/feTvScalarImageToHigherOrderTexturesFilterOutputShortRunEmphasis.tif
             ${TEMP}/feTvScalarImageToHigherOrderTexturesFilterOutputShortRunEmphasis.tif
             ${BASELINE}/feTvScalarImageToHigherOrderTexturesFilterOutputLongRunEmphasis.tif
@@ -1453,7 +1453,7 @@ ADD_TEST(feTuScalarImageToPanTexTextureFilterNew ${FEATUREEXTRACTION_TESTS15}
 )
 
 ADD_TEST(feTvScalarImageToPanTexTextureFilter ${FEATUREEXTRACTION_TESTS15}
-        --compare-image ${EPSILON_8}   
+        --compare-image ${EPSILON_8}
             ${BASELINE}/feTvScalarImageToPanTexTextureFilterOutputPanTex.tif
             ${TEMP}/feTvScalarImageToPanTexTextureFilterOutputPanTex.tif
         otbScalarImageToPanTexTextureFilter
@@ -1474,7 +1474,7 @@ ADD_TEST(feTuFourierMellinDescriptorsNew ${FEATUREEXTRACTION_TESTS16}
   )
 
 ADD_TEST(feTvFourierMellinDescriptors ${FEATUREEXTRACTION_TESTS16}
-  --compare-ascii ${NOTOL}     
+  --compare-ascii ${NOTOL}
   ${BASELINE_FILES}/feTvFourierMellinDescriptors.txt
   ${TEMP}/feTvFourierMellinDescriptors.txt
   otbFourierMellinDescriptors
@@ -1506,7 +1506,7 @@ ADD_TEST(feTuLocalHistogramImageFunctionNew ${FEATUREEXTRACTION_TESTS16}
 )
 
 ADD_TEST(feTvLocalHistogramImageFunctionTest ${FEATUREEXTRACTION_TESTS16}
---compare-ascii ${EPSILON_8}     
+--compare-ascii ${EPSILON_8}
  ${BASELINE_FILES}/feLocalHistogramImage.txt
     ${TEMP}/feLocalHistogramImage.txt
  otbLocalHistogramImageFunctionTest
@@ -1532,7 +1532,7 @@ ADD_TEST(feTuMetaImageFunctionNew ${FEATUREEXTRACTION_TESTS16}
 )
 
 ADD_TEST(feTvMetaImageFunction ${FEATUREEXTRACTION_TESTS16}
---compare-ascii ${EPSILON_8}     
+--compare-ascii ${EPSILON_8}
     ${BASELINE_FILES}/feTvMetaImageFunction.txt
     ${TEMP}/feTvMetaImageFunction.txt
     otbMetaImageFunction
@@ -1547,7 +1547,7 @@ ADD_TEST(feTuHaralickTexturesImageFunctionNew ${FEATUREEXTRACTION_TESTS16}
 )
 
 ADD_TEST(feTvHaralickTexturesImageFunction ${FEATUREEXTRACTION_TESTS16}
---compare-ascii ${EPSILON_8}     
+--compare-ascii ${EPSILON_8}
     ${BASELINE_FILES}/feTvHaralickTexturesImageFunction.txt
     ${TEMP}/feTvHaralickTexturesImageFunction.txt
     otbHaralickTexturesImageFunction
@@ -1561,7 +1561,7 @@ ADD_TEST(feTuHistogramOfOrientedGradientCovariantImageFunction ${FEATUREEXTRACTI
          otbHistogramOfOrientedGradientCovariantImageFunctionNew)
 
 ADD_TEST(feTvHistogramOfOrientedGradientCovariantImageFunction ${FEATUREEXTRACTION_TESTS16}
---compare-ascii ${EPSILON_8}     
+--compare-ascii ${EPSILON_8}
   ${BASELINE_FILES}/feTvHistogramOfOrientedGradientCovariantImageFunction.txt
   ${TEMP}/feTvHistogramOfOrientedGradientCovariantImageFunction.txt
          otbHistogramOfOrientedGradientCovariantImageFunction
diff --git a/Testing/Code/Fusion/CMakeLists.txt b/Testing/Code/Fusion/CMakeLists.txt
index dbdb8ce9df1a77666daefae1da6976b7b1bd9ad9..a4988f16d347e896d9cfdd1d4ef9c32b9e4ea1c1 100644
--- a/Testing/Code/Fusion/CMakeLists.txt
+++ b/Testing/Code/Fusion/CMakeLists.txt
@@ -32,10 +32,10 @@ ADD_TEST(fuTvBayesianFusionFilter ${FUSION_TESTS1}
     --compare-image ${NOTOL}  ${BASELINE}/fuTvBayesianFusion.tif
                            ${TEMP}/fuTvBayesianFusion.tif
         otbBayesianFusionFilter
-	${INPUTDATA}/multiSpect.tif
-	${INPUTDATA}/multiSpectInterp.tif
-	${INPUTDATA}/panchro.tif
-	${TEMP}/fuTvBayesianFusion.tif
+        ${INPUTDATA}/multiSpect.tif
+        ${INPUTDATA}/multiSpectInterp.tif
+        ${INPUTDATA}/panchro.tif
+        ${TEMP}/fuTvBayesianFusion.tif
 )
 
 
@@ -48,9 +48,9 @@ ADD_TEST(fuTvSimpleRcsPanSharpeningFusionImageFilter ${FUSION_TESTS1}
     --compare-image ${EPSILON_8}  ${BASELINE}/fuTvRcsPanSharpeningFusion.tif
                            ${TEMP}/fuTvRcsPanSharpeningFusion.tif
         otbSimpleRcsPanSharpeningFusionImageFilter
-	${INPUTDATA}/QB_Toulouse_Ortho_PAN.tif
-	${INPUTDATA}/QB_Toulouse_Ortho_XS.tif
-	${TEMP}/fuTvRcsPanSharpeningFusion.tif
+        ${INPUTDATA}/QB_Toulouse_Ortho_PAN.tif
+        ${INPUTDATA}/QB_Toulouse_Ortho_XS.tif
+        ${TEMP}/fuTvRcsPanSharpeningFusion.tif
 )
 
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
diff --git a/Testing/Code/Fuzzy/CMakeLists.txt b/Testing/Code/Fuzzy/CMakeLists.txt
index dba8bc62bac5036edb1eb83bffbc1140010f4677..95bc19edeacd6b43ca1a365ee70fa2bc2d9d0d4e 100644
--- a/Testing/Code/Fuzzy/CMakeLists.txt
+++ b/Testing/Code/Fuzzy/CMakeLists.txt
@@ -23,17 +23,17 @@ SET(Fuzzy_TESTS1 ${CXX_TEST_PATH}/otbFuzzyTests1)
 SET(Fuzzy_TESTS2 ${CXX_TEST_PATH}/otbFuzzyTests2)
 
 # FuzzyTests1
-ADD_TEST(fzTuFuzzyVariableNew ${Fuzzy_TESTS1} 
-	otbFuzzyVariableNew)
+ADD_TEST(fzTuFuzzyVariableNew ${Fuzzy_TESTS1}
+        otbFuzzyVariableNew)
 
-ADD_TEST(fzTvFuzzyVariable2Values ${Fuzzy_TESTS1} 
-	otbFuzzyVariable2Values)
+ADD_TEST(fzTvFuzzyVariable2Values ${Fuzzy_TESTS1}
+        otbFuzzyVariable2Values)
 
-ADD_TEST(fzTvFuzzyVariableSetValue ${Fuzzy_TESTS1} 
-	otbFuzzyVariableSetValue)
+ADD_TEST(fzTvFuzzyVariableSetValue ${Fuzzy_TESTS1}
+        otbFuzzyVariableSetValue)
 
-ADD_TEST(fzTvFuzzyVariableGetMaxVar ${Fuzzy_TESTS1} 
-	otbFuzzyVariableGetMaxVar)
+ADD_TEST(fzTvFuzzyVariableGetMaxVar ${Fuzzy_TESTS1}
+        otbFuzzyVariableGetMaxVar)
 
 ADD_TEST(fzTvMassOfBelief ${Fuzzy_TESTS1}
         otbMassOfBelief)
diff --git a/Testing/Code/GeospatialAnalysis/CMakeLists.txt b/Testing/Code/GeospatialAnalysis/CMakeLists.txt
index 6e051126905780033240cc3769110493f3d7c87a..eaed918c18593a2f10767d41fd4bd07de7a1ce23 100644
--- a/Testing/Code/GeospatialAnalysis/CMakeLists.txt
+++ b/Testing/Code/GeospatialAnalysis/CMakeLists.txt
@@ -22,11 +22,11 @@ SET(GEOSPATIALANALYSIS_TESTS ${CXX_TEST_PATH}/otbGeospatialAnalysisTests)
 
 ADD_TEST(gfTuPostGISCreateTableTransactorNew ${GEOSPATIALANALYSIS_TESTS}
      otbPostGISCreateTableTransactorNew
-	)
+        )
 
 ADD_TEST(gfTuPostGISCreateTableTransactorAccessors ${GEOSPATIALANALYSIS_TESTS}
      otbPostGISCreateTableTransactorAccessors
-	)
+        )
 
 ADD_TEST(gfTuPostGISCreateTableTransactorCreate ${GEOSPATIALANALYSIS_TESTS}
   otbPostGISCreateTableTransactorCreate
@@ -34,11 +34,11 @@ ADD_TEST(gfTuPostGISCreateTableTransactorCreate ${GEOSPATIALANALYSIS_TESTS}
   orfeotoolbox_test
   orfeotoolbox_test_user
   Bidfeud0
-	)
+        )
 
 ADD_TEST(gfTuPostGISFromStringTransactorNew ${GEOSPATIALANALYSIS_TESTS}
      otbPostGISFromStringTransactorNew
-	)
+        )
 
 
 # -------       CXX source files -----------------------------------
diff --git a/Testing/Code/Gui/CMakeLists.txt b/Testing/Code/Gui/CMakeLists.txt
index e475f8ec23a05f4bdb6b4f87df5ddee1c4f677de..1e3ab470e29d6c48c687ad576f15be2305ba1c9c 100644
--- a/Testing/Code/Gui/CMakeLists.txt
+++ b/Testing/Code/Gui/CMakeLists.txt
@@ -17,7 +17,7 @@ SET(GUI_TESTS ${CXX_TEST_PATH}/otbGuiTests)
 # -------            otb::System  -------------
 ADD_TEST(guTuFltkFilterWatcher ${GUI_TESTS}
         otbFltkFilterWatcher
-	${INPUTDATA}/couleurs.tif
+        ${INPUTDATA}/couleurs.tif
         )
 
 
@@ -26,8 +26,8 @@ ADD_TEST(guTuFltkFilterWatcher ${GUI_TESTS}
 ADD_TEST(coTvFltkWriterWatcher ${GUI_TESTS}
      otbFltkWriterWatcher
         ${INPUTDATA}/couleurs.tif
-	${TEMP}/coTvFltkWriterWatcherOutput.tif
-	20)
+        ${TEMP}/coTvFltkWriterWatcherOutput.tif
+        20)
 
 
 
diff --git a/Testing/Code/IO/CMakeLists.txt b/Testing/Code/IO/CMakeLists.txt
index 0abccf5ecd6e9a492499e98404868badeb4864d4..fd1216b97d5fecd5764be78afd22d98b9be29c6b 100644
--- a/Testing/Code/IO/CMakeLists.txt
+++ b/Testing/Code/IO/CMakeLists.txt
@@ -105,7 +105,7 @@ ADD_TEST(ioTvMultiMonoChannelROI_ENVI2PNG ${COMMON_TESTS3}
 IF(OTB_DATA_USE_LARGEINPUT)
 # ---  SAR_ERS2_SLCI (GDAL)  ---
 ADD_TEST(ioTvImageFileReaderWithComplexPixel_PALSAR ${IO_TESTS1}
-        --compare-image ${EPSILON_9}  
+        --compare-image ${EPSILON_9}
             ${BASELINE}/ioImageFileReaderWithComplexPixel_PALSAR_l1.1.tif
             ${TEMP}/ioImageFileReaderWithComplexPixel_PALSAR_l1.1.tif
         otbImageFileReaderWithComplexPixelTest
@@ -114,7 +114,7 @@ ADD_TEST(ioTvImageFileReaderWithComplexPixel_PALSAR ${IO_TESTS1}
             0 0 100 100)
 
 ADD_TEST(ioTvImageFileReaderWithComplexPixel_ERS ${IO_TESTS1}
-        --compare-image ${EPSILON_9}   
+        --compare-image ${EPSILON_9}
             ${BASELINE}/ioImageFileReaderWithComplexPixel_ERS_SLCI.tif
             ${TEMP}/ioImageFileReaderWithComplexPixel_ERS_SLCI.tif
         otbImageFileReaderWithComplexPixelTest
@@ -123,7 +123,7 @@ ADD_TEST(ioTvImageFileReaderWithComplexPixel_ERS ${IO_TESTS1}
             0 0 100 100)
 
 ADD_TEST(ioTvImageFileReaderWithComplexPixel_RADARSAT ${IO_TESTS1}
-        --compare-image ${EPSILON_9} 
+        --compare-image ${EPSILON_9}
             ${BASELINE}/ioImageFileReaderWithComplexPixel_RADARSAT.tif
             ${TEMP}/ioImageFileReaderWithComplexPixel_RADARSAT.tif
         otbImageFileReaderWithComplexPixelTest
@@ -132,7 +132,7 @@ ADD_TEST(ioTvImageFileReaderWithComplexPixel_RADARSAT ${IO_TESTS1}
             0 0 100 100)
             
 ADD_TEST(ioTvVectorImageFileReaderWithComplexPixel_RADARSAT2 ${IO_TESTS1}
-        --compare-image ${EPSILON_9} 
+        --compare-image ${EPSILON_9}
             ${BASELINE}/ioImageFileReaderWithComplexPixel_RADARSAT2.tif
             ${TEMP}/ioImageFileReaderWithComplexPixel_RADARSAT2.tif
         otbVectorImageFileReaderWithComplexPixelTest
@@ -254,7 +254,7 @@ ADD_TEST(ioTvImageFileReaderTIF2MW ${IO_TESTS1}
         ${TEMP}/ioImageFileReaderTIF2MW.mw )
 
 
-# We use the original file as a baseline for the comparison        
+# We use the original file as a baseline for the comparison
  ADD_TEST(ioTvImageFileReaderPCI2TIF ${IO_TESTS1}
   --compare-image ${EPSILON_9}   ${INPUTDATA}/QB_Toulouse_Ortho_PAN.tif
                     ${TEMP}/ioImageFileReaderPCI2TIF.tif
@@ -342,7 +342,7 @@ ADD_TEST(ioTvStreamingImageFilterLUM2PNG ${IO_TESTS2}
          ${TEMP}/ioImageFileReaderPNG2LUM.lum
          ${TEMP}/ioStreamingImageFilterTestLUM.png
          )
-SET_TESTS_PROPERTIES(ioTvStreamingImageFilterLUM2PNG PROPERTIES DEPENDS ioTvImageFileReaderPNG2LUM) 
+SET_TESTS_PROPERTIES(ioTvStreamingImageFilterLUM2PNG PROPERTIES DEPENDS ioTvImageFileReaderPNG2LUM)
 
 # ---  LUM STREAMING  IMAGE   FILE    WRITER  ---
 ADD_TEST(ioTvStreamingIFWriterLUMWithoutStreaming ${IO_TESTS2}
@@ -354,7 +354,7 @@ ADD_TEST(ioTvStreamingIFWriterLUMWithoutStreaming ${IO_TESTS2}
          0 # StreamingImageFileWriter
          0 # NumberOfStreamDivisions
          )
-SET_TESTS_PROPERTIES(ioTvStreamingIFWriterLUMWithoutStreaming PROPERTIES DEPENDS ioTvImageFileReaderPNG2LUM) 
+SET_TESTS_PROPERTIES(ioTvStreamingIFWriterLUMWithoutStreaming PROPERTIES DEPENDS ioTvImageFileReaderPNG2LUM)
          
 # ---  LUM STREAMING  With STREAMING IMAGE   FILE    WRITER  ---
 ADD_TEST(ioTvStreamingIFWriterLUMWithStreaming ${IO_TESTS2}
@@ -366,7 +366,7 @@ ADD_TEST(ioTvStreamingIFWriterLUMWithStreaming ${IO_TESTS2}
          1 # StreamingImageFileWriter
          10 # NumberOfStreamDivisions
          )
-SET_TESTS_PROPERTIES(ioTvStreamingIFWriterLUMWithStreaming PROPERTIES DEPENDS ioTvImageFileReaderPNG2LUM) 
+SET_TESTS_PROPERTIES(ioTvStreamingIFWriterLUMWithStreaming PROPERTIES DEPENDS ioTvImageFileReaderPNG2LUM)
          
 # ---  LUM STREAMING  With IMAGE   FILE    WRITER  ---
 ADD_TEST(ioTvStreamingWithIFWriterLUMWithStreaming ${IO_TESTS2}
@@ -378,7 +378,7 @@ ADD_TEST(ioTvStreamingWithIFWriterLUMWithStreaming ${IO_TESTS2}
          0 # StreamingImageFileWriter
          10 # NumberOfStreamDivisions
          )
-SET_TESTS_PROPERTIES(ioTvStreamingWithIFWriterLUMWithStreaming PROPERTIES DEPENDS ioTvImageFileReaderPNG2LUM)         
+SET_TESTS_PROPERTIES(ioTvStreamingWithIFWriterLUMWithStreaming PROPERTIES DEPENDS ioTvImageFileReaderPNG2LUM)
 
 # ---  STREAMING  Pipeline Example ---
 ADD_TEST(ioTvStreamingPipeline_TIF2PNG ${IO_TESTS2}
@@ -647,7 +647,7 @@ ADD_TEST(ioTuGDALImageIOCanRead_SPOT5TIF ${IO_TESTS5} otbGDALImageIOTestCanRead
         ${INPUTDATA}/poupeesTIF/IMAGERY.TIF )
 
 ADD_TEST(ioTuGDALImageIOCanRead_HFA ${IO_TESTS5} otbGDALImageIOTestCanRead
-	${INPUTDATA}/HFAGeoreferenced.img)
+        ${INPUTDATA}/HFAGeoreferenced.img)
 
 ADD_TEST(ioTuGDALImageIOCanRead_PCI ${IO_TESTS5} otbGDALImageIOTestCanRead
     ${INPUTDATA}/QB_Toulouse_Ortho_PAN.pix)
@@ -660,10 +660,10 @@ ADD_TEST(ioTvThreadsTest ${IO_TESTS5} otbThreadsTest)
 # WRITER
 
 ADD_TEST(ioTuGDALImageIOCanWrite_TIFF ${IO_TESTS6} otbGDALImageIOTestCanWrite
-	${INPUTDATA}/testGDALWriter.tif)
+        ${INPUTDATA}/testGDALWriter.tif)
 ADD_TEST(ioTuGDALImageIOCanWrite_HFA ${IO_TESTS6} otbGDALImageIOTestCanWrite
-	${INPUTDATA}/HFAGeoreferenced.img)
-	
+        ${INPUTDATA}/HFAGeoreferenced.img)
+        
 # Pb with copy of some infos into the dataset
 # cases with no ProjRef
 ADD_TEST(ioTvGDALImageIOWriteMetadata ${IO_TESTS6}
@@ -688,31 +688,31 @@ ADD_TEST(ioTuONERAImageIOCanRead ${IO_TESTS6} otbONERAImageIOTestCanRead
 # Read one ONERAimage type CFloat32 with IFreaderScalar and write to a 2 bands hdr file OK
 # crop 10 10 100 100
 ADD_TEST(ioTvONERAImageFileReader ${IO_TESTS6}
-         --compare-image ${EPSILON_9}  
+         --compare-image ${EPSILON_9}
             ${BASELINE}/ioImageFileReaderONERA.hdr
             ${TEMP}/ioImageFileReaderONERA.hdr
          otbImageFileReaderONERATest
             ${LARGEDATA}/ONERA/spa3_0215_rad.ent
-            ${TEMP}/ioImageFileReaderONERA.hdr 
+            ${TEMP}/ioImageFileReaderONERA.hdr
             10 10 100 100 )
 
 # Read one ONERAimage type CFloat32 with IFreaderComplex and write to 2 hdr file (Re and Im)  => OK
 # crop 10 10 100 100
 ADD_TEST(ioTvONERAImageFileReaderComplex ${IO_TESTS6}
          --compare-n-images ${EPSILON_9} 2
-			${BASELINE}/ioImageFileReaderONERAComplexReal.hdr
-			${TEMP}/ioImageFileReaderONERAComplexReal.hdr
-			${BASELINE}/ioImageFileReaderONERAComplexImag.hdr
-			${TEMP}/ioImageFileReaderONERAComplexImag.hdr
+                        ${BASELINE}/ioImageFileReaderONERAComplexReal.hdr
+                        ${TEMP}/ioImageFileReaderONERAComplexReal.hdr
+                        ${BASELINE}/ioImageFileReaderONERAComplexImag.hdr
+                        ${TEMP}/ioImageFileReaderONERAComplexImag.hdr
          otbImageFileReaderONERAComplex
             ${LARGEDATA}/ONERA/spa3_0215_rad.ent
             ${TEMP}/ioImageFileReaderONERAComplexReal.hdr
-	        ${TEMP}/ioImageFileReaderONERAComplexImag.hdr )
+                ${TEMP}/ioImageFileReaderONERAComplexImag.hdr )
 
 # Read one ONERAimage type CFloat32 with IFreaderComplex and write to the same type of file  => OK
-# crop 20 20 100 100 
+# crop 20 20 100 100
 ADD_TEST(ioTvONERAImageFileWriterComplex ${IO_TESTS6}
-         --compare-image ${EPSILON_9}   
+         --compare-image ${EPSILON_9}
             ${BASELINE}/ioImageFileReaderONERAComplexWrite.ent
             ${TEMP}/ioImageFileReaderONERAComplexWrite.ent
          otbImageFileWriterONERAComplex
@@ -722,7 +722,7 @@ ADD_TEST(ioTvONERAImageFileWriterComplex ${IO_TESTS6}
 ADD_TEST(ioTvONERAImageStreamWriter ${IO_TESTS6}
          --compare-image ${EPSILON_9}
             ${TEMP}/ioImageFileReaderONERAComplexWrite.ent
-  			${TEMP}/ioImageFileReaderONERAStreamWrite.ent
+                          ${TEMP}/ioImageFileReaderONERAStreamWrite.ent
          otbImageFileWriterStreamingONERAComplex
             ${TEMP}/ioImageFileReaderONERAComplexWrite.ent
             ${TEMP}/ioImageFileReaderONERAStreamWrite.ent )
@@ -863,7 +863,7 @@ SET_TESTS_PROPERTIES(ioTvImageFileReaderRGB_BSQ2PNG_2 PROPERTIES DEPENDS ioTvIma
 
 # WRITER GDAL
 ADD_TEST(ioTvGDALImageFileWriterTIF2TIF ${IO_TESTS7}
-	otbImageFileWriterRGBTest
+        otbImageFileWriterRGBTest
         ${INPUTDATA}/poupeesTIF/IMAGERY.TIF
         ${TEMP}/poupees.tiff )
 
@@ -1150,7 +1150,7 @@ ADD_TEST(ioTvOtbImageTestSAR_ERS ${IO_TESTS9}
 
 # ---  Otb::Image Test  ---
 ADD_TEST(ioTvOtbImageTestRadarsat ${IO_TESTS9}
-   --compare-ascii ${EPSILON_3}  
+   --compare-ascii ${EPSILON_3}
      ${BASELINE_FILES}/ioOtbImageTestRadarsat.txt
      ${TEMP}/ioOtbImageTestRadarsat.txt
    otbImageTest
@@ -1159,7 +1159,7 @@ ADD_TEST(ioTvOtbImageTestRadarsat ${IO_TESTS9}
 
 # ---  Otb::VectorImage Test  ---
 ADD_TEST(ioTvOtbVectorImageTestRadarsat ${IO_TESTS9}
-   --compare-ascii ${EPSILON_3}  
+   --compare-ascii ${EPSILON_3}
      ${TEMP}/ioOtbImageTestRadarsat.txt
      ${TEMP}/ioOtbVectorImageTestRadarsat.txt
    otbVectorImageLegacyTest
@@ -1221,7 +1221,7 @@ ADD_TEST(ioTvVectorImageComplexIntoRealDoubleTest ${IO_TESTS9}
 # ---  otb::VectorImageReadWriteTest  ---
 ADD_TEST(ioTvVectorImageFileReaderWriterTest ${IO_TESTS9}
    --compare-image ${EPSILON_9}
-		   ${INPUTDATA}/qb_RoadExtract.img.hdr
+                   ${INPUTDATA}/qb_RoadExtract.img.hdr
                    ${TEMP}/ioTvVectorImageFileReaderWriterTest.hdr
         otbVectorImageFileReaderWriterTest
         ${INPUTDATA}/qb_RoadExtract.img.hdr
@@ -1231,7 +1231,7 @@ ADD_TEST(ioTvVectorImageFileReaderWriterTest ${IO_TESTS9}
 # ---  otb::StreamingShortImageFileWriterTest  ---
 ADD_TEST(ioTvStreamingShortImageFileWriterTest ${IO_TESTS9}
    --compare-image ${EPSILON_9}
-		   ${INPUTDATA}/poupees_sub.png
+                   ${INPUTDATA}/poupees_sub.png
                    ${TEMP}/ioTvStreamingShortImageFileWriterTest.png
         otbStreamingShortImageFileWriterTest
         ${INPUTDATA}/poupees_sub.png
@@ -1242,13 +1242,13 @@ ADD_TEST(ioTvStreamingShortImageFileWriterTest ${IO_TESTS9}
 # ---  otb::StreamingShortImageFileWriterTest  ---
 ADD_TEST(ioTvStreamingShortImageFileWriterStreamedTest ${IO_TESTS9}
    --compare-image ${EPSILON_9}
-		   ${INPUTDATA}/poupees_sub.png
+                   ${INPUTDATA}/poupees_sub.png
                    ${TEMP}/ioTvStreamingShortImageFileWriterStreamedTest.png
         otbStreamingShortImageFileWriterTest
         ${INPUTDATA}/poupees_sub.png
         ${TEMP}/ioTvStreamingShortImageFileWriterStreamedTest.png
         1
-	4
+        4
 )
 
 
@@ -1304,7 +1304,7 @@ ADD_TEST(ioTvStreamingIFWriterBSQWithStreaming ${IO_TESTS2}
 # 1. DEFAULT
 ADD_TEST(ioTvStreamingImageFileWriterCalculateNumberOfDivisions_DEFAULT ${IO_TESTS10}
    --compare-image ${EPSILON_9}   ${INPUTDATA}/ToulouseQuickBird_Extrait_1500_3750.tif
-                      		${TEMP}/ioStreamingImageFileWriterCalculateNumberOfDivisions_DEFAULT.tif
+                                      ${TEMP}/ioStreamingImageFileWriterCalculateNumberOfDivisions_DEFAULT.tif
          otbStreamingImageFileWriterTestCalculateNumberOfDivisions
          ${INPUTDATA}/ToulouseQuickBird_Extrait_1500_3750.tif
          ${TEMP}/ioStreamingImageFileWriterCalculateNumberOfDivisions_DEFAULT.tif
@@ -1313,7 +1313,7 @@ ADD_TEST(ioTvStreamingImageFileWriterCalculateNumberOfDivisions_DEFAULT ${IO_TES
 # 2. SetNumberOfDivisionsStrippedStreaming
 ADD_TEST(ioTvStreamingImageFileWriterCalculateNumberOfDivisions_SetNumberOfDivisionsStrippedStreaming ${IO_TESTS10}
    --compare-image ${EPSILON_9}   ${INPUTDATA}/ToulouseQuickBird_Extrait_1500_3750.tif
-                      		${TEMP}/ioStreamingImageFileWriterCalculateNumberOfDivisions_SetNumberOfDivisionsStrippedStreaming.tif
+                                      ${TEMP}/ioStreamingImageFileWriterCalculateNumberOfDivisions_SetNumberOfDivisionsStrippedStreaming.tif
          otbStreamingImageFileWriterTestCalculateNumberOfDivisions
          ${INPUTDATA}/ToulouseQuickBird_Extrait_1500_3750.tif
          ${TEMP}/ioStreamingImageFileWriterCalculateNumberOfDivisions_SetNumberOfDivisionsStrippedStreaming.tif
@@ -1323,7 +1323,7 @@ ADD_TEST(ioTvStreamingImageFileWriterCalculateNumberOfDivisions_SetNumberOfDivis
 # 3. SetNumberOfDivisionsTiledStreaming
 ADD_TEST(ioTvStreamingImageFileWriterCalculateNumberOfDivisions_SetNumberOfDivisionsTiledStreamingS ${IO_TESTS10}
    --compare-image ${EPSILON_9}   ${INPUTDATA}/ToulouseQuickBird_Extrait_1500_3750.tif
-                      		${TEMP}/ioStreamingImageFileWriterCalculateNumberOfDivisions_SetNumberOfDivisionsTiledStreaming.tif
+                                      ${TEMP}/ioStreamingImageFileWriterCalculateNumberOfDivisions_SetNumberOfDivisionsTiledStreaming.tif
          otbStreamingImageFileWriterTestCalculateNumberOfDivisions
          ${INPUTDATA}/ToulouseQuickBird_Extrait_1500_3750.tif
          ${TEMP}/ioStreamingImageFileWriterCalculateNumberOfDivisions_SetNumberOfDivisionsTiledStreaming.tif
@@ -1353,7 +1353,7 @@ ADD_TEST(ioTvStreamingImageFileWriterCalculateNumberOfDivisions_SetAutomaticStri
 # 6. SetTileDimensionTiledStreaming
 ADD_TEST(ioTvStreamingImageFileWriterCalculateNumberOfDivisions_SetTileDimensionTiledStreaming ${IO_TESTS10}
    --compare-image ${EPSILON_9}   ${INPUTDATA}/ToulouseQuickBird_Extrait_1500_3750.tif
-			    ${TEMP}/ioStreamingImageFileWriterCalculateNumberOfDivisions_SetTileDimensionTiledStreaming.tif
+                            ${TEMP}/ioStreamingImageFileWriterCalculateNumberOfDivisions_SetTileDimensionTiledStreaming.tif
          otbStreamingImageFileWriterTestCalculateNumberOfDivisions
          ${INPUTDATA}/ToulouseQuickBird_Extrait_1500_3750.tif
          ${TEMP}/ioStreamingImageFileWriterCalculateNumberOfDivisions_SetTileDimensionTiledStreaming.tif
@@ -1363,12 +1363,12 @@ ADD_TEST(ioTvStreamingImageFileWriterCalculateNumberOfDivisions_SetTileDimension
 # 7. SetAutomaticTiledStreaming
 ADD_TEST(ioTvStreamingImageFileWriterCalculateNumberOfDivisions_SetAutomaticTiledStreaming ${IO_TESTS10}
    --compare-image ${EPSILON_9}   ${INPUTDATA}/ToulouseQuickBird_Extrait_1500_3750.tif
-			    ${TEMP}/ioStreamingImageFileWriterCalculateNumberOfDivisions_SetAutomaticTiledStreaming.tif
+                            ${TEMP}/ioStreamingImageFileWriterCalculateNumberOfDivisions_SetAutomaticTiledStreaming.tif
          otbStreamingImageFileWriterTestCalculateNumberOfDivisions
          ${INPUTDATA}/ToulouseQuickBird_Extrait_1500_3750.tif
          ${TEMP}/ioStreamingImageFileWriterCalculateNumberOfDivisions_SetAutomaticTiledStreaming.tif
          SetAutomaticTiledStreaming
-				 10
+                                 10
          )
 
 
@@ -1430,7 +1430,7 @@ ADD_TEST(ioTvStreamingIFWriterWithFilter ${IO_TESTS10}
          ${INPUTDATA}/poupees_1canal.c1.hdr
          ${TEMP}/ioStreamingImageFileWriterWithFilter_1_100.hdr
          1
-	 1 # Streaming
+         1 # Streaming
          100
          )
 
@@ -1442,102 +1442,102 @@ ADD_TEST(ioTvStreamingIFWriterWithFilter ${IO_TESTS10}
 
 ADD_TEST(ioTvImageMetadataWriterTest_HFA ${IO_TESTS11}
    --compare-metadata ${EPSILON_9}
-		      ${INPUTDATA}/HFAGeoreferenced.img
-		      ${TEMP}/ioTvImageMetadataWriterHFA.img
+                      ${INPUTDATA}/HFAGeoreferenced.img
+                      ${TEMP}/ioTvImageMetadataWriterHFA.img
         otbImageMetadataFileWriterTest
         ${INPUTDATA}/HFAGeoreferenced.img
-	${TEMP}/ioTvImageMetadataWriterHFA.img
+        ${TEMP}/ioTvImageMetadataWriterHFA.img
         )
 
 ADD_TEST(ioTvImageMetadataWriterTest_TIF ${IO_TESTS11}
    --compare-metadata ${EPSILON_9}
-		      ${INPUTDATA}/spot5SubWithGcps.tif
-		      ${TEMP}/ioTvImageMetadataWriterTIF.tif
+                      ${INPUTDATA}/spot5SubWithGcps.tif
+                      ${TEMP}/ioTvImageMetadataWriterTIF.tif
         otbImageMetadataFileWriterTest
         ${INPUTDATA}/spot5SubWithGcps.tif
-	${TEMP}/ioTvImageMetadataWriterTIF.tif
+        ${TEMP}/ioTvImageMetadataWriterTIF.tif
         )
 
 
 # Commented because gdal does not seems to write the metadata the same way in both formats
 #ADD_TEST(ioTvImageMetadataWriterTest_HFA2TIFF ${IO_TESTS11}
 #   --compare-metadata ${EPSILON_9}
-#		      ${INPUTDATA}/HFAGeoreferenced.img
-#		      ${TEMP}/temp.tif
+#                      ${INPUTDATA}/HFAGeoreferenced.img
+#                      ${TEMP}/temp.tif
 #        otbImageMetadataFileWriterTest
 #        ${INPUTDATA}/HFAGeoreferenced.img
-#	${TEMP}/temp.tif
+#        ${TEMP}/temp.tif
 #        )
 
 # Commented because gdal does not seems to write the metadata the same way in both formats
 #ADD_TEST(ioTvImageMetadataWriterTest_TIFF2HFA ${IO_TESTS11}
 #   --compare-metadata ${EPSILON_9}
-#		      ${INPUTDATA}/spot5SubWithGcps.tif
-#		      ${TEMP}/temp.img
+#                      ${INPUTDATA}/spot5SubWithGcps.tif
+#                      ${TEMP}/temp.img
 #        otbImageMetadataFileWriterTest
 #        ${INPUTDATA}/spot5SubWithGcps.tif
-#	${TEMP}/temp.img
+#        ${TEMP}/temp.img
 #        )
 
 
 ADD_TEST(ioTvImageMetadataStreamingWriterTest_HFA ${IO_TESTS11}
    --compare-metadata ${EPSILON_9}
-		      ${INPUTDATA}/HFAGeoreferenced.img
-		      ${TEMP}/ioTvImageMetadataStreamingWriterHFA.img
+                      ${INPUTDATA}/HFAGeoreferenced.img
+                      ${TEMP}/ioTvImageMetadataStreamingWriterHFA.img
         otbImageMetadataStreamingFileWriterTest
         ${INPUTDATA}/HFAGeoreferenced.img
-	${TEMP}/ioTvImageMetadataStreamingWriterHFA.img
+        ${TEMP}/ioTvImageMetadataStreamingWriterHFA.img
         )
 
 ADD_TEST(ioTvImageMetadataStreamingWriterTest_TIF ${IO_TESTS11}
    --compare-metadata ${EPSILON_9}
-		      ${INPUTDATA}/spot5SubWithGcps.tif
-		      ${TEMP}/ioTvImageMetadataStreamingWriterTIF.tif
+                      ${INPUTDATA}/spot5SubWithGcps.tif
+                      ${TEMP}/ioTvImageMetadataStreamingWriterTIF.tif
         otbImageMetadataStreamingFileWriterTest
         ${INPUTDATA}/spot5SubWithGcps.tif
-	${TEMP}/ioTvImageMetadataStreamingWriterTIF.tif
+        ${TEMP}/ioTvImageMetadataStreamingWriterTIF.tif
         )
 
 # Commented because gdal does not seems to write the metadata the same way in both formats
 # Compare metadata indicates a small differences between the ProjRef
 #ADD_TEST(ioTvImageMetadataStreamingWriterTest_HFA2TIFF ${IO_TESTS11}
 #   --compare-metadata ${EPSILON_9}
-#	   ${INPUTDATA}/HFAGeoreferenced.img
-#	   ${TEMP}/ioTvImageMetadataStreamingWriterTest_HFA2TIFF.tif
+#           ${INPUTDATA}/HFAGeoreferenced.img
+#           ${TEMP}/ioTvImageMetadataStreamingWriterTest_HFA2TIFF.tif
 #     otbImageMetadataStreamingFileWriterTest
 #       ${INPUTDATA}/HFAGeoreferenced.img
-#	   ${TEMP}/ioTvImageMetadataStreamingWriterTest_HFA2TIFF.tif
+#           ${TEMP}/ioTvImageMetadataStreamingWriterTest_HFA2TIFF.tif
 #        )
 
 # Commented because gdal does not seems to write the metadata the same way in both formats
 # Compare metadata indicates that GCP are lost but they are in filename.aux.xml
 #ADD_TEST(ioTvImageMetadataStreamingWriterTest_TIFF2HFA ${IO_TESTS11}
 #   --compare-metadata ${EPSILON_9}
-#	   ${INPUTDATA}/spot5SubWithGcps.tif
-#	   ${TEMP}/ioTvImageMetadataStreamingWriterTest_TIFF2HFA.img
+#           ${INPUTDATA}/spot5SubWithGcps.tif
+#           ${TEMP}/ioTvImageMetadataStreamingWriterTest_TIFF2HFA.img
 #     otbImageMetadataStreamingFileWriterTest
 #       ${INPUTDATA}/spot5SubWithGcps.tif
-#	   ${TEMP}/ioTvImageMetadataStreamingWriterTest_TIFF2HFA.img
+#           ${TEMP}/ioTvImageMetadataStreamingWriterTest_TIFF2HFA.img
 #        )
 
 ADD_TEST(ioTvPipelineMetadataHandlingTest ${IO_TESTS11}
    --compare-metadata ${EPSILON_9}
-		      ${INPUTDATA}/HFAGeoreferenced.img
-		      ${TEMP}/ioTvPipelineMetadataHandling.img
+                      ${INPUTDATA}/HFAGeoreferenced.img
+                      ${TEMP}/ioTvPipelineMetadataHandling.img
         otbPipelineMetadataHandlingTest
         ${INPUTDATA}/HFAGeoreferenced.img
-	${TEMP}/ioTvPipelineMetadataHandling.img
+        ${TEMP}/ioTvPipelineMetadataHandling.img
         )
 
 # Commented out, since this test fails beceause of an ITK bug (added to our bugtracker for tracking)
 # MSD: this test doesn't fail today (UFF = Unary Functor Image Filter)
 ADD_TEST(ioTvPipelineMetadataHandlingWithUFFilterTest ${IO_TESTS11}
    --compare-metadata ${EPSILON_9}
-	   ${INPUTDATA}/HFAGeoreferenced.img
-	   ${TEMP}/ioTvPipelineMetadataHandlingWithUFFilterTest.img
+           ${INPUTDATA}/HFAGeoreferenced.img
+           ${TEMP}/ioTvPipelineMetadataHandlingWithUFFilterTest.img
      otbPipelineMetadataHandlingWithUFFilterTest
        ${INPUTDATA}/HFAGeoreferenced.img
-	   ${TEMP}/ioTvPipelineMetadataHandlingWithUFFilterTest.img
+           ${TEMP}/ioTvPipelineMetadataHandlingWithUFFilterTest.img
         )
 
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -1548,7 +1548,7 @@ ADD_TEST(ioTvPipelineMetadataHandlingWithUFFilterTest ${IO_TESTS11}
 ADD_TEST(ioTuDEMHandlerNew ${IO_TESTS12} otbDEMHandlerNew )
 
 ADD_TEST(ioTvDEMHandler ${IO_TESTS12}
---compare-ascii ${EPSILON_9} 	${BASELINE_FILES}/ioDEMGetHeightAboveMSL.txt
+--compare-ascii ${EPSILON_9}         ${BASELINE_FILES}/ioDEMGetHeightAboveMSL.txt
                         ${TEMP}/ioDEMGetHeightAboveMSL.txt
         otbDEMHandlerTest
         ${INPUTDATA}/DEM/srtm_directory
@@ -1588,7 +1588,7 @@ ADD_TEST(ioTvDEMToImageGeneratorTest2 ${IO_TESTS12}
 
 IF(OTB_DATA_USE_LARGEINPUT)
 ADD_TEST(ioTvDEMToImageGeneratorFromImageTest_SensorModel ${IO_TESTS12}
-    --compare-n-images ${EPSILON_5} 2    
+    --compare-n-images ${EPSILON_5} 2
         ${BASELINE}/ioTvDEMToImageGeneratorFromImageTest_SM.tif
         ${TEMP}/ioTvDEMToImageGeneratorFromImage_Extract_DEM.tif
         ${BASELINE}/ioTvDEMToImageGeneratorFromImageTest_SM.tif
@@ -1598,12 +1598,12 @@ ADD_TEST(ioTvDEMToImageGeneratorFromImageTest_SensorModel ${IO_TESTS12}
         ${INPUTDATA}/DEM/srtm_directory
         ${TEMP}/ioTvDEMToImageGeneratorFromImage_Extract_DEM.tif
         ${TEMP}/ioTvDEMToImageGeneratorFromImage_DEM_Extract.tif
-        2600 4300 512 128 
+        2600 4300 512 128
 )
 ENDIF(OTB_DATA_USE_LARGEINPUT)
 
 ADD_TEST(ioTvDEMToImageGeneratorFromImageTest ${IO_TESTS12}
-    --compare-image ${EPSILON_5}    
+    --compare-image ${EPSILON_5}
         ${BASELINE}/ioTvDEMToImageGeneratorFromImageTest.tif
         ${TEMP}/ioTvDEMToImageGeneratorFromImage.tif
       otbDEMToImageGeneratorFromImageTest
@@ -1613,7 +1613,7 @@ ADD_TEST(ioTvDEMToImageGeneratorFromImageTest ${IO_TESTS12}
 )
 
 ADD_TEST(ioTvDEMToImageGeneratorFromImageTest2 ${IO_TESTS12}
-    --compare-n-images ${EPSILON_5} 2    
+    --compare-n-images ${EPSILON_5} 2
         ${BASELINE}/ioTvDEMToImageGeneratorFromImageTest_Ortho.tif
         ${TEMP}/ioTvDEMToImageGeneratorFromImage_Extract_DEM2.tif
         ${BASELINE}/ioTvDEMToImageGeneratorFromImageTest_Ortho.tif
@@ -1623,7 +1623,7 @@ ADD_TEST(ioTvDEMToImageGeneratorFromImageTest2 ${IO_TESTS12}
         ${INPUTDATA}/DEM/srtm_directory
         ${TEMP}/ioTvDEMToImageGeneratorFromImage_Extract_DEM2.tif
         ${TEMP}/ioTvDEMToImageGeneratorFromImage_DEM_Extract2.tif
-        10 15 16 64 
+        10 15 16 64
 )
 
 ADD_TEST(ioTvossimElevManagerTest ${IO_TESTS12}
@@ -1669,10 +1669,10 @@ ADD_TEST(ioTvossimElevManagerTest2 ${IO_TESTS12}
         otbOssimElevManagerTest2
          ${INPUTDATA}/DEM/srtm_directory
          ${TEMP}/ioTvossimElevManagerTest2.txt
-	6.5
-	44.5
-	0.002
-	500
+        6.5
+        44.5
+        0.002
+        500
          )
 
 # otb::MapProjectionAdapter (TODO: remove from IO)
@@ -1732,7 +1732,7 @@ ADD_TEST(ioTvVectorImageFileReaderWriterJ2K2TIF ${IO_TESTS9}
                         ${TEMP}/ioTvVectorImageFileReaderWriterJ2K2TIFOutput.tif
          otbVectorImageFileReaderWriterTest
          ${INPUTDATA}/bretagne.j2k
-	 ${TEMP}/ioTvVectorImageFileReaderWriterJ2K2TIFOutput.tif
+         ${TEMP}/ioTvVectorImageFileReaderWriterJ2K2TIFOutput.tif
          )
 
 ADD_TEST(ioTvImageFileReaderWriterJ2K2TIF ${IO_TESTS2}
@@ -1740,7 +1740,7 @@ ADD_TEST(ioTvImageFileReaderWriterJ2K2TIF ${IO_TESTS2}
                         ${TEMP}/ioTvImageFileReaderWriterJ2K2TIFOutput.tif
          otbDoubleImageIOTest
          ${INPUTDATA}/bretagne.j2k
-	 ${TEMP}/ioTvImageFileReaderWriterJ2K2TIFOutput.tif
+         ${TEMP}/ioTvImageFileReaderWriterJ2K2TIFOutput.tif
         )
 
 #NOTE: we are comparing with the kakadu output in raw format.
@@ -1750,7 +1750,7 @@ ADD_TEST(ioTvVectorImageFileReaderWriterJP22TIF ${IO_TESTS9}
                         ${TEMP}/ioTvVectorImageFileReaderWriterJP22TIFOutput.tif
          otbVectorImageFileReaderWriterTest
          ${LARGEDATA}/JPEG2000/QB_multicomp_small.jpx
-	 ${TEMP}/ioTvVectorImageFileReaderWriterJP22TIFOutput.tif
+         ${TEMP}/ioTvVectorImageFileReaderWriterJP22TIFOutput.tif
          )
 
 
@@ -1759,7 +1759,7 @@ ADD_TEST(ioTvImageFileReaderWriterJP22TIF ${IO_TESTS2}
                         ${TEMP}/ioTvImageFileReaderWriterJP22TIFOutput.tif
          otbDoubleImageIOTest
          ${LARGEDATA}/JPEG2000/QB_multicomp_small.jpx
-	 ${TEMP}/ioTvImageFileReaderWriterJP22TIFOutput.tif
+         ${TEMP}/ioTvImageFileReaderWriterJP22TIFOutput.tif
          )
 ENDIF(OTB_DATA_USE_LARGEINPUT)
 
@@ -1780,40 +1780,40 @@ ENDIF(OTB_COMPILE_JPEG2000)
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 ADD_TEST(ioTvGDALDriverDoubleWritingTest ${IO_TESTS14}
-		--compare-n-images ${EPSILON_9} 4
-			${INPUTDATA}/poupees.tif
-			${TEMP}/ioGdalDriverDoubleWritingTestImage1.tif
-			${INPUTDATA}/ROI_IKO_PAN_LesHalles.tif
-			${TEMP}/ioGdalDriverDoubleWritingTestImage2.tif
-			${INPUTDATA}/poupees.tif
-			${TEMP}/ioGdalDriverDoubleWritingTestImage3.tif
-			${INPUTDATA}/ROI_IKO_PAN_LesHalles.tif
-			${TEMP}/ioGdalDriverDoubleWritingTestImage4.tif
-		otbGDALDriverDoubleWritingTest
-			${INPUTDATA}/poupees.tif
-			${INPUTDATA}/ROI_IKO_PAN_LesHalles.tif
-			${TEMP}/ioGdalDriverDoubleWritingTestImage1.tif
-			${TEMP}/ioGdalDriverDoubleWritingTestImage2.tif
-			${TEMP}/ioGdalDriverDoubleWritingTestImage3.tif
-			${TEMP}/ioGdalDriverDoubleWritingTestImage4.tif
+                --compare-n-images ${EPSILON_9} 4
+                        ${INPUTDATA}/poupees.tif
+                        ${TEMP}/ioGdalDriverDoubleWritingTestImage1.tif
+                        ${INPUTDATA}/ROI_IKO_PAN_LesHalles.tif
+                        ${TEMP}/ioGdalDriverDoubleWritingTestImage2.tif
+                        ${INPUTDATA}/poupees.tif
+                        ${TEMP}/ioGdalDriverDoubleWritingTestImage3.tif
+                        ${INPUTDATA}/ROI_IKO_PAN_LesHalles.tif
+                        ${TEMP}/ioGdalDriverDoubleWritingTestImage4.tif
+                otbGDALDriverDoubleWritingTest
+                        ${INPUTDATA}/poupees.tif
+                        ${INPUTDATA}/ROI_IKO_PAN_LesHalles.tif
+                        ${TEMP}/ioGdalDriverDoubleWritingTestImage1.tif
+                        ${TEMP}/ioGdalDriverDoubleWritingTestImage2.tif
+                        ${TEMP}/ioGdalDriverDoubleWritingTestImage3.tif
+                        ${TEMP}/ioGdalDriverDoubleWritingTestImage4.tif
 )
 
 IF(OTB_DATA_USE_LARGEINPUT)
 ADD_TEST(ioTvReadingComplexDataIntoComplexImage ${IO_TESTS14}
-		otbReadingComplexDataIntoComplexImageTest
-		${LARGEDATA}/RADARSAT1/GOMA2/SCENE01/DAT_01.001
-		1000 1000
+                otbReadingComplexDataIntoComplexImageTest
+                ${LARGEDATA}/RADARSAT1/GOMA2/SCENE01/DAT_01.001
+                1000 1000
 )
 
 ADD_TEST(ioTvWritingComplexDataWithComplexImage ${IO_TESTS14}
 --compare-image ${EPSILON_9}
-		${BASELINE}/ioWritingComplexDataWithComplexImageOutput.tif
-		${TEMP}/ioWritingComplexDataWithComplexImageOutput.tif
-		otbWritingComplexDataWithComplexImageTest
-		${LARGEDATA}/RADARSAT1/GOMA2/SCENE01/DAT_01.001
-		${TEMP}/ioWritingComplexDataWithComplexImageOutput.tif
-		1000 1000
-		500  500
+                ${BASELINE}/ioWritingComplexDataWithComplexImageOutput.tif
+                ${TEMP}/ioWritingComplexDataWithComplexImageOutput.tif
+                otbWritingComplexDataWithComplexImageTest
+                ${LARGEDATA}/RADARSAT1/GOMA2/SCENE01/DAT_01.001
+                ${TEMP}/ioWritingComplexDataWithComplexImageOutput.tif
+                1000 1000
+                500  500
 )
 ENDIF(OTB_DATA_USE_LARGEINPUT)
 
@@ -1838,8 +1838,8 @@ ADD_TEST(ioTvSHPVectorDataFileReader ${IO_TESTS15}
         --compare-ascii ${EPSILON_9}  ${BASELINE_FILES}/ioSHPVectorDataFileReader.txt
                         ${TEMP}/ioSHPVectorDataFileReader.txt
         otbVectorDataFileReader
-	${LARGEDATA}/QUICKBIRD/TOULOUSE/GIS_FILES/000000128955_01_ORDER_SHAPE.shp
-	${TEMP}/ioSHPVectorDataFileReader.txt
+        ${LARGEDATA}/QUICKBIRD/TOULOUSE/GIS_FILES/000000128955_01_ORDER_SHAPE.shp
+        ${TEMP}/ioSHPVectorDataFileReader.txt
 )
 ENDIF(OTB_DATA_USE_LARGEINPUT)
 
@@ -1847,8 +1847,8 @@ ADD_TEST(ioTvSHPVectorDataFileReader2 ${IO_TESTS15}
         --compare-ascii ${EPSILON_9}  ${BASELINE_FILES}/ioSHPVectorDataFileReader2.txt
                         ${TEMP}/ioSHPVectorDataFileReader2.txt
         otbVectorDataFileReader
-	${INPUTDATA}/ToulouseRoad-examples.shp
-	${TEMP}/ioSHPVectorDataFileReader2.txt
+        ${INPUTDATA}/ToulouseRoad-examples.shp
+        ${TEMP}/ioSHPVectorDataFileReader2.txt
 )
 
 IF(OTB_DATA_USE_LARGEINPUT)
@@ -1856,8 +1856,8 @@ ADD_TEST(ioTlSHPVectorDataFileReader3 ${IO_TESTS15}
         --compare-ascii ${EPSILON_9}  ${BASELINE_FILES}/ioSHPVectorDataFileReader3.txt
                         ${TEMP}/ioSHPVectorDataFileReader3.txt
         otbVectorDataFileReader
-	${LARGEDATA}/VECTOR/MidiPyrenees/roads.shp
-	${TEMP}/ioSHPVectorDataFileReader3.txt
+        ${LARGEDATA}/VECTOR/MidiPyrenees/roads.shp
+        ${TEMP}/ioSHPVectorDataFileReader3.txt
 )
 ENDIF(OTB_DATA_USE_LARGEINPUT)
 
@@ -1865,16 +1865,16 @@ ADD_TEST(ioTvKMLVectorDataFileReader ${IO_TESTS15}
         --compare-ascii ${EPSILON_9}  ${BASELINE_FILES}/ioTvKMLVectorDataFileReader.txt
                         ${TEMP}/ioTvKMLVectorDataFileReader.txt
         otbVectorDataFileReader
-	${INPUTDATA}/lines.kml
-	${TEMP}/ioTvKMLVectorDataFileReader.txt
+        ${INPUTDATA}/lines.kml
+        ${TEMP}/ioTvKMLVectorDataFileReader.txt
 )
 
 ADD_TEST(ioTvKMLVectorDataFileReader2 ${IO_TESTS15}
         --compare-ascii ${EPSILON_9}  ${BASELINE_FILES}/ioTvKMLVectorDataFileReader2.txt
                         ${TEMP}/ioTvKMLVectorDataFileReader2.txt
         otbVectorDataFileReader
-	${INPUTDATA}/multigeometry.kml
-	${TEMP}/ioTvKMLVectorDataFileReader2.txt
+        ${INPUTDATA}/multigeometry.kml
+        ${TEMP}/ioTvKMLVectorDataFileReader2.txt
 )
 
 ADD_TEST(ioTuVectorDataFileWriterNew ${IO_TESTS15}
@@ -1891,8 +1891,8 @@ ADD_TEST(ioTvVectorDataFileWriter ${IO_TESTS15}
 
 ADD_TEST(ioTvVectorDataFileWriterTwice ${IO_TESTS15}
         otbVectorDataFileWriter
-	${TEMP}/ioTvVectorDataFileWriterOutput.shp
-	)
+        ${TEMP}/ioTvVectorDataFileWriterOutput.shp
+        )
 SET_TESTS_PROPERTIES(ioTvVectorDataFileWriterTwice PROPERTIES DEPENDS ioTvVectorDataFileWriter)
 
 ADD_TEST(ioTvVectorDataFileWriterPolygons ${IO_TESTS15}
@@ -1920,7 +1920,7 @@ ADD_TEST(ioTvVectorDataFileReaderWriter ${IO_TESTS15}
         otbVectorDataFileReaderWriter
             ${LARGEDATA}/QUICKBIRD/TOULOUSE/GIS_FILES/000000128955_01_ORDER_SHAPE.shp
             ${TEMP}/ioTvVectorDataFileReaderWriterOutput.shp
-	)
+        )
 ENDIF(OTB_DATA_USE_LARGEINPUT)
 
 ADD_TEST(ioTvVectorDataFileGeoReaderWriter ${IO_TESTS15}
@@ -1930,7 +1930,7 @@ ADD_TEST(ioTvVectorDataFileGeoReaderWriter ${IO_TESTS15}
         otbVectorDataFileGeoReaderWriter
             ${INPUTDATA}/ToulouseRoad-examples.shp
             ${TEMP}/ioTvVectorDataFileGeoReaderWriterOutput.shp
-	)
+        )
 
 ADD_TEST(ioTvVectorDataFileGeoReaderWriter2 ${IO_TESTS15}
         --compare-ogr  ${EPSILON_9}
@@ -1939,7 +1939,7 @@ ADD_TEST(ioTvVectorDataFileGeoReaderWriter2 ${IO_TESTS15}
         otbVectorDataFileGeoReaderWriter
             ${INPUTDATA}/Capitole-Shadows.kml
             ${TEMP}/ioTvVectorDataFileGeoReaderWriterOutput2.shp
-	)
+        )
 
 ADD_TEST(ioTvKMLVectorDataFileGeoReaderWriter ${IO_TESTS15}
         --compare-ascii  ${EPSILON_9}
@@ -1948,7 +1948,7 @@ ADD_TEST(ioTvKMLVectorDataFileGeoReaderWriter ${IO_TESTS15}
         otbVectorDataFileGeoReaderWriter
             ${INPUTDATA}/ToulouseRoad-examples.shp
             ${TEMP}/ioTvKMLVectorDataFileGeoReaderWriterOutput.kml
-	)
+        )
 
 ADD_TEST(ioTvKMLVectorDataFileGeoReaderWriter2 ${IO_TESTS15}
         --compare-ascii  ${EPSILON_9}
@@ -1957,7 +1957,7 @@ ADD_TEST(ioTvKMLVectorDataFileGeoReaderWriter2 ${IO_TESTS15}
         otbVectorDataFileGeoReaderWriter
             ${INPUTDATA}/Capitole-Shadows.kml
             ${TEMP}/ioTvKMLVectorDataFileGeoReaderWriterOutput2.kml
-	)
+        )
 
 # CanRead OGR GML()
 ADD_TEST(ioTuOGRVectorDataIOTestCanReadGML ${IO_TESTS15}
@@ -2057,8 +2057,8 @@ ADD_TEST(ioTuRADImageIOCanRead_RADCI2 ${IO_TESTS16}
 # Convert a ci2.RAD file into ENVI format
 ADD_TEST(ioTvImageFileReaderRADCI22ENVI ${IO_TESTS16}
 --compare-image ${EPSILON_9}
-	${BASELINE}/ioImageFileReaderRADCI22ENVI.hdr
-	${TEMP}/ioImageFileReaderRADCI22ENVI.hdr
+        ${BASELINE}/ioImageFileReaderRADCI22ENVI.hdr
+        ${TEMP}/ioImageFileReaderRADCI22ENVI.hdr
         otbImageFileReaderRADComplexFloatExtract
         ${LARGEDATA}/RAD_CI2/3017_HH.rad
         ${TEMP}/ioImageFileReaderRADCI22ENVI.hdr )
@@ -2187,7 +2187,7 @@ ADD_TEST(ioTvImageMetadataInterfaceBaseTest_QB ${IO_TESTS18}
         otbImageMetadataInterfaceBaseTest
         ${LARGEDATA}/QUICKBIRD/TOULOUSE/000000128955_01_P001_PAN/02APR01105228-P1BS-000000128955_01_P001.TIF
         ${TEMP}/ioTvImageMetadataInterfaceBase_QB.txt
-)        
+)
 ADD_TEST(ioTvImageMetadataInterfaceBaseTest_QBCevennes ${IO_TESTS18}
          --compare-ascii ${NOTOL} ${BASELINE_FILES}/ioTvImageMetadataInterfaceBase_QBCevennes.txt
                          ${TEMP}/ioTvImageMetadataInterfaceBase_QBCevennes.txt
@@ -2527,7 +2527,7 @@ ADD_TEST(ioTvImageKeywordlistRadarSat2 ${IO_TESTS18}
          ${TEMP}/ioTvImageKeywordlistRadarSat2.txt
          ${BASELINE_FILES}/ioTvImageKeywordlistRadarSat2.txt
          ${TEMP}/ioTvImageKeywordlistRadarSat2_saveState_loadState.txt
-	  --ignore-lines-with 1 product_xml_filename
+          --ignore-lines-with 1 product_xml_filename
     otbImageKeywordlist
          ${LARGEDATA}/RADARSAT2/ALTONA/Fine_Quad-Pol_Dataset/PK6621_DK406_FQ9_20080405_124900_HH_VV_HV_VH_SLC_Altona/product.xml
          ${TEMP}/ioTvImageKeywordlistRadarSat2.txt
@@ -2540,7 +2540,7 @@ ADD_TEST(ioTvImageKeywordlistTerraSarX ${IO_TESTS18}
          ${TEMP}/ioTvImageKeywordlistTerraSarX.txt
          ${BASELINE_FILES}/ioTvImageKeywordlistTerraSarX.txt
          ${TEMP}/ioTvImageKeywordlistTerraSarX_saveState_loadState.txt
-	  --ignore-lines-with 1 product_xml_filename
+          --ignore-lines-with 1 product_xml_filename
     otbImageKeywordlist
          ${LARGEDATA}/TERRASARX/dims/TSX-1.SAR.L1B/TSX1_SAR__SSC/TSX1_SAR__SSC.xml
          ${TEMP}/ioTvImageKeywordlistTerraSarX.txt
@@ -2553,7 +2553,7 @@ ADD_TEST(ioTvImageKeywordlistTerraSarX_Upsala ${IO_TESTS18}
          ${TEMP}/ioTvImageKeywordlistTerraSarX_Upsala.txt
          ${BASELINE_FILES}/ioTvImageKeywordlistTerraSarX_Upsala.txt
          ${TEMP}/ioTvImageKeywordlistTerraSarX_Upsala_saveState_loadState.txt
-	  --ignore-lines-with 1 product_xml_filename
+          --ignore-lines-with 1 product_xml_filename
     otbImageKeywordlist
          ${LARGEDATA}/TERRASARX/UPSALA_GLACIER/TSX1_SAR__MGD/TSX1_SAR__MGD.xml
          ${TEMP}/ioTvImageKeywordlistTerraSarX_Upsala.txt
@@ -2565,7 +2565,7 @@ ADD_TEST(ioTvImageKeywordlistTerraSarX_Toronto ${IO_TESTS18}
          ${TEMP}/ioTvImageKeywordlistTerraSarX_Toronto.txt
          ${BASELINE_FILES}/ioTvImageKeywordlistTerraSarX_Toronto.txt
          ${TEMP}/ioTvImageKeywordlistTerraSarX_Toronto_saveState_loadState.txt
-	  --ignore-lines-with 1 product_xml_filename
+          --ignore-lines-with 1 product_xml_filename
     otbImageKeywordlist
          ${LARGEDATA}/TERRASARX/TORONTO/TSX1_SAR__SSC/TSX1_SAR__SSC.xml
          ${TEMP}/ioTvImageKeywordlistTerraSarX_Toronto.txt
@@ -2608,9 +2608,9 @@ ADD_TEST(ioTvImageKeywordlistErs ${IO_TESTS18}
 ENDIF(OTB_DATA_USE_LARGEINPUT)
 
 ADD_TEST(ioTvOssimJpegFileRessourceLeak ${IO_TESTS18}
-	otbOssimJpegFileRessourceLeakTest
-	${INPUTDATA}/poupees.jpg
-	1200
+        otbOssimJpegFileRessourceLeakTest
+        ${INPUTDATA}/poupees.jpg
+        1200
 )
 
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -2619,12 +2619,12 @@ ADD_TEST(ioTvOssimJpegFileRessourceLeak ${IO_TESTS18}
 IF(OTB_USE_CURL)
 
 ADD_TEST(ioTvImageFileReaderServerNameHTTPTest ${IO_TESTS19}
-	otbImageFileReaderServerName
-	http://tile.openstreetmap.org/)
+        otbImageFileReaderServerName
+        http://tile.openstreetmap.org/)
 
 ADD_TEST(ioTvImageFileReaderServerNameOTBTest ${IO_TESTS19}
-	otbImageFileReaderServerName
-	${OTB_DATA_ROOT}/Examples/osmfile.otb)
+        otbImageFileReaderServerName
+        ${OTB_DATA_ROOT}/Examples/osmfile.otb)
 
 # We do not perform regression testing here because images on server might change
 ADD_TEST(ioTvTileMapImageIOFile ${IO_TESTS19}
@@ -2759,18 +2759,18 @@ ADD_TEST(ioTuSarDefaultImageMetadataInterface ${IO_TESTS20}
         otbSarDefaultImageMetadataInterface )
 
 ADD_TEST(ioTuScalarBufferToImageFileWriter ${IO_TESTS20}
-        otbScalarBufferToImageFileWriterNew )		
+        otbScalarBufferToImageFileWriterNew )
 
 ADD_TEST(ioTvScalarBufferToImageFileWriterTest ${IO_TESTS20}
   --compare-image ${NOTOL}
          ${BASELINE}/ioTvScalarBufferToImageFileWriterTest.tif
          ${TEMP}/ioTvScalarBufferToImageFileWriterTest.tif
-  otbScalarBufferToImageFileWriterTest 
-		4
-		50
-		75
+  otbScalarBufferToImageFileWriterTest
+                4
+                50
+                75
          ${TEMP}/ioTvScalarBufferToImageFileWriterTest.tif
-)	
+)
 
 
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -2799,7 +2799,7 @@ ADD_TEST(ioTvKmzProductWriterWithGCP ${IO_TESTS21}
   ${INPUTDATA}/Haiti1.jpeg
   ${INPUTDATA}/DEM/srtm_directory
   ${TEMP}/ioTuHaitiKmzProduct.kmz
-  1980.000000 1986.000000 -72.351257 18.555075 0.000000 
+  1980.000000 1986.000000 -72.351257 18.555075 0.000000
   1963.000000 1944.000000 -72.352051 18.556946 0.000000
   2078.000000 1566.000000 -72.346130 18.574358 0.000000
   2154.000000 1430.000000 -72.342377 18.580441 0.000000
@@ -2808,7 +2808,7 @@ ADD_TEST(ioTvKmzProductWriterWithGCP ${IO_TESTS21}
   3492.000000 1397.000000 -72.278343 18.580887 0.000000
   2890.000000 1439.000000 -72.306908 18.579464 0.000000
   2098.000000 2469.000000 -72.345741 18.532839 0.000000
-  1941.000000 2473.000000 -72.353317 18.532595 0.00000 
+  1941.000000 2473.000000 -72.353317 18.532595 0.00000
   1644.000000 2409.000000 -72.367691 18.535810 0.000000
   1440.000000 2448.000000 -72.377457 18.534243 0.000000
   687.000000 2005.000000 -72.413315 18.554974 0.000000
@@ -2833,7 +2833,7 @@ ADD_TEST(ioTvKmzProductWriterWithGCP_Logo_Legend ${IO_TESTS21}
   -le ${INPUTDATA}/otb_big.png
   -dem ${INPUTDATA}/DEM/srtm_directory
   -kmz ${TEMP}/ioTuHaitiKmzProductWithLogoAndLegend.kmz
-  -gcp  1980.000000 1986.000000 -72.351257 18.555075 0.000000 
+  -gcp  1980.000000 1986.000000 -72.351257 18.555075 0.000000
   1963.000000 1944.000000 -72.352051 18.556946 0.000000
   2078.000000 1566.000000 -72.346130 18.574358 0.000000
   2154.000000 1430.000000 -72.342377 18.580441 0.000000
@@ -2842,7 +2842,7 @@ ADD_TEST(ioTvKmzProductWriterWithGCP_Logo_Legend ${IO_TESTS21}
   3492.000000 1397.000000 -72.278343 18.580887 0.000000
   2890.000000 1439.000000 -72.306908 18.579464 0.000000
   2098.000000 2469.000000 -72.345741 18.532839 0.000000
-  1941.000000 2473.000000 -72.353317 18.532595 0.00000 
+  1941.000000 2473.000000 -72.353317 18.532595 0.00000
   1644.000000 2409.000000 -72.367691 18.535810 0.000000
   1440.000000 2448.000000 -72.377457 18.534243 0.000000
   687.000000 2005.000000 -72.413315 18.554974 0.000000
@@ -2859,7 +2859,7 @@ ADD_TEST(ioTvKmzProductWriterWithGCP_Logo_Legend ${IO_TESTS21}
   3989.000000 2639.000000 -72.255020 18.523664 0.000000
   417.000000 2317.000000 -72.426552 18.540876 0.000000
   )
-SET_TESTS_PROPERTIES(ioTvKmzProductWriterWithGCP_Logo_Legend 
+SET_TESTS_PROPERTIES(ioTvKmzProductWriterWithGCP_Logo_Legend
   PROPERTIES DEPENDS ioTvKmzProductWriterWithGCP)
 
 
@@ -2920,7 +2920,7 @@ ADD_TEST(ioTvMultiDatasetReadingInName2 ${IO_TESTS22}
       ${TEMP}/ioTvMultiDatasetReadingInName2.txt
       )
 
-# Test to check behavior of function readerGDAL->GetSubDatasetInfo() which return info about subdataset. 
+# Test to check behavior of function readerGDAL->GetSubDatasetInfo() which return info about subdataset.
 ADD_TEST(ioTvMultiDatasetReadingInfo ${IO_TESTS22}
   --compare-ascii ${NOTOL}  ${BASELINE_FILES}/ioTvMultiDatasetReadingInfo.txt
                              ${TEMP}/ioTvMultiDatasetReadingInfoOut.txt
@@ -2929,7 +2929,7 @@ ADD_TEST(ioTvMultiDatasetReadingInfo ${IO_TESTS22}
       ${TEMP}/ioTvMultiDatasetReadingInfoOut.txt
       )
    
-# Tests which read data in HDF files.            
+# Tests which read data in HDF files.
 ADD_TEST(ioTvMultiChannelROI_HDF4_2_TIF ${COMMON_TESTS2}
    --compare-image ${EPSILON_9}   ${BASELINE}/ioExtractROI_HDF2TIF_MOD09Q1G_20_25_100_150_channel_1.tif
                      ${TEMP}/ioExtractROI_HDF2TIF_MOD09Q1G_20_25_100_150_channel_1_OUT.tif
@@ -3016,7 +3016,7 @@ FOREACH(INPUTFILE_PIXELTYPE ${INPUTFILE_PIXELTYPES_LIST})
       #          otbMultibandComplexToImageScalar${READING_PIXELTYPE}
       #          ${INPUTDATA}/multibandComplex${INPUTFILE_PIXELTYPE}_${NBBANDS}bands.tif) #hdr)
 
-      # Size: 100x100 is to large to store pixel values coded as short. 
+      # Size: 100x100 is to large to store pixel values coded as short.
       IF ( NOT ${INPUTFILE_PIXELTYPE} MATCHES "Short" )
 
         ADD_TEST(ioTvMultibandComplex${INPUTFILE_PIXELTYPE}${NBBANDS}BandsToVectorImageScalar${READING_PIXELTYPE}
@@ -3037,8 +3037,8 @@ FOREACH(INPUTFILE_PIXELTYPE ${INPUTFILE_PIXELTYPES_LIST})
       # [missing impl]
       # ADD_TEST(ioTvMultibandComplex${INPUTFILE_PIXELTYPE}${NBBANDS}BandsToImageComplex${READING_PIXELTYPE})
 
-      # Size: 100x100 is to large to store pixel values coded as short. 
-      IF ( NOT ${INPUTFILE_PIXELTYPE} MATCHES "Short" )  
+      # Size: 100x100 is to large to store pixel values coded as short.
+      IF ( NOT ${INPUTFILE_PIXELTYPE} MATCHES "Short" )
 
         ADD_TEST(ioTvMultibandComplex${INPUTFILE_PIXELTYPE}${NBBANDS}BandsToVectorImageComplex${READING_PIXELTYPE}
                  ${IO_TESTS23}
@@ -3056,7 +3056,7 @@ FOREACH(INPUTFILE_PIXELTYPE ${INPUTFILE_PIXELTYPES_LIST})
 
     ENDFOREACH(NBBANDS ${NBBANDS_LIST})
 
-  ENDFOREACH(READING_PIXELTYPE ${READING_PIXELTYPES_LIST})  
+  ENDFOREACH(READING_PIXELTYPE ${READING_PIXELTYPES_LIST})
 ENDFOREACH(INPUTFILE_PIXELTYPE ${INPUTFILE_PIXELTYPES_LIST})
 
 
@@ -3101,8 +3101,8 @@ FOREACH(DATA_PIXELTYPE ${DATA_PIXELTYPES_LIST})
               100
            )
         
-  FOREACH(NBBANDS ${NBBANDS_LIST})       
-    IF ( NOT ${DATA_PIXELTYPE} MATCHES "Short" )   
+  FOREACH(NBBANDS ${NBBANDS_LIST})
+    IF ( NOT ${DATA_PIXELTYPE} MATCHES "Short" )
       
       ADD_TEST(ioTvWriteVectorImageScalar${DATA_PIXELTYPE}${NBBANDS}Bands
                ${IO_TESTS23}
@@ -3113,7 +3113,7 @@ FOREACH(DATA_PIXELTYPE ${DATA_PIXELTYPES_LIST})
                   ${TEMP}/multibandOut${DATA_PIXELTYPE}_${NBBANDS}bands.tif
                   100
                   ${NBBANDS}
-               ) 
+               )
       
       ADD_TEST(ioTvWriteVectorImageComplex${DATA_PIXELTYPE}${NBBANDS}Bands
                ${IO_TESTS23}
@@ -3150,7 +3150,7 @@ FOREACH(DATA_PIXELTYPE ${DATA_PIXELTYPES_LIST})
                   ${NBBANDS}
                )
     
-    ENDIF (  NOT ${DATA_PIXELTYPE} MATCHES "Short" )         
+    ENDIF (  NOT ${DATA_PIXELTYPE} MATCHES "Short" )
   ENDFOREACH(NBBANDS ${NBBANDS_LIST})
 
 ############
@@ -3175,8 +3175,8 @@ FOREACH(DATA_PIXELTYPE ${DATA_PIXELTYPES_LIST})
               100
            )
         
-  FOREACH(NBBANDS ${NBBANDS_LIST})       
-    IF ( NOT ${DATA_PIXELTYPE} MATCHES "Short" )   
+  FOREACH(NBBANDS ${NBBANDS_LIST})
+    IF ( NOT ${DATA_PIXELTYPE} MATCHES "Short" )
       
       ADD_TEST(ioTvStreamingWriteVectorImageScalar${DATA_PIXELTYPE}${NBBANDS}Bands
                ${IO_TESTS23}
@@ -3187,12 +3187,12 @@ FOREACH(DATA_PIXELTYPE ${DATA_PIXELTYPES_LIST})
                   ${TEMP}/multibandStrOut${DATA_PIXELTYPE}_${NBBANDS}bands.tif
                   100
                   ${NBBANDS}
-               ) 
+               )
       
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ otbIOTESTS23 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-# Tests about relative sepctral responses from file or OpticalMetadataInterface 
+# Tests about relative sepctral responses from file or OpticalMetadataInterface
 
 ADD_TEST(raTuSpectralSensitivityReaderNew ${IO_TESTS23}
      otbSpectralSensitivityReaderNew
@@ -3204,9 +3204,9 @@ ADD_TEST(raTvSpectralSensitivityReaderTest ${IO_TESTS23}
         ${TEMP}/rcTuSpectralSensitivityReaderTest.txt
      --ignore-lines-with 2 DataPath FileName
      otbSpectralSensitivityReaderTest
-	${INPUTDATA}/Radiometry
-	${INPUTDATA}/SPOT5_EXTRACTS/Arcachon/Arcachon_extrait_3852_3319_546_542.tif
-        ${TEMP}/rcTuSpectralSensitivityReaderTest.txt	  
+        ${INPUTDATA}/Radiometry
+        ${INPUTDATA}/SPOT5_EXTRACTS/Arcachon/Arcachon_extrait_3852_3319_546_542.tif
+        ${TEMP}/rcTuSpectralSensitivityReaderTest.txt
 )
 
 
@@ -3218,7 +3218,7 @@ ADD_TEST(raTvSpectralSensitivityReaderGenericTest ${IO_TESTS23}
      otbSpectralSensitivityReaderGenericTest
     ${INPUTDATA}/Radiometry/SPOT5/HRG1/rep6S.dat
     ${INPUTDATA}/SPOT5_EXTRACTS/Arcachon/Arcachon_extrait_3852_3319_546_542.tif
-        ${TEMP}/raTvSpectralSensitivityReaderGenericTest.txt     
+        ${TEMP}/raTvSpectralSensitivityReaderGenericTest.txt
 )
 
       ADD_TEST(ioTvStreamingWriteVectorImageComplex${DATA_PIXELTYPE}${NBBANDS}Bands
diff --git a/Testing/Code/Learning/CMakeLists.txt b/Testing/Code/Learning/CMakeLists.txt
index a288571dee545c8adb9c1a2c9bfdc0d6ca18cc0b..948b4babe1904a833814a4a2268cce60981d5bad 100644
--- a/Testing/Code/Learning/CMakeLists.txt
+++ b/Testing/Code/Learning/CMakeLists.txt
@@ -122,10 +122,10 @@ ADD_TEST(leTvSVMPointSetModelEstimatorTrain ${LEARNING_TESTS2}
         otbSVMPointSetModelEstimatorTrain
  ${TEMP}/leTvsvm_model_pointset)
 
-# -------            otb::SVMSampleListModelEstimator   --------------------  
+# -------            otb::SVMSampleListModelEstimator   --------------------
 
 ADD_TEST(leTuSVMSampleListModelEstimatorNew ${LEARNING_TESTS2}
-        otbSVMSampleListModelEstimatorNew)   
+        otbSVMSampleListModelEstimatorNew)
 
 ADD_TEST(leTvSVMSampleListModelEstimatorTest ${LEARNING_TESTS2}
  --compare-ascii ${EPSILON_9}
@@ -328,10 +328,10 @@ ADD_TEST(leTvSVMImageClassificationFilter ${LEARNING_TESTS3}
  ${INPUTDATA}/svm_model_image
  ${TEMP}/leSVMImageClassificationFilterOutput.tif)
 
-# ------- otb::SVMImageClassificationWithRuleFilter ---------------------- 
+# ------- otb::SVMImageClassificationWithRuleFilter ----------------------
 
 ADD_TEST(leTuSVMImageClassificationWithRuleFilterNew ${LEARNING_TESTS3}
-          otbSVMImageClassificationWithRuleFilterNew) 
+          otbSVMImageClassificationWithRuleFilterNew)
 
 ADD_TEST(leTvSVMImageClassificationWithRuleFilter ${LEARNING_TESTS3}
  --compare-image ${NOTOL}
@@ -574,14 +574,14 @@ ${TEMP}/leTvShiftScaleSampleListFilterOutput.txt
 -1 -3
  0 -1
 )
-# Gaussian Additive 
+# Gaussian Additive
 ADD_TEST(leTuGaussianAdditiveNoiseSampleListFilterNew ${LEARNING_TESTS4}
 otbGaussianAdditiveNoiseSampleListFilterNew)
 
 ADD_TEST(leTvGaussianAdditiveNoiseSampleListFilter ${LEARNING_TESTS4}
 --compare-ascii ${NOTOL}
-	${BASELINE_FILES}/leTvGaussianAdditiveNoiseSampleListFilterOutput.txt
-	${TEMP}/leTvGaussianAdditiveNoiseSampleListFilterOutput.txt
+        ${BASELINE_FILES}/leTvGaussianAdditiveNoiseSampleListFilterOutput.txt
+        ${TEMP}/leTvGaussianAdditiveNoiseSampleListFilterOutput.txt
 otbGaussianAdditiveNoiseSampleListFilter
 ${TEMP}/leTvGaussianAdditiveNoiseSampleListFilterOutput.txt
  2
@@ -620,18 +620,18 @@ ${BASELINE_FILES}/leTvListSampleToBalancedListSampleFilterOutput.txt
  ${TEMP}/leTvListSampleToBalancedListSampleFilterOutput.txt
 otbListSampleToBalancedListSampleFilter
 ${TEMP}/leTvListSampleToBalancedListSampleFilterOutput.txt
- 2 
+ 2
 -1 -3  0 # The third element is the label of the SampleList
  1  2  1
 -2 -5  0
 -1 -3  1
  0 -1  1
 -3  1  1
--5  2  1 
+-5  2  1
  2  1  1
- 2  8  1 
+ 2  8  1
  1 -4  0
--1  5  4 
+-1  5  4
  2  5  1
  0 -5  0
  1 -1  2
diff --git a/Testing/Code/Markov/CMakeLists.txt b/Testing/Code/Markov/CMakeLists.txt
index 3a6876d51084e88a1a4f942b8d1a01bd2a9c205d..9b7497d909553076ce229314b944dc6596817fbf 100644
--- a/Testing/Code/Markov/CMakeLists.txt
+++ b/Testing/Code/Markov/CMakeLists.txt
@@ -24,14 +24,14 @@ ADD_TEST(maTuMarkovRandomFieldFilterNew ${MARKOV_TESTS1}
 
 ADD_TEST(maTvMarkovRandomFieldFilter ${MARKOV_TESTS1}
   --compare-image ${TOL}  ${BASELINE}/maTvMarkovRandomField.png
-                  	  ${TEMP}/maTvMarkovRandomField.png
+                            ${TEMP}/maTvMarkovRandomField.png
         otbMarkovRandomFieldFilter
             ${INPUTDATA}/QB_Suburb.png
-	    ${TEMP}/maTvMarkovRandomField.png
-	    1.0
-	    30
-	    1.0
-	    )
+            ${TEMP}/maTvMarkovRandomField.png
+            1.0
+            30
+            1.0
+            )
 
 
 # -------            otb::MRFEnergyEdgeFidelity       ------------------------------
@@ -42,8 +42,8 @@ ADD_TEST(maTvMRFEnergyEdgeFidelity ${MARKOV_TESTS1}
 --compare-ascii ${TOL} ${BASELINE_FILES}/maTvMRFEnergyEdgeFidelity.txt
                          ${TEMP}/maTvMRFEnergyEdgeFidelity.txt
      otbMRFEnergyEdgeFidelity
-	${TEMP}/maTvMRFEnergyEdgeFidelity.txt
-	)
+        ${TEMP}/maTvMRFEnergyEdgeFidelity.txt
+        )
 
 
 # -------            otb::MRFEnergyGaussianClassification   ------------------------------
@@ -54,8 +54,8 @@ ADD_TEST(maTvMRFEnergyGaussianClassification ${MARKOV_TESTS1}
 --compare-ascii ${TOL} ${BASELINE_FILES}/maTvMRFEnergyGaussianClassification.txt
                        ${TEMP}/maTvMRFEnergyGaussianClassification.txt
      otbMRFEnergyGaussianClassification
-	${TEMP}/maTvMRFEnergyGaussianClassification.txt
-	)
+        ${TEMP}/maTvMRFEnergyGaussianClassification.txt
+        )
 
 
 # -------            otb::MRFEnergyPotts   ------------------------------
@@ -67,8 +67,8 @@ ADD_TEST(maTvMRFEnergyPotts ${MARKOV_TESTS1}
                   ${BASELINE_FILES}/maTvMRFEnergyPotts.txt
                   ${TEMP}/maTvMRFEnergyPotts.txt
      otbMRFEnergyPotts
-	${TEMP}/maTvMRFEnergyPotts.txt
-	)
+        ${TEMP}/maTvMRFEnergyPotts.txt
+        )
 
 # -------            otb::MRFEnergyGaussian   ------------------------------
 ADD_TEST(maTuMRFEnergyGaussianNew ${MARKOV_TESTS1}
@@ -76,7 +76,7 @@ ADD_TEST(maTuMRFEnergyGaussianNew ${MARKOV_TESTS1}
 
 ADD_TEST(maTvMRFEnergyGaussian ${MARKOV_TESTS1}
      otbMRFEnergyGaussian
-	)
+        )
 
 
 
@@ -86,8 +86,8 @@ ADD_TEST(maTuMRFOptimizerICMNew ${MARKOV_TESTS1}
 
 ADD_TEST(maTuMRFOptimizerICM ${MARKOV_TESTS1}
      otbMRFOptimizerICM
-	${TEMP}/maTuMRFOptimizerICM.txt
-	)
+        ${TEMP}/maTuMRFOptimizerICM.txt
+        )
 
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ otbMARKOV_TESTS2 ~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -102,8 +102,8 @@ ADD_TEST(maTvMRFOptimizerMetropolis ${MARKOV_TESTS2}
                   ${BASELINE_FILES}/maTvMRFOptimizerMetropolis.txt
                   ${TEMP}/maTvMRFOptimizerMetropolis.txt
      otbMRFOptimizerMetropolis
-	${TEMP}/maTvMRFOptimizerMetropolis.txt
-	)
+        ${TEMP}/maTvMRFOptimizerMetropolis.txt
+        )
 
 
 # -------            otbMRFSamplerMAP     ------------------------------
@@ -114,10 +114,10 @@ ADD_TEST(maTvMRFSamplerMAP ${MARKOV_TESTS2}
                   ${BASELINE_FILES}/maTvMRFSamplerMAP.txt
                   ${TEMP}/maTvMRFSamplerMAP.txt
      otbMRFSamplerMAP
-	${INPUTDATA}/poupees_sub_c1.png
-	${INPUTDATA}/poupees_sub_c2.png
-	${TEMP}/maTvMRFSamplerMAP.txt
-	)
+        ${INPUTDATA}/poupees_sub_c1.png
+        ${INPUTDATA}/poupees_sub_c2.png
+        ${TEMP}/maTvMRFSamplerMAP.txt
+        )
 
 
 # -------            otbMRFSamplerRandom    ------------------------------
@@ -129,10 +129,10 @@ ADD_TEST(maTvMRFSamplerRandom ${MARKOV_TESTS2}
                   ${BASELINE_FILES}/maTvMRFSamplerRandom.txt
                   ${TEMP}/maTvMRFSamplerRandom.txt
      otbMRFSamplerRandom
-	${INPUTDATA}/poupees_sub_c1.png
-	${INPUTDATA}/poupees_sub_c2.png
-	${TEMP}/maTvMRFSamplerRandom.txt
-	)
+        ${INPUTDATA}/poupees_sub_c1.png
+        ${INPUTDATA}/poupees_sub_c2.png
+        ${TEMP}/maTvMRFSamplerRandom.txt
+        )
 
 # -------            otbMRFSamplerRandomMAP    ------------------------------
  ADD_TEST(maTuMRFSamplerRandomMAPNew ${MARKOV_TESTS2}
@@ -143,10 +143,10 @@ ADD_TEST(maTvMRFSamplerRandomMAP ${MARKOV_TESTS2}
                   ${BASELINE_FILES}/maTvMRFSamplerRandomMAP.txt
                   ${TEMP}/maTvMRFSamplerRandomMAP.txt
      otbMRFSamplerRandomMAP
-	${INPUTDATA}/poupees_sub_c1.png
-	${INPUTDATA}/poupees_sub_c2.png
-	${TEMP}/maTvMRFSamplerRandomMAP.txt
-	)
+        ${INPUTDATA}/poupees_sub_c1.png
+        ${INPUTDATA}/poupees_sub_c2.png
+        ${TEMP}/maTvMRFSamplerRandomMAP.txt
+        )
 
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ otbMARKOV_TESTS3 ~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -159,8 +159,8 @@ ADD_TEST(maTvMRFEnergyFisherClassification ${MARKOV_TESTS3}
     --compare-ascii ${TOL} ${BASELINE_FILES}/maTvMRFEnergyFisherClassification.txt
                             ${TEMP}/maTvMRFEnergyFisherClassification.txt
     otbMRFEnergyFisherClassification
-	${TEMP}/maTvMRFEnergyFisherClassification.txt
-	)
+        ${TEMP}/maTvMRFEnergyFisherClassification.txt
+        )
 
 # A enrichir
 SET(Markov_SRCS1
diff --git a/Testing/Code/MultiScale/CMakeLists.txt b/Testing/Code/MultiScale/CMakeLists.txt
index 7125a9f05be7c2bfcfc37dcc6cc7ba571f18ae02..6c9c71886200f7ac142c54a5a8d11b6665d4782e 100644
--- a/Testing/Code/MultiScale/CMakeLists.txt
+++ b/Testing/Code/MultiScale/CMakeLists.txt
@@ -27,17 +27,17 @@ ADD_TEST(msTuMorphoPyrResamplerNew ${MULTISCALE_TESTS1}
 
 ADD_TEST(msTvMorphoPyrResampler ${MULTISCALE_TESTS1}
   --compare-n-images ${EPSILON8} 2
-		   ${BASELINE}/msPyrResampler_IKO_LesHalles_256_2.hdr
-		   ${TEMP}/msPyrResampler_IKO_LesHalles_256_2.hdr
-		   ${BASELINE}/msPyrResampler_IKO_LesHalles_full.hdr
-		   ${TEMP}/msPyrResampler_IKO_LesHalles_full.hdr
+                   ${BASELINE}/msPyrResampler_IKO_LesHalles_256_2.hdr
+                   ${TEMP}/msPyrResampler_IKO_LesHalles_256_2.hdr
+                   ${BASELINE}/msPyrResampler_IKO_LesHalles_full.hdr
+                   ${TEMP}/msPyrResampler_IKO_LesHalles_full.hdr
          otbMorphologicalPyramidResampler
-	 ${INPUTDATA}/ROI_IKO_PAN_LesHalles.tif
-	 ${TEMP}/msPyrResampler_IKO_LesHalles_256_2.hdr
-	 ${TEMP}/msPyrResampler_IKO_LesHalles_full.hdr
-	 256
-	 256
-	 )
+         ${INPUTDATA}/ROI_IKO_PAN_LesHalles.tif
+         ${TEMP}/msPyrResampler_IKO_LesHalles_256_2.hdr
+         ${TEMP}/msPyrResampler_IKO_LesHalles_full.hdr
+         256
+         256
+         )
 
 # -------            otb::MorphologicalPyramidAnalysisFilter   ----------
 
@@ -46,22 +46,22 @@ ADD_TEST(msTuMorphoPyrAnalysisFilterNew ${MULTISCALE_TESTS1}
 
 ADD_TEST(msTvMorphoPyrAnalysisFilter ${MULTISCALE_TESTS1}
   --compare-n-images ${NOTOL} 5
-		   ${BASELINE}/msPyrAn_mire_log_an_2.png
-		   ${TEMP}/msPyrAn_mire_log_an_2.png
-		   ${BASELINE}/msPyrAn_mire_log_sf_2.png
-		   ${TEMP}/msPyrAn_mire_log_sf_2.png
-		   ${BASELINE}/msPyrAn_mire_log_if_2.png
-		   ${TEMP}/msPyrAn_mire_log_if_2.png
-		   ${BASELINE}/msPyrAn_mire_log_sd_2.png
-		   ${TEMP}/msPyrAn_mire_log_sd_2.png
-		   ${BASELINE}/msPyrAn_mire_log_id_2.png
-		   ${TEMP}/msPyrAn_mire_log_id_2.png
+                   ${BASELINE}/msPyrAn_mire_log_an_2.png
+                   ${TEMP}/msPyrAn_mire_log_an_2.png
+                   ${BASELINE}/msPyrAn_mire_log_sf_2.png
+                   ${TEMP}/msPyrAn_mire_log_sf_2.png
+                   ${BASELINE}/msPyrAn_mire_log_if_2.png
+                   ${TEMP}/msPyrAn_mire_log_if_2.png
+                   ${BASELINE}/msPyrAn_mire_log_sd_2.png
+                   ${TEMP}/msPyrAn_mire_log_sd_2.png
+                   ${BASELINE}/msPyrAn_mire_log_id_2.png
+                   ${TEMP}/msPyrAn_mire_log_id_2.png
          otbMorphologicalPyramidAnalysisFilter
-	 ${INPUTDATA}/mire_log.png
-	 ${TEMP}/msPyrAn_mire_log
-	 png
-	 2
-	 2.0)
+         ${INPUTDATA}/mire_log.png
+         ${TEMP}/msPyrAn_mire_log
+         png
+         2
+         2.0)
 
 # -------            otb::MorphologicalPyramidSynthesisFilter   ----------
 
@@ -70,13 +70,13 @@ ADD_TEST(msTuMorphoPyrSynthesisFilterNew ${MULTISCALE_TESTS1}
 
 ADD_TEST(msTvMorphoPyrSynthesisFilter ${MULTISCALE_TESTS1}
    --compare-image ${NOTOL}
- 		   ${INPUTDATA}/ROI_IKO_PAN_LesHalles.tif
- 		   ${TEMP}/msPyrSynth_IKO_Halles_4_2.tif
+                    ${INPUTDATA}/ROI_IKO_PAN_LesHalles.tif
+                    ${TEMP}/msPyrSynth_IKO_Halles_4_2.tif
          otbMorphologicalPyramidSynthesisFilter
-	 ${INPUTDATA}/ROI_IKO_PAN_LesHalles.tif
-	 ${TEMP}/msPyrSynth_IKO_Halles_4_2.tif
-	 4
-	 2.0)
+         ${INPUTDATA}/ROI_IKO_PAN_LesHalles.tif
+         ${TEMP}/msPyrSynth_IKO_Halles_4_2.tif
+         4
+         2.0)
 
 # -------            otb::MorphologicalPyramidMRToMSConverter   ----------
 
@@ -85,20 +85,20 @@ ADD_TEST(msTuMorphoPyrMRToMSConverterNew ${MULTISCALE_TESTS1}
 
 ADD_TEST(msTvMorphoPyrMRToMSConverter ${MULTISCALE_TESTS1}
    --compare-n-images ${EPSILON8} 3
- 		   ${BASELINE}/msPyrMRToMS_IKO_Halles_4_2_sf_full.hdr
- 		   ${TEMP}/msPyrMRToMS_IKO_Halles_4_2_sf_full.hdr
-		   ${BASELINE}/msPyrMRToMS_IKO_Halles_4_2_if_full.hdr
- 		   ${TEMP}/msPyrMRToMS_IKO_Halles_4_2_if_full.hdr
-		   ${BASELINE}/msPyrMRToMS_IKO_Halles_4_2_an_full.hdr
- 		   ${TEMP}/msPyrMRToMS_IKO_Halles_4_2_an_full.hdr
+                    ${BASELINE}/msPyrMRToMS_IKO_Halles_4_2_sf_full.hdr
+                    ${TEMP}/msPyrMRToMS_IKO_Halles_4_2_sf_full.hdr
+                   ${BASELINE}/msPyrMRToMS_IKO_Halles_4_2_if_full.hdr
+                    ${TEMP}/msPyrMRToMS_IKO_Halles_4_2_if_full.hdr
+                   ${BASELINE}/msPyrMRToMS_IKO_Halles_4_2_an_full.hdr
+                    ${TEMP}/msPyrMRToMS_IKO_Halles_4_2_an_full.hdr
 
          otbMorphologicalPyramidMRToMSConverter
-	 ${INPUTDATA}/ROI_IKO_PAN_LesHalles.tif
-	 ${TEMP}/msPyrMRToMS_IKO_Halles_4_2_sf_full.hdr
-	 ${TEMP}/msPyrMRToMS_IKO_Halles_4_2_if_full.hdr
-	 ${TEMP}/msPyrMRToMS_IKO_Halles_4_2_an_full.hdr
-	 4
-	 2.0)
+         ${INPUTDATA}/ROI_IKO_PAN_LesHalles.tif
+         ${TEMP}/msPyrMRToMS_IKO_Halles_4_2_sf_full.hdr
+         ${TEMP}/msPyrMRToMS_IKO_Halles_4_2_if_full.hdr
+         ${TEMP}/msPyrMRToMS_IKO_Halles_4_2_an_full.hdr
+         4
+         2.0)
 
 # -------            otb::MorphologicalPyramidSegmenter   ----------
 
@@ -107,31 +107,31 @@ ADD_TEST(msTuMorphoPyrSegmenterNew ${MULTISCALE_TESTS1}
 
 ADD_TEST(msTvMorphoPyrSegmentBright ${MULTISCALE_TESTS1}
    --compare-image ${NOTOL}
- 		   ${BASELINE}/msPyrSegmenter_IKO_Halles_4_2_sf.tif
- 		   ${TEMP}/msPyrSegmenter_IKO_Halles_4_2_sf.tif
+                    ${BASELINE}/msPyrSegmenter_IKO_Halles_4_2_sf.tif
+                    ${TEMP}/msPyrSegmenter_IKO_Halles_4_2_sf.tif
          otbMorphologicalPyramidSegmenter
-	 ${TEMP}/msPyrMRToMS_IKO_Halles_4_2_sf_full.hdr
-	 ${INPUTDATA}/ROI_IKO_PAN_LesHalles.tif
-	 ${TEMP}/msPyrSegmenter_IKO_Halles_4_2_sf.tif
-	 0
-	 0.9
-	 0.9
-	 10
+         ${TEMP}/msPyrMRToMS_IKO_Halles_4_2_sf_full.hdr
+         ${INPUTDATA}/ROI_IKO_PAN_LesHalles.tif
+         ${TEMP}/msPyrSegmenter_IKO_Halles_4_2_sf.tif
+         0
+         0.9
+         0.9
+         10
 )
 SET_TESTS_PROPERTIES(msTvMorphoPyrSegmentBright PROPERTIES DEPENDS msTvMorphoPyrMRToMSConverter)
 
 ADD_TEST(msTvMorphoPyrSegmentDark ${MULTISCALE_TESTS1}
    --compare-image ${NOTOL}
- 		   ${BASELINE}/msPyrSegmenter_IKO_Halles_4_2_if.tif
- 		   ${TEMP}/msPyrSegmenter_IKO_Halles_4_2_if.tif
+                    ${BASELINE}/msPyrSegmenter_IKO_Halles_4_2_if.tif
+                    ${TEMP}/msPyrSegmenter_IKO_Halles_4_2_if.tif
          otbMorphologicalPyramidSegmenter
-	 ${TEMP}/msPyrMRToMS_IKO_Halles_4_2_if_full.hdr
-	 ${INPUTDATA}/ROI_IKO_PAN_LesHalles.tif
-	 ${TEMP}/msPyrSegmenter_IKO_Halles_4_2_if.tif
-	 1
-	 0.9
-	 0.9
-	 10
+         ${TEMP}/msPyrMRToMS_IKO_Halles_4_2_if_full.hdr
+         ${INPUTDATA}/ROI_IKO_PAN_LesHalles.tif
+         ${TEMP}/msPyrSegmenter_IKO_Halles_4_2_if.tif
+         1
+         0.9
+         0.9
+         10
 )
 SET_TESTS_PROPERTIES(msTvMorphoPyrSegmentDark PROPERTIES DEPENDS msTvMorphoPyrMRToMSConverter)
 
@@ -146,23 +146,23 @@ ADD_TEST(msTuMorphoPyrSegmentationFilterNew ${MULTISCALE_TESTS2}
 
 ADD_TEST(msTvMorphoPyrSegmentationFilter ${MULTISCALE_TESTS2}
    --compare-n-images ${NOTOL} 4
-		   ${BASELINE}/msPyrSegmentation_IKO_Halles_2.tif
- 		   ${TEMP}/msPyrSegmentation_IKO_Halles_2.tif
-		   ${BASELINE}/msPyrSegmentation_IKO_Halles_4.tif
- 		   ${TEMP}/msPyrSegmentation_IKO_Halles_4.tif
-		   ${BASELINE}/msPyrSegmentation_IKO_Halles_5.tif
- 		   ${TEMP}/msPyrSegmentation_IKO_Halles_5.tif
- 		   ${BASELINE}/msPyrSegmentation_IKO_Halles_7.tif
- 		   ${TEMP}/msPyrSegmentation_IKO_Halles_7.tif
+                   ${BASELINE}/msPyrSegmentation_IKO_Halles_2.tif
+                    ${TEMP}/msPyrSegmentation_IKO_Halles_2.tif
+                   ${BASELINE}/msPyrSegmentation_IKO_Halles_4.tif
+                    ${TEMP}/msPyrSegmentation_IKO_Halles_4.tif
+                   ${BASELINE}/msPyrSegmentation_IKO_Halles_5.tif
+                    ${TEMP}/msPyrSegmentation_IKO_Halles_5.tif
+                    ${BASELINE}/msPyrSegmentation_IKO_Halles_7.tif
+                    ${TEMP}/msPyrSegmentation_IKO_Halles_7.tif
          otbMorphologicalPyramidSegmentationFilter
-	 ${INPUTDATA}/ROI_IKO_PAN_LesHalles.tif
-	 ${TEMP}/msPyrSegmentation_IKO_Halles_
-	 tif
-	 4
-	 2.0
-	 0.9
-	 0.9
-	 10
+         ${INPUTDATA}/ROI_IKO_PAN_LesHalles.tif
+         ${TEMP}/msPyrSegmentation_IKO_Halles_
+         tif
+         4
+         2.0
+         0.9
+         0.9
+         10
 )
 
 # -------            otb::GeodesicMorphologyDecompositionImageFilter   ----------
@@ -172,18 +172,18 @@ ADD_TEST(msTuGeodesicMorphologyDecompositionImageFilterNew ${MULTISCALE_TESTS2}
 
 ADD_TEST(msTvGeodesicMorphologyDecompositionImageFilter ${MULTISCALE_TESTS2}
    --compare-n-images ${NOTOL} 3
-		   ${BASELINE}/msGeodesicMorphologyDecompositionImageFilterConvexOutput.tif
- 		   ${TEMP}/msGeodesicMorphologyDecompositionImageFilterConvexOutput.tif
-		   ${BASELINE}/msGeodesicMorphologyDecompositionImageFilterConcaveOutput.tif
- 		   ${TEMP}/msGeodesicMorphologyDecompositionImageFilterConcaveOutput.tif
-		   ${BASELINE}/msGeodesicMorphologyDecompositionImageFilterLevelingOutput.tif
- 		   ${TEMP}/msGeodesicMorphologyDecompositionImageFilterLevelingOutput.tif
+                   ${BASELINE}/msGeodesicMorphologyDecompositionImageFilterConvexOutput.tif
+                    ${TEMP}/msGeodesicMorphologyDecompositionImageFilterConvexOutput.tif
+                   ${BASELINE}/msGeodesicMorphologyDecompositionImageFilterConcaveOutput.tif
+                    ${TEMP}/msGeodesicMorphologyDecompositionImageFilterConcaveOutput.tif
+                   ${BASELINE}/msGeodesicMorphologyDecompositionImageFilterLevelingOutput.tif
+                    ${TEMP}/msGeodesicMorphologyDecompositionImageFilterLevelingOutput.tif
          otbGeodesicMorphologyDecompositionImageFilter
-	 ${INPUTDATA}/ROI_IKO_PAN_LesHalles.tif
-	 ${TEMP}/msGeodesicMorphologyDecompositionImageFilterConvexOutput.tif
-	 ${TEMP}/msGeodesicMorphologyDecompositionImageFilterConcaveOutput.tif
-	 ${TEMP}/msGeodesicMorphologyDecompositionImageFilterLevelingOutput.tif
-	 4
+         ${INPUTDATA}/ROI_IKO_PAN_LesHalles.tif
+         ${TEMP}/msGeodesicMorphologyDecompositionImageFilterConvexOutput.tif
+         ${TEMP}/msGeodesicMorphologyDecompositionImageFilterConcaveOutput.tif
+         ${TEMP}/msGeodesicMorphologyDecompositionImageFilterLevelingOutput.tif
+         4
 )
 
 # -------            otb::GeodesicMorphologyLevelingFilter   ----------
@@ -193,13 +193,13 @@ ADD_TEST(msTuGeodesicMorphologyLevelingFilterNew ${MULTISCALE_TESTS2}
 
 ADD_TEST(msTvGeodesicMorphologyLevelingFilter ${MULTISCALE_TESTS2}
    --compare-image ${NOTOL}
-		   ${BASELINE}/msGeodesicMorphologyLevelingFilterOutput.tif
- 		   ${TEMP}/msGeodesicMorphologyLevelingFilterOutput.tif
+                   ${BASELINE}/msGeodesicMorphologyLevelingFilterOutput.tif
+                    ${TEMP}/msGeodesicMorphologyLevelingFilterOutput.tif
          otbGeodesicMorphologyLevelingFilter
-	 ${INPUTDATA}/ROI_IKO_PAN_LesHalles.tif
-	 ${INPUTDATA}/ROI_IKO_PAN_LesHalles_convex.tif
-	 ${INPUTDATA}/ROI_IKO_PAN_LesHalles_concave.tif
-	 ${TEMP}/msGeodesicMorphologyLevelingFilterOutput.tif
+         ${INPUTDATA}/ROI_IKO_PAN_LesHalles.tif
+         ${INPUTDATA}/ROI_IKO_PAN_LesHalles_convex.tif
+         ${INPUTDATA}/ROI_IKO_PAN_LesHalles_concave.tif
+         ${TEMP}/msGeodesicMorphologyLevelingFilterOutput.tif
 )
 
 # -------            otb::GeodesicMorphologyLevelingFilter   ----------
@@ -209,13 +209,13 @@ ADD_TEST(msTuConvexOrConcaveClassificationFilterNew ${MULTISCALE_TESTS2}
 
 ADD_TEST(msTvConvexOrConcaveClassificationFilter ${MULTISCALE_TESTS2}
    --compare-image ${NOTOL}
-		   ${BASELINE}/msConvexOrConcaveClassificationFilterOutput.png
- 		   ${TEMP}/msConvexOrConcaveClassificationFilterOutput.png
+                   ${BASELINE}/msConvexOrConcaveClassificationFilterOutput.png
+                    ${TEMP}/msConvexOrConcaveClassificationFilterOutput.png
          otbConvexOrConcaveClassificationFilter
-	 ${INPUTDATA}/ROI_IKO_PAN_LesHalles.tif
-	 ${INPUTDATA}/ROI_IKO_PAN_LesHalles_leveling.tif
-	 ${TEMP}/msConvexOrConcaveClassificationFilterOutput.png
-	 0.5
+         ${INPUTDATA}/ROI_IKO_PAN_LesHalles.tif
+         ${INPUTDATA}/ROI_IKO_PAN_LesHalles_leveling.tif
+         ${TEMP}/msConvexOrConcaveClassificationFilterOutput.png
+         0.5
 )
 
 # -------            otb::MorphologicalOpeningProfileFilter   ----------
@@ -225,21 +225,21 @@ ADD_TEST(msTuMorphologicalOpeningProfileFilterNew ${MULTISCALE_TESTS2}
 
 ADD_TEST(msTvMorphologicalOpeningProfileFilter ${MULTISCALE_TESTS2}
    --compare-n-images ${NOTOL} 4
-		   ${BASELINE}/msMorphologicalOpeningProfileFilterOutput1.tif
- 		   ${TEMP}/msMorphologicalOpeningProfileFilterOutput1.tif
-		   ${BASELINE}/msMorphologicalOpeningProfileFilterOutput2.tif
- 		   ${TEMP}/msMorphologicalOpeningProfileFilterOutput2.tif
-		   ${BASELINE}/msMorphologicalOpeningProfileFilterOutput3.tif
- 		   ${TEMP}/msMorphologicalOpeningProfileFilterOutput3.tif
-		   ${BASELINE}/msMorphologicalOpeningProfileFilterOutput4.tif
- 		   ${TEMP}/msMorphologicalOpeningProfileFilterOutput4.tif
+                   ${BASELINE}/msMorphologicalOpeningProfileFilterOutput1.tif
+                    ${TEMP}/msMorphologicalOpeningProfileFilterOutput1.tif
+                   ${BASELINE}/msMorphologicalOpeningProfileFilterOutput2.tif
+                    ${TEMP}/msMorphologicalOpeningProfileFilterOutput2.tif
+                   ${BASELINE}/msMorphologicalOpeningProfileFilterOutput3.tif
+                    ${TEMP}/msMorphologicalOpeningProfileFilterOutput3.tif
+                   ${BASELINE}/msMorphologicalOpeningProfileFilterOutput4.tif
+                    ${TEMP}/msMorphologicalOpeningProfileFilterOutput4.tif
          otbMorphologicalOpeningProfileFilter
-	 ${INPUTDATA}/ROI_IKO_PAN_LesHalles.tif
-	 ${TEMP}/msMorphologicalOpeningProfileFilterOutput
-	 tif
-	 4
-	 1
-	 1
+         ${INPUTDATA}/ROI_IKO_PAN_LesHalles.tif
+         ${TEMP}/msMorphologicalOpeningProfileFilterOutput
+         tif
+         4
+         1
+         1
 )
 
 # -------            otb::MorphologicalClosingProfileFilter   ----------
@@ -249,21 +249,21 @@ ADD_TEST(msTuMorphologicalClosingProfileFilterNew ${MULTISCALE_TESTS2}
 
 ADD_TEST(msTvMorphologicalClosingProfileFilter ${MULTISCALE_TESTS2}
    --compare-n-images ${NOTOL} 4
-		   ${BASELINE}/msMorphologicalClosingProfileFilterOutput1.tif
- 		   ${TEMP}/msMorphologicalClosingProfileFilterOutput1.tif
-		   ${BASELINE}/msMorphologicalClosingProfileFilterOutput2.tif
- 		   ${TEMP}/msMorphologicalClosingProfileFilterOutput2.tif
-		   ${BASELINE}/msMorphologicalClosingProfileFilterOutput3.tif
- 		   ${TEMP}/msMorphologicalClosingProfileFilterOutput3.tif
-		   ${BASELINE}/msMorphologicalClosingProfileFilterOutput4.tif
- 		   ${TEMP}/msMorphologicalClosingProfileFilterOutput4.tif
+                   ${BASELINE}/msMorphologicalClosingProfileFilterOutput1.tif
+                    ${TEMP}/msMorphologicalClosingProfileFilterOutput1.tif
+                   ${BASELINE}/msMorphologicalClosingProfileFilterOutput2.tif
+                    ${TEMP}/msMorphologicalClosingProfileFilterOutput2.tif
+                   ${BASELINE}/msMorphologicalClosingProfileFilterOutput3.tif
+                    ${TEMP}/msMorphologicalClosingProfileFilterOutput3.tif
+                   ${BASELINE}/msMorphologicalClosingProfileFilterOutput4.tif
+                    ${TEMP}/msMorphologicalClosingProfileFilterOutput4.tif
          otbMorphologicalClosingProfileFilter
-	 ${INPUTDATA}/ROI_IKO_PAN_LesHalles.tif
-	 ${TEMP}/msMorphologicalClosingProfileFilterOutput
-	 tif
-	 4
-	 1
-	 1
+         ${INPUTDATA}/ROI_IKO_PAN_LesHalles.tif
+         ${TEMP}/msMorphologicalClosingProfileFilterOutput
+         tif
+         4
+         1
+         1
 )
 
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -277,21 +277,21 @@ ADD_TEST(msTuProfileToProfileDerivativeFilterNew ${MULTISCALE_TESTS3}
 
 ADD_TEST(msTvProfileToProfileDerivativeFilter ${MULTISCALE_TESTS3}
    --compare-n-images ${NOTOL} 4
-		   ${BASELINE}/msProfileToProfileDerivativeFilterOutput1.tif
- 		   ${TEMP}/msProfileToProfileDerivativeFilterOutput1.tif
-		   ${BASELINE}/msProfileToProfileDerivativeFilterOutput2.tif
- 		   ${TEMP}/msProfileToProfileDerivativeFilterOutput2.tif
-		   ${BASELINE}/msProfileToProfileDerivativeFilterOutput3.tif
- 		   ${TEMP}/msProfileToProfileDerivativeFilterOutput3.tif
-		   ${BASELINE}/msProfileToProfileDerivativeFilterOutput4.tif
- 		   ${TEMP}/msProfileToProfileDerivativeFilterOutput4.tif
+                   ${BASELINE}/msProfileToProfileDerivativeFilterOutput1.tif
+                    ${TEMP}/msProfileToProfileDerivativeFilterOutput1.tif
+                   ${BASELINE}/msProfileToProfileDerivativeFilterOutput2.tif
+                    ${TEMP}/msProfileToProfileDerivativeFilterOutput2.tif
+                   ${BASELINE}/msProfileToProfileDerivativeFilterOutput3.tif
+                    ${TEMP}/msProfileToProfileDerivativeFilterOutput3.tif
+                   ${BASELINE}/msProfileToProfileDerivativeFilterOutput4.tif
+                    ${TEMP}/msProfileToProfileDerivativeFilterOutput4.tif
          otbProfileToProfileDerivativeFilter
-	 ${INPUTDATA}/ROI_IKO_PAN_LesHalles.tif
-	 ${TEMP}/msProfileToProfileDerivativeFilterOutput
-	 tif
-	 5
-	 1
-	 1
+         ${INPUTDATA}/ROI_IKO_PAN_LesHalles.tif
+         ${TEMP}/msProfileToProfileDerivativeFilterOutput
+         tif
+         5
+         1
+         1
 )
 
 # -------            otb::ProfileDerivativeToMultiScaleCharacteristicsFilter   ----------
@@ -301,17 +301,17 @@ ADD_TEST(msTuProfileDerivativeToMultiScaleCharacteristicsFilterNew ${MULTISCALE_
 
 ADD_TEST(msTvProfileDerivativeToMultiScaleCharacteristicsFilter ${MULTISCALE_TESTS3}
    --compare-n-images ${NOTOL} 2
-		   ${BASELINE}/msProfileDerivativeToMultiScaleCharacteristicsFilterOutput.tif
- 		   ${TEMP}/msProfileDerivativeToMultiScaleCharacteristicsFilterOutput.tif
-		   ${BASELINE}/msProfileDerivativeToMultiScaleCharacteristicsFilterOutputCharacteristics.tif
- 		   ${TEMP}/msProfileDerivativeToMultiScaleCharacteristicsFilterOutputCharacteristics.tif
+                   ${BASELINE}/msProfileDerivativeToMultiScaleCharacteristicsFilterOutput.tif
+                    ${TEMP}/msProfileDerivativeToMultiScaleCharacteristicsFilterOutput.tif
+                   ${BASELINE}/msProfileDerivativeToMultiScaleCharacteristicsFilterOutputCharacteristics.tif
+                    ${TEMP}/msProfileDerivativeToMultiScaleCharacteristicsFilterOutputCharacteristics.tif
          otbProfileDerivativeToMultiScaleCharacteristicsFilter
-	 ${INPUTDATA}/ROI_IKO_PAN_LesHalles.tif
-	 ${TEMP}/msProfileDerivativeToMultiScaleCharacteristicsFilterOutput.tif
-	  ${TEMP}/msProfileDerivativeToMultiScaleCharacteristicsFilterOutputCharacteristics.tif
-	 5
-	 1
-	 1
+         ${INPUTDATA}/ROI_IKO_PAN_LesHalles.tif
+         ${TEMP}/msProfileDerivativeToMultiScaleCharacteristicsFilterOutput.tif
+          ${TEMP}/msProfileDerivativeToMultiScaleCharacteristicsFilterOutputCharacteristics.tif
+         5
+         1
+         1
 )
 # -------            otb::MultiScaleConvexOrConcaveClassificationFilter   ----------
 
@@ -320,15 +320,15 @@ ADD_TEST(msTuMultiScaleConvexOrConcaveClassificationFilterNew ${MULTISCALE_TESTS
 
 ADD_TEST(msTvMultiScaleConvexOrConcaveClassificationFilter ${MULTISCALE_TESTS3}
    --compare-image ${NOTOL}
-		   ${BASELINE}/msMultiScaleConvexOrConcaveClassificationFilterOutput.tif
- 		   ${TEMP}/msMultiScaleConvexOrConcaveClassificationFilterOutput.tif
+                   ${BASELINE}/msMultiScaleConvexOrConcaveClassificationFilterOutput.tif
+                    ${TEMP}/msMultiScaleConvexOrConcaveClassificationFilterOutput.tif
          otbMultiScaleConvexOrConcaveClassificationFilter
-	 ${INPUTDATA}/ROI_IKO_PAN_LesHalles.tif
-	 ${TEMP}/msMultiScaleConvexOrConcaveClassificationFilterOutput.tif
-	 5
-	 1
-	 1
-	 1.
+         ${INPUTDATA}/ROI_IKO_PAN_LesHalles.tif
+         ${TEMP}/msMultiScaleConvexOrConcaveClassificationFilterOutput.tif
+         5
+         1
+         1
+         1.
 )
 
 # -------            otb::GeodesicMorphologyIterativeDecompositionImageFilter   ----------
@@ -338,24 +338,24 @@ ADD_TEST(msTuGeodesicMorphologyIterativeDecompositionImageFilterNew ${MULTISCALE
 
 ADD_TEST(msTvGeodesicMorphologyIterativeDecompositionImageFilter ${MULTISCALE_TESTS3}
    --compare-n-images ${NOTOL} 6
-		   ${BASELINE}/msGeodesicMorphologyIterativeDecompositionImageFilter_concMap_1.tif
- 		   ${TEMP}/msGeodesicMorphologyIterativeDecompositionImageFilter_concMap_1.tif
-		   ${BASELINE}/msGeodesicMorphologyIterativeDecompositionImageFilter_concMap_2.tif
- 		   ${TEMP}/msGeodesicMorphologyIterativeDecompositionImageFilter_concMap_2.tif
-		   ${BASELINE}/msGeodesicMorphologyIterativeDecompositionImageFilter_convMap_1.tif
- 		   ${TEMP}/msGeodesicMorphologyIterativeDecompositionImageFilter_convMap_1.tif
-		   ${BASELINE}/msGeodesicMorphologyIterativeDecompositionImageFilter_convMap_2.tif
- 		   ${TEMP}/msGeodesicMorphologyIterativeDecompositionImageFilter_convMap_2.tif
-		   ${BASELINE}/msGeodesicMorphologyIterativeDecompositionImageFilter_leveling_1.tif
- 		   ${TEMP}/msGeodesicMorphologyIterativeDecompositionImageFilter_leveling_1.tif
-		   ${BASELINE}/msGeodesicMorphologyIterativeDecompositionImageFilter_leveling_2.tif
- 		   ${TEMP}/msGeodesicMorphologyIterativeDecompositionImageFilter_leveling_2.tif
+                   ${BASELINE}/msGeodesicMorphologyIterativeDecompositionImageFilter_concMap_1.tif
+                    ${TEMP}/msGeodesicMorphologyIterativeDecompositionImageFilter_concMap_1.tif
+                   ${BASELINE}/msGeodesicMorphologyIterativeDecompositionImageFilter_concMap_2.tif
+                    ${TEMP}/msGeodesicMorphologyIterativeDecompositionImageFilter_concMap_2.tif
+                   ${BASELINE}/msGeodesicMorphologyIterativeDecompositionImageFilter_convMap_1.tif
+                    ${TEMP}/msGeodesicMorphologyIterativeDecompositionImageFilter_convMap_1.tif
+                   ${BASELINE}/msGeodesicMorphologyIterativeDecompositionImageFilter_convMap_2.tif
+                    ${TEMP}/msGeodesicMorphologyIterativeDecompositionImageFilter_convMap_2.tif
+                   ${BASELINE}/msGeodesicMorphologyIterativeDecompositionImageFilter_leveling_1.tif
+                    ${TEMP}/msGeodesicMorphologyIterativeDecompositionImageFilter_leveling_1.tif
+                   ${BASELINE}/msGeodesicMorphologyIterativeDecompositionImageFilter_leveling_2.tif
+                    ${TEMP}/msGeodesicMorphologyIterativeDecompositionImageFilter_leveling_2.tif
          otbGeodesicMorphologyIterativeDecompositionImageFilter
-	 ${INPUTDATA}/ROI_IKO_PAN_LesHalles.tif
-	 ${TEMP}/msGeodesicMorphologyIterativeDecompositionImageFilter
-	 tif
-	 2
-	 3
+         ${INPUTDATA}/ROI_IKO_PAN_LesHalles.tif
+         ${TEMP}/msGeodesicMorphologyIterativeDecompositionImageFilter
+         tif
+         2
+         3
          2
 )
 
@@ -381,7 +381,7 @@ ADD_TEST(msTvWaveletFilterBank ${MULTISCALE_TESTS4}
               ${TEMP}/ROI_IKO_PAN_LesHalles_FilterBank.tif
          otbWaveletFilterBank
           ${INPUTDATA}/ROI_IKO_PAN_LesHalles.tif
-		  2
+                  2
           ${TEMP}/ROI_IKO_PAN_LesHalles_FilterBank.tif
 )
 
@@ -391,7 +391,7 @@ ADD_TEST(msTvWaveletMultiScaleFilterBank ${MULTISCALE_TESTS4}
               ${TEMP}/ROI_IKO_PAN_LesHalles_FilterBankMultiScale.tif
          otbWaveletFilterBank
           ${INPUTDATA}/ROI_IKO_PAN_LesHalles.tif
-		  1
+                  1
           ${TEMP}/ROI_IKO_PAN_LesHalles_FilterBankMultiScale.tif
 )
 
@@ -404,7 +404,7 @@ ADD_TEST(msTuWaveletInverseTransformNew ${MULTISCALE_TESTS4}
 
 ADD_TEST(msTvWaveletTransformHaar ${MULTISCALE_TESTS4}
         --compare-image ${EPSILON6}
-			  ${INPUTDATA}/ROI_IKO_PAN_LesHalles.tif
+                          ${INPUTDATA}/ROI_IKO_PAN_LesHalles.tif
               ${TEMP}/ROI_IKO_PAN_LesHalles_WvltHaar.tif
          otbWaveletTransform
           ${INPUTDATA}/ROI_IKO_PAN_LesHalles.tif
@@ -417,7 +417,7 @@ ADD_TEST(msTvWaveletTransformHaar ${MULTISCALE_TESTS4}
 
 ADD_TEST(msTvWaveletMultiScaleTransformHaar ${MULTISCALE_TESTS4}
         --compare-image ${EPSILON6}
-			  ${INPUTDATA}/ROI_IKO_PAN_LesHalles.tif
+                          ${INPUTDATA}/ROI_IKO_PAN_LesHalles.tif
               ${TEMP}/ROI_IKO_PAN_LesHalles_WvltMultiScaleHaar.tif
          otbWaveletTransform
           ${INPUTDATA}/ROI_IKO_PAN_LesHalles.tif
@@ -431,7 +431,7 @@ ADD_TEST(msTvWaveletMultiScaleTransformHaar ${MULTISCALE_TESTS4}
 
 ADD_TEST(msTvWaveletMultiScaleTransformHaar_1 ${MULTISCALE_TESTS4}
         --compare-image ${EPSILON6}
-			  ${INPUTDATA}/ROI_IKO_PAN_LesHalles.tif
+                          ${INPUTDATA}/ROI_IKO_PAN_LesHalles.tif
               ${TEMP}/ROI_IKO_PAN_LesHalles_WvltMultiScaleHaar_1.tif
          otbWaveletTransform
           ${INPUTDATA}/ROI_IKO_PAN_LesHalles.tif
@@ -445,7 +445,7 @@ ADD_TEST(msTvWaveletMultiScaleTransformHaar_1 ${MULTISCALE_TESTS4}
 
 ADD_TEST(msTvWaveletMultiScaleTransformHaar_4 ${MULTISCALE_TESTS4}
         --compare-image ${EPSILON6}
-			  ${INPUTDATA}/ROI_IKO_PAN_LesHalles.tif
+                          ${INPUTDATA}/ROI_IKO_PAN_LesHalles.tif
               ${TEMP}/ROI_IKO_PAN_LesHalles_WvltMultiScaleHaar_4.tif
          otbWaveletTransform
           ${INPUTDATA}/ROI_IKO_PAN_LesHalles.tif
@@ -459,7 +459,7 @@ ADD_TEST(msTvWaveletMultiScaleTransformHaar_4 ${MULTISCALE_TESTS4}
 
 ADD_TEST(msTvWaveletMultiScaleTransformHaar_8 ${MULTISCALE_TESTS4}
         --compare-image ${EPSILON6}
-			  ${INPUTDATA}/ROI_IKO_PAN_LesHalles.tif
+                          ${INPUTDATA}/ROI_IKO_PAN_LesHalles.tif
               ${TEMP}/ROI_IKO_PAN_LesHalles_WvltMultiScaleHaar_8.tif
          otbWaveletTransform
           ${INPUTDATA}/ROI_IKO_PAN_LesHalles.tif
@@ -919,16 +919,16 @@ ADD_TEST(msTvWaveletPacketMultiScaleTransformSYMLET8 ${MULTISCALE_TESTS4}
 
 # ----- otbSubsampleImageFilter --------------------------------------
 ADD_TEST(msTuSubsampleImageFilterNew ${MULTISCALE_TESTS4}
-	otbSubsampleImageFilterNew)
+        otbSubsampleImageFilterNew)
 
 ADD_TEST(msTvSubsampleImageFilter ${MULTISCALE_TESTS4}
-	--compare-image ${NOTOL}
-		${TEMP}/msSubsampleImageFilterOversampled.tif
-		${TEMP}/msSubsampleImageFilterOnePixelOutOf2.tif
-	otbSubsampleImageFilter
-		${INPUTDATA}/ROI_IKO_PAN_LesHalles.tif
-		${TEMP}/msSubsampleImageFilterOversampled.tif
-		${TEMP}/msSubsampleImageFilterOnePixelOutOf2.tif
+        --compare-image ${NOTOL}
+                ${TEMP}/msSubsampleImageFilterOversampled.tif
+                ${TEMP}/msSubsampleImageFilterOnePixelOutOf2.tif
+        otbSubsampleImageFilter
+                ${INPUTDATA}/ROI_IKO_PAN_LesHalles.tif
+                ${TEMP}/msSubsampleImageFilterOversampled.tif
+                ${TEMP}/msSubsampleImageFilterOnePixelOutOf2.tif
 )
 
 # -------       Fichiers sources CXX -----------------------------------
diff --git a/Testing/Code/MultiTemporal/CMakeLists.txt b/Testing/Code/MultiTemporal/CMakeLists.txt
index 49298673a39df74157c8ffeaee4de79e8964b84e..16dba843d21217c083684013247e9e0c4817306a 100644
--- a/Testing/Code/MultiTemporal/CMakeLists.txt
+++ b/Testing/Code/MultiTemporal/CMakeLists.txt
@@ -21,42 +21,42 @@ SET(MULTITEMPORAL_TESTS1 ${CXX_TEST_PATH}/otbMultiTemporalTests1)
 
 ADD_TEST(mtTvPolynomialTimeSeriesTest1 ${MULTITEMPORAL_TESTS1}
         otbPolynomialTimeSeriesTest
-	 )
+         )
 
 ADD_TEST(mtTuTimeSeriesLeastSquaresFittingFunctor ${MULTITEMPORAL_TESTS1}
         otbTimeSeriesLeastSquareFittingFunctorNew
-	 )
+         )
 
 ADD_TEST(mtTvTimeSeriesLeastSquaresFittingFunctor ${MULTITEMPORAL_TESTS1}
         otbTimeSeriesLeastSquareFittingFunctorTest
         1 2 3
-	 )
+         )
 
 ADD_TEST(mtTvTimeSeriesLeastSquaresFittingFunctor2 ${MULTITEMPORAL_TESTS1}
         otbTimeSeriesLeastSquareFittingFunctorTest
         10 0.3 3.123
-	 )
+         )
 
 ADD_TEST(mtTvTimeSeriesLeastSquaresFittingFunctorWeights ${MULTITEMPORAL_TESTS1}
         otbTimeSeriesLeastSquareFittingFunctorWeightsTest
         1 2 3
-	 )
+         )
 
 
 ADD_TEST(mtTuSavitzkyGolayInterpolationFunctor ${MULTITEMPORAL_TESTS1}
         otbSavitzkyGolayInterpolationFunctorNew
-	 )
+         )
 
 ADD_TEST(mtTvSavitzkyGolayInterpolationFunctorTest ${MULTITEMPORAL_TESTS1}
         otbSavitzkyGolayInterpolationFunctorTest
-	 )
+         )
 
 ADD_TEST(mtTvEnvelopeSavitzkyGolayInterpolationFunctorTest ${MULTITEMPORAL_TESTS1}
         otbEnvelopeSavitzkyGolayInterpolationFunctorTest
-	 )
+         )
 
 # -------  CXX Source Files -----------------------------------
-SET(BasicMultiTemporal_SRCS1 
+SET(BasicMultiTemporal_SRCS1
 otbPolynomialTimeSeriesTest.cxx
 otbTimeSeriesLeastSquareFittingFunctorNew.cxx
 otbTimeSeriesLeastSquareFittingFunctorTest.cxx
diff --git a/Testing/Code/OBIA/CMakeLists.txt b/Testing/Code/OBIA/CMakeLists.txt
index 4be4c25420c71d26613b2e8435ac177c12a92ec2..df31eccc33e26ed55589d926e8e893da53301660 100644
--- a/Testing/Code/OBIA/CMakeLists.txt
+++ b/Testing/Code/OBIA/CMakeLists.txt
@@ -25,19 +25,19 @@ SET(OBIA_TESTS2 ${CXX_TEST_PATH}/otbOBIATests2)
 SET(OBIA_TESTS3 ${CXX_TEST_PATH}/otbOBIATests3)
 
 # OBIATests1
-ADD_TEST(obTuAttributesMapLabelObjectNew ${OBIA_TESTS1} 
-	otbAttributesMapLabelObjectNew)
+ADD_TEST(obTuAttributesMapLabelObjectNew ${OBIA_TESTS1}
+        otbAttributesMapLabelObjectNew)
 
-ADD_TEST(obTuAttributesMapLabelObjectWithClassLabelNew ${OBIA_TESTS1} 
-	otbAttributesMapLabelObjectWithClassLabelNew)
+ADD_TEST(obTuAttributesMapLabelObjectWithClassLabelNew ${OBIA_TESTS1}
+        otbAttributesMapLabelObjectWithClassLabelNew)
 
-ADD_TEST(obTuAttributesMapOpeningLabelMapFilterNew ${OBIA_TESTS1} 
+ADD_TEST(obTuAttributesMapOpeningLabelMapFilterNew ${OBIA_TESTS1}
     otbAttributesMapOpeningLabelMapFilterNew)
 
-ADD_TEST(obTuImageToLabelMapWithAttributesFilterNew ${OBIA_TESTS1} 
+ADD_TEST(obTuImageToLabelMapWithAttributesFilterNew ${OBIA_TESTS1}
     otbImageToLabelMapWithAttributesFilterNew)
 
-ADD_TEST(obTvImageToLabelMapWithAttributesFilter ${OBIA_TESTS1} 
+ADD_TEST(obTvImageToLabelMapWithAttributesFilter ${OBIA_TESTS1}
     otbImageToLabelMapWithAttributesFilter
     ${INPUTDATA}/maur.tif
     ${INPUTDATA}/maur_labelled.tif)
@@ -135,10 +135,10 @@ ADD_TEST(obTvBandsStatisticsAttributesLabelMapFilter ${OBIA_TESTS1}
     ${TEMP}/obTvBandsStatisticsAttributesLabelMapFilter.txt)
     
 ADD_TEST(obTuShapeAttributesLabelMapFilterNew ${OBIA_TESTS1}
-	otbShapeAttributesLabelMapFilterNew)
+        otbShapeAttributesLabelMapFilterNew)
 
 ADD_TEST(obTuStatisticsAttributesLabelMapFilterNew ${OBIA_TESTS1}
-	otbStatisticsAttributesLabelMapFilterNew)
+        otbStatisticsAttributesLabelMapFilterNew)
 
 ADD_TEST(obTuVectorDataToLabelMapFilterNew ${OBIA_TESTS1}
     otbVectorDataToLabelMapFilterNew)
@@ -148,7 +148,7 @@ ADD_TEST(obTvVectorDataToLabelMapFilter ${OBIA_TESTS1}
     ${INPUTDATA}/vectorIOexample_gis_to_vec.shp
     ${TEMP}/vectordataToLabelMap.png)
 
-ADD_TEST(obTuStreamingConnectedComponentSegmentationOBIAToVectorDataFilterNew ${OBIA_TESTS1} 
+ADD_TEST(obTuStreamingConnectedComponentSegmentationOBIAToVectorDataFilterNew ${OBIA_TESTS1}
     otbStreamingConnectedComponentSegmentationOBIAToVectorDataFilterNew)
 
 ADD_TEST(obTvStreamingConnectedComponentSegmentationOBIAToVectorDataFilter ${OBIA_TESTS1}
diff --git a/Testing/Code/Projections/CMakeLists.txt b/Testing/Code/Projections/CMakeLists.txt
index 8a7f9f843cd86c23b92ba12cb16286d0881ff096..beccf18b53aec447f57d9ed37993ad640c0ed62e 100644
--- a/Testing/Code/Projections/CMakeLists.txt
+++ b/Testing/Code/Projections/CMakeLists.txt
@@ -10,7 +10,7 @@ ENDIF(OTB_DATA_USE_LARGEINPUT)
 SET(TEMP ${OTBTesting_BINARY_DIR}/Temporary)
 
 
-#Tolerance between pixel values 
+#Tolerance between pixel values
 SET(NOTOL 0.0)
 SET(EPSILON_4 0.0001)
 SET(EPSILON_6 0.000001)
@@ -89,26 +89,26 @@ ADD_TEST(prTvRegionProjectionResamplerToulouse ${PROJECTIONS_TESTS1}
         otbRegionProjectionResampler
         ${LARGEINPUT}/QUICKBIRD/TOULOUSE/000000128955_01_P001_PAN/02APR01105228-P1BS-000000128955_01_P001.TIF
         ${TEMP}/prTvRegionProjectionResamplerToulouse.tif
-				1.44 43.6050 # Long/Lat of Toulouse, Capitole
+                                1.44 43.6050 # Long/Lat of Toulouse, Capitole
         500
         500
         100
-				0.00001
-				-0.00001
+                                0.00001
+                                -0.00001
         )
 
 ADD_TEST(prTvRegionProjectionResamplerCevennes ${PROJECTIONS_TESTS1}
   --compare-image ${EPSILON_4}  ${BASELINE}/prTvRegionProjectionResamplerCevennes.tif
                           ${TEMP}/prTvRegionProjectionResamplerCevennes.tif
-				otbRegionProjectionResampler
+                                otbRegionProjectionResampler
         ${LARGEINPUT}/QUICKBIRD/CEVENNES/06FEB12104912-P1BS-005533998070_01_P001.TIF
         ${TEMP}/prTvRegionProjectionResamplerCevennes.tif
         3.7 44.08
         500
-				500
-				10
-				0.00001
-				-0.00001
+                                500
+                                10
+                                0.00001
+                                -0.00001
         )
 
 ADD_TEST(prTvSensorModelSPOT5 ${PROJECTIONS_TESTS1}
@@ -255,36 +255,36 @@ SET(SARSENSORMODEL_TYPES
 )
 
 FOREACH( file ${SARSENSORMODEL_TYPES})
-  # Get the sensor name 
+  # Get the sensor name
   SET(sharp_regexp "([0-9A-Za-z_]*)[ ]*/[ ]*(.*)")
   STRING(REGEX REPLACE "${sharp_regexp}" "\\1" sensor_name "${file}")
   # Tests
-	ADD_TEST(prTvSensorModelGrid_${sensor_name} ${PROJECTIONS_TESTS1}
-	  --compare-n-images ${EPSILON_6} 2
-	         ${BASELINE}/prTvSensorModelGridDeltaX_${sensor_name}.tif
-	         ${TEMP}/prTvSensorModelGridDeltaX_${sensor_name}.tif
-	         ${BASELINE}/prTvSensorModelGridDeltaY_${sensor_name}.tif
-	         ${TEMP}/prTvSensorModelGridDeltaY_${sensor_name}.tif
-    	otbSensorModelGrid
-    		${LARGEINPUT}/${file}
-         	${TEMP}/prTvSensorModelGridDeltaX_${sensor_name}.tif
-         	${TEMP}/prTvSensorModelGridDeltaY_${sensor_name}.tif
-         	10 10
-		)
-
-	ADD_TEST(prTvForwardSensorModelGrid_${sensor_name} ${PROJECTIONS_TESTS1}
-	  --compare-n-images ${EPSILON_6} 2
-	         ${BASELINE}/prTvForwardSensorModelGridX_${sensor_name}.tif
-	         ${TEMP}/prTvForwardSensorModelGridX_${sensor_name}.tif
-	         ${BASELINE}/prTvForwardSensorModelGridY_${sensor_name}.tif
-	         ${TEMP}/prTvForwardSensorModelGridY_${sensor_name}.tif
-    	otbForwardSensorModelGrid
-    		${LARGEINPUT}/${file}
-         	${TEMP}/prTvForwardSensorModelGridX_${sensor_name}.tif
-         	${TEMP}/prTvForwardSensorModelGridY_${sensor_name}.tif
-         	10 10
-		)
-		
+        ADD_TEST(prTvSensorModelGrid_${sensor_name} ${PROJECTIONS_TESTS1}
+          --compare-n-images ${EPSILON_6} 2
+                 ${BASELINE}/prTvSensorModelGridDeltaX_${sensor_name}.tif
+                 ${TEMP}/prTvSensorModelGridDeltaX_${sensor_name}.tif
+                 ${BASELINE}/prTvSensorModelGridDeltaY_${sensor_name}.tif
+                 ${TEMP}/prTvSensorModelGridDeltaY_${sensor_name}.tif
+            otbSensorModelGrid
+                    ${LARGEINPUT}/${file}
+                 ${TEMP}/prTvSensorModelGridDeltaX_${sensor_name}.tif
+                 ${TEMP}/prTvSensorModelGridDeltaY_${sensor_name}.tif
+                 10 10
+                )
+
+        ADD_TEST(prTvForwardSensorModelGrid_${sensor_name} ${PROJECTIONS_TESTS1}
+          --compare-n-images ${EPSILON_6} 2
+                 ${BASELINE}/prTvForwardSensorModelGridX_${sensor_name}.tif
+                 ${TEMP}/prTvForwardSensorModelGridX_${sensor_name}.tif
+                 ${BASELINE}/prTvForwardSensorModelGridY_${sensor_name}.tif
+                 ${TEMP}/prTvForwardSensorModelGridY_${sensor_name}.tif
+            otbForwardSensorModelGrid
+                    ${LARGEINPUT}/${file}
+                 ${TEMP}/prTvForwardSensorModelGridX_${sensor_name}.tif
+                 ${TEMP}/prTvForwardSensorModelGridY_${sensor_name}.tif
+                 10 10
+                )
+                
 ENDFOREACH( file ${SARSENSORMODEL_TYPES})
 
 
@@ -326,7 +326,7 @@ ADD_TEST(prTvOrthoRectificationToulouseXS ${PROJECTIONS_TESTS2}
         otbOrthoRectificationFilter
         ${LARGEINPUT}/QUICKBIRD/TOULOUSE/000000128955_01_P001_MUL/02APR01105228-M1BS-000000128955_01_P001.TIF
         ${TEMP}/prTvOrthoRectificationToulouseXS_UTM.tif
-	367319 4835740 300 300 2.5608 -2.8452 31 N 4
+        367319 4835740 300 300 2.5608 -2.8452 31 N 4
         )
 
 ADD_TEST(prTvOrthoRectificationCevennes ${PROJECTIONS_TESTS2}
@@ -350,7 +350,7 @@ ADD_TEST(prTvOrthoRectificationToulouseWithDEM ${PROJECTIONS_TESTS2}
   --compare-image ${EPSILON_4}  ${BASELINE}/prTvOrthoRectificationToulouseWithDEM_UTM.tif
                           ${TEMP}/prTvOrthoRectificationToulouseWithDEM_UTM.tif
         otbOrthoRectificationFilterWithDEM
-	${LARGEINPUT}/QUICKBIRD/TOULOUSE/000000128955_01_P001_PAN/02APR01105228-P1BS-000000128955_01_P001.TIF
+        ${LARGEINPUT}/QUICKBIRD/TOULOUSE/000000128955_01_P001_PAN/02APR01105228-P1BS-000000128955_01_P001.TIF
         ${TEMP}/prTvOrthoRectificationToulouseWithDEM_UTM.tif
         374100.8
         4829184.8
@@ -445,99 +445,99 @@ ADD_TEST(prTvOrthoRectificationCoastalZoneWithSRTMNoData ${PROJECTIONS_TESTS2}
 IF(OTB_DATA_USE_LARGEINPUT)
 
 ADD_TEST(prTvOrthoRectificationUTM_RADARDSAT1 ${PROJECTIONS_TESTS2}
-  	--compare-image ${EPSILON_4}  ${BASELINE}/prTvOrthoRectificationUTM_RADARDSAT1.tif
+          --compare-image ${EPSILON_4}  ${BASELINE}/prTvOrthoRectificationUTM_RADARDSAT1.tif
                           ${TEMP}/prTvOrthoRectificationUTM_RADARDSAT1.tif
         otbOrthoRectificationFilter
-    		${LARGEINPUT}/RADARSAT1/GOMA/SCENE01/
-        	${TEMP}/prTvOrthoRectificationUTM_RADARDSAT1.tif
-	        755929.75 9821313.25
-        	200	200 10 -10 35 S 4 
+                    ${LARGEINPUT}/RADARSAT1/GOMA/SCENE01/
+                ${TEMP}/prTvOrthoRectificationUTM_RADARDSAT1.tif
+                755929.75 9821313.25
+                200        200 10 -10 35 S 4
         )
 
 ADD_TEST(prTvOrthoRectificationUTM_RADARSAT2_XML ${PROJECTIONS_TESTS2}
-  	--compare-image ${EPSILON_4}  ${BASELINE}/prTvOrthoRectificationUTM_RADARSAT2.tif
+          --compare-image ${EPSILON_4}  ${BASELINE}/prTvOrthoRectificationUTM_RADARSAT2.tif
                           ${TEMP}/prTvOrthoRectificationUTM_RADARSAT2.tif
         otbOrthoRectificationFilter
-    		${LARGEINPUT}/RADARSAT2/ALTONA/Fine_Quad-Pol_Dataset/PK6621_DK406_FQ9_20080405_124900_HH_VV_HV_VH_SLC_Altona/product.xml
-        	${TEMP}/prTvOrthoRectificationUTM_RADARSAT2.tif
-	        611000.953075 5439991.842531
-        	200	200 10 -10 14 N 4 
+                    ${LARGEINPUT}/RADARSAT2/ALTONA/Fine_Quad-Pol_Dataset/PK6621_DK406_FQ9_20080405_124900_HH_VV_HV_VH_SLC_Altona/product.xml
+                ${TEMP}/prTvOrthoRectificationUTM_RADARSAT2.tif
+                611000.953075 5439991.842531
+                200        200 10 -10 14 N 4
         )
 ADD_TEST(prTvOrthoRectificationUTM_RADARSAT2_HH ${PROJECTIONS_TESTS2}
-  	--compare-image ${EPSILON_4}  ${BASELINE}/prTvOrthoRectificationUTM_RADARSAT2_XML.tif
+          --compare-image ${EPSILON_4}  ${BASELINE}/prTvOrthoRectificationUTM_RADARSAT2_XML.tif
                           ${TEMP}/prTvOrthoRectificationUTM_RADARSAT2_XML.tif
         otbOrthoRectificationFilter
-    		${LARGEINPUT}/RADARSAT2/ALTONA/Fine_Quad-Pol_Dataset/PK6621_DK406_FQ9_20080405_124900_HH_VV_HV_VH_SLC_Altona/imagery_HH.tif
-        	${TEMP}/prTvOrthoRectificationUTM_RADARSAT2_XML.tif
-	        611000.953075 5439991.842531
-        	200	200 10 -10 14 N 4 
+                    ${LARGEINPUT}/RADARSAT2/ALTONA/Fine_Quad-Pol_Dataset/PK6621_DK406_FQ9_20080405_124900_HH_VV_HV_VH_SLC_Altona/imagery_HH.tif
+                ${TEMP}/prTvOrthoRectificationUTM_RADARSAT2_XML.tif
+                611000.953075 5439991.842531
+                200        200 10 -10 14 N 4
         )
 ADD_TEST(prTvOrthoRectificationUTM_RADARSAT2_HV ${PROJECTIONS_TESTS2}
-  	--compare-image ${EPSILON_4}  ${BASELINE}/prTvOrthoRectificationUTM_RADARSAT2_HV.tif
+          --compare-image ${EPSILON_4}  ${BASELINE}/prTvOrthoRectificationUTM_RADARSAT2_HV.tif
                           ${TEMP}/prTvOrthoRectificationUTM_RADARSAT2_HV.tif
         otbOrthoRectificationFilter
-    		${LARGEINPUT}/RADARSAT2/ALTONA/Fine_Quad-Pol_Dataset/PK6621_DK406_FQ9_20080405_124900_HH_VV_HV_VH_SLC_Altona/imagery_HV.tif
-        	${TEMP}/prTvOrthoRectificationUTM_RADARSAT2_HV.tif
-	        611000.953075 5439991.842531
-        	200	200 10 -10 14 N 4 
+                    ${LARGEINPUT}/RADARSAT2/ALTONA/Fine_Quad-Pol_Dataset/PK6621_DK406_FQ9_20080405_124900_HH_VV_HV_VH_SLC_Altona/imagery_HV.tif
+                ${TEMP}/prTvOrthoRectificationUTM_RADARSAT2_HV.tif
+                611000.953075 5439991.842531
+                200        200 10 -10 14 N 4
         )
 ADD_TEST(prTvOrthoRectificationUTM_RADARSAT2_VH ${PROJECTIONS_TESTS2}
-  	--compare-image ${EPSILON_4}  ${BASELINE}/prTvOrthoRectificationUTM_RADARSAT2_VH.tif
+          --compare-image ${EPSILON_4}  ${BASELINE}/prTvOrthoRectificationUTM_RADARSAT2_VH.tif
                           ${TEMP}/prTvOrthoRectificationUTM_RADARSAT2_VH.tif
         otbOrthoRectificationFilter
-    		${LARGEINPUT}/RADARSAT2/ALTONA/Fine_Quad-Pol_Dataset/PK6621_DK406_FQ9_20080405_124900_HH_VV_HV_VH_SLC_Altona/imagery_VH.tif
-        	${TEMP}/prTvOrthoRectificationUTM_RADARSAT2_VH.tif
-	        611000.953075 5439991.842531
-        	200	200 10 -10 14 N 4 
+                    ${LARGEINPUT}/RADARSAT2/ALTONA/Fine_Quad-Pol_Dataset/PK6621_DK406_FQ9_20080405_124900_HH_VV_HV_VH_SLC_Altona/imagery_VH.tif
+                ${TEMP}/prTvOrthoRectificationUTM_RADARSAT2_VH.tif
+                611000.953075 5439991.842531
+                200        200 10 -10 14 N 4
         )
 ADD_TEST(prTvOrthoRectificationUTM_RADARSAT2_VV ${PROJECTIONS_TESTS2}
-  	--compare-image ${EPSILON_4}  ${BASELINE}/prTvOrthoRectificationUTM_RADARSAT2_VV.tif
+          --compare-image ${EPSILON_4}  ${BASELINE}/prTvOrthoRectificationUTM_RADARSAT2_VV.tif
                           ${TEMP}/prTvOrthoRectificationUTM_RADARSAT2_VV.tif
         otbOrthoRectificationFilter
-    		${LARGEINPUT}/RADARSAT2/ALTONA/Fine_Quad-Pol_Dataset/PK6621_DK406_FQ9_20080405_124900_HH_VV_HV_VH_SLC_Altona/imagery_VV.tif
-        	${TEMP}/prTvOrthoRectificationUTM_RADARSAT2_VV.tif
-	        611000.953075 5439991.842531
-        	200	200 10 -10 14 N 4 
+                    ${LARGEINPUT}/RADARSAT2/ALTONA/Fine_Quad-Pol_Dataset/PK6621_DK406_FQ9_20080405_124900_HH_VV_HV_VH_SLC_Altona/imagery_VV.tif
+                ${TEMP}/prTvOrthoRectificationUTM_RADARSAT2_VV.tif
+                611000.953075 5439991.842531
+                200        200 10 -10 14 N 4
         )
 
 ADD_TEST(prTvOrthoRectificationUTM_ENVISAT ${PROJECTIONS_TESTS2}
-  	--compare-image ${EPSILON_4}  ${BASELINE}/prTvOrthoRectificationUTM_ENVISAT.tif
+          --compare-image ${EPSILON_4}  ${BASELINE}/prTvOrthoRectificationUTM_ENVISAT.tif
                           ${TEMP}/prTvOrthoRectificationUTM_ENVISAT.tif
         otbOrthoRectificationComplexFilter
-    		${LARGEINPUT}/ENVISAT_ASAR_SCENE01/ASA_APS_1PNDPA20030821_7713.N1
-        	${TEMP}/prTvOrthoRectificationUTM_ENVISAT.tif
-	        655696.679130 4906584.046495
-        	200	200 10 -10 30 N 4 
+                    ${LARGEINPUT}/ENVISAT_ASAR_SCENE01/ASA_APS_1PNDPA20030821_7713.N1
+                ${TEMP}/prTvOrthoRectificationUTM_ENVISAT.tif
+                655696.679130 4906584.046495
+                200        200 10 -10 30 N 4
         )
 
 ADD_TEST(prTvOrthoRectificationUTM_PALSAR ${PROJECTIONS_TESTS2}
-  	--compare-image ${EPSILON_4}  ${BASELINE}/prTvOrthoRectificationUTM_PALSAR.tif
+          --compare-image ${EPSILON_4}  ${BASELINE}/prTvOrthoRectificationUTM_PALSAR.tif
                           ${TEMP}/prTvOrthoRectificationUTM_PALSAR.tif
         otbOrthoRectificationComplexFilter
-    		${LARGEINPUT}/PALSAR/200801280007/l1data/VOL-ALPSRP037120700-H1.1__A
-        	${TEMP}/prTvOrthoRectificationUTM_PALSAR.tif
-	        309298.731439 3909055.130746
-        	200	200 10 -10 54 N 4 
+                    ${LARGEINPUT}/PALSAR/200801280007/l1data/VOL-ALPSRP037120700-H1.1__A
+                ${TEMP}/prTvOrthoRectificationUTM_PALSAR.tif
+                309298.731439 3909055.130746
+                200        200 10 -10 54 N 4
         )
 
 ADD_TEST(prTvOrthoRectificationUTM_TERRASARX_HH ${PROJECTIONS_TESTS2}
-  	--compare-image ${EPSILON_4}  ${BASELINE}/prTvOrthoRectificationUTM_TERRASARX_HH.tif
+          --compare-image ${EPSILON_4}  ${BASELINE}/prTvOrthoRectificationUTM_TERRASARX_HH.tif
                           ${TEMP}/prTvOrthoRectificationUTM_TERRASARX_HH.tif
         otbOrthoRectificationComplexFilter
-    		${LARGEINPUT}/TERRASARX/PANGKALANBUUN/IMAGEDATA/IMAGE_HH_SRA_stripFar_008.cos
-        	${TEMP}/prTvOrthoRectificationUTM_TERRASARX_HH.tif
-	        591992.001073 9699689.825866
-        	200	200 10 -10 49 S 4 
+                    ${LARGEINPUT}/TERRASARX/PANGKALANBUUN/IMAGEDATA/IMAGE_HH_SRA_stripFar_008.cos
+                ${TEMP}/prTvOrthoRectificationUTM_TERRASARX_HH.tif
+                591992.001073 9699689.825866
+                200        200 10 -10 49 S 4
         )
 
 ADD_TEST(prTvOrthoRectificationUTM_TERRASARX_VV ${PROJECTIONS_TESTS2}
-  	--compare-image ${EPSILON_4}  ${BASELINE}/prTvOrthoRectificationUTM_TERRASARX_VV.tif
+          --compare-image ${EPSILON_4}  ${BASELINE}/prTvOrthoRectificationUTM_TERRASARX_VV.tif
                           ${TEMP}/prTvOrthoRectificationUTM_TERRASARX_VV.tif
         otbOrthoRectificationComplexFilter
-    		${LARGEINPUT}/TERRASARX/PANGKALANBUUN/IMAGEDATA/IMAGE_VV_SRA_stripFar_008.cos
-        	${TEMP}/prTvOrthoRectificationUTM_TERRASARX_VV.tif
-	        591992.001073 9699689.825866
-        	200	200 10 -10 49 S 4 
+                    ${LARGEINPUT}/TERRASARX/PANGKALANBUUN/IMAGEDATA/IMAGE_VV_SRA_stripFar_008.cos
+                ${TEMP}/prTvOrthoRectificationUTM_TERRASARX_VV.tif
+                591992.001073 9699689.825866
+                200        200 10 -10 49 S 4
         )
 ENDIF(OTB_DATA_USE_LARGEINPUT)
 
@@ -548,28 +548,28 @@ ADD_TEST(prTuGCPsToRPCSensorModelImageFilterNew ${PROJECTIONS_TESTS2}
 IF(OTB_DATA_USE_LARGEINPUT)
 
 ADD_TEST(prTvGCPsToRPCSensorModelImageFilterWithoutDEM ${PROJECTIONS_TESTS2}
-  --compare-ascii ${EPSILON_4} 
+  --compare-ascii ${EPSILON_4}
          ${BASELINE_FILES}/otbGCPsToRPCSensorModelImageFilterWithoutDEMOutput.txt
          ${TEMP}/otbGCPsToRPCSensorModelImageFilterWithoutDEMOutput.txt
          otbGCPsToRPCSensorModelImageFilterWithoutDEM
-	 ${LARGEINPUT}/SPOT4/RIO_DE_JANEIRO/IMAG_01.DAT
-	 ${TEMP}/otbGCPsToRPCSensorModelImageFilterWithoutDEMOutput.txt
-	 1199 1259 -43.168043 -22.76847  0.
-	 1497 727  -43.066686 -22.688931 0.
-	 699 1146  -43.288651 -22.7254   0.
-	 1379 2457 -43.193502 -22.986073 0.
-	 2592 1846 -42.854215 -22.932684 0.
-	 1430 1797 -43.136813 -22.872988 0.
-	 587 2654  -43.393297 -22.983847 0.
-	 2398 2422 -42.928778 -23.025664 0.
-	 1436 2946 -43.192431 -23.074483 0.
-	 963 2915  -43.310011 -23.047382 0.
-	 1081 1024 -43.18523  -22.721919 0.
-	 1395 1213 -43.116752 -22.769191 0.
-	 1781 2202 -43.069911 -22.959556 0.
-	 2803 1942 -42.808235 -22.958868 0.
-	 980 2734  -43.309672 -22.99534  0.
-	 713 2754  -43.365307 -23.007862 0.
+         ${LARGEINPUT}/SPOT4/RIO_DE_JANEIRO/IMAG_01.DAT
+         ${TEMP}/otbGCPsToRPCSensorModelImageFilterWithoutDEMOutput.txt
+         1199 1259 -43.168043 -22.76847  0.
+         1497 727  -43.066686 -22.688931 0.
+         699 1146  -43.288651 -22.7254   0.
+         1379 2457 -43.193502 -22.986073 0.
+         2592 1846 -42.854215 -22.932684 0.
+         1430 1797 -43.136813 -22.872988 0.
+         587 2654  -43.393297 -22.983847 0.
+         2398 2422 -42.928778 -23.025664 0.
+         1436 2946 -43.192431 -23.074483 0.
+         963 2915  -43.310011 -23.047382 0.
+         1081 1024 -43.18523  -22.721919 0.
+         1395 1213 -43.116752 -22.769191 0.
+         1781 2202 -43.069911 -22.959556 0.
+         2803 1942 -42.808235 -22.958868 0.
+         980 2734  -43.309672 -22.99534  0.
+         713 2754  -43.365307 -23.007862 0.
 )
 ENDIF(OTB_DATA_USE_LARGEINPUT)
 
@@ -579,7 +579,7 @@ ADD_TEST(prTvGCPsToRPCSensorModelImageCheckInputGcpPointsProjection_WithDEM ${PR
   otbGCPsToRPCSensorModelImageFilterCheckRpcModel
   -in ${INPUTDATA}/Haiti1.jpeg
   -dem ${INPUTDATA}/DEM/srtm_directory
-  -gcp  1980.000000 1986.000000 -72.351257 18.555075 0.000000 
+  -gcp  1980.000000 1986.000000 -72.351257 18.555075 0.000000
   1963.000000 1944.000000 -72.352051 18.556946 0.000000
   2078.000000 1566.000000 -72.346130 18.574358 0.000000
   2154.000000 1430.000000 -72.342377 18.580441 0.000000
@@ -588,7 +588,7 @@ ADD_TEST(prTvGCPsToRPCSensorModelImageCheckInputGcpPointsProjection_WithDEM ${PR
   3492.000000 1397.000000 -72.278343 18.580887 0.000000
   2890.000000 1439.000000 -72.306908 18.579464 0.000000
   2098.000000 2469.000000 -72.345741 18.532839 0.000000
-  1941.000000 2473.000000 -72.353317 18.532595 0.00000 
+  1941.000000 2473.000000 -72.353317 18.532595 0.00000
   1644.000000 2409.000000 -72.367691 18.535810 0.000000
   1440.000000 2448.000000 -72.377457 18.534243 0.000000
   687.000000 2005.000000 -72.413315 18.554974 0.000000
@@ -604,16 +604,16 @@ ADD_TEST(prTvGCPsToRPCSensorModelImageCheckInputGcpPointsProjection_WithDEM ${PR
   1891.000000 360.000000 -72.354301 18.629776 0.000000
   3989.000000 2639.000000 -72.255020 18.523664 0.000000
   417.000000 2317.000000 -72.426552 18.540876 0.000000
-  -err 100 # Tolerance in meters, the first goal of this test 
+  -err 100 # Tolerance in meters, the first goal of this test
            # is highlighting nan in projected point using the rpc model.
-           # and not to test the precision of the projection. 100 is then 
+           # and not to test the precision of the projection. 100 is then
            # to detect false reprojections results.
   )
 
 ADD_TEST(prTvGCPsToRPCSensorModelImageCheckInputGcpPointsProjection_WithoutDEM ${PROJECTIONS_TESTS2}
   otbGCPsToRPCSensorModelImageFilterCheckRpcModel
   -in ${INPUTDATA}/Haiti1.jpeg
-  -gcp  1980.000000 1986.000000 -72.351257 18.555075 0.000000 
+  -gcp  1980.000000 1986.000000 -72.351257 18.555075 0.000000
   1963.000000 1944.000000 -72.352051 18.556946 0.000000
   2078.000000 1566.000000 -72.346130 18.574358 0.000000
   2154.000000 1430.000000 -72.342377 18.580441 0.000000
@@ -622,7 +622,7 @@ ADD_TEST(prTvGCPsToRPCSensorModelImageCheckInputGcpPointsProjection_WithoutDEM $
   3492.000000 1397.000000 -72.278343 18.580887 0.000000
   2890.000000 1439.000000 -72.306908 18.579464 0.000000
   2098.000000 2469.000000 -72.345741 18.532839 0.000000
-  1941.000000 2473.000000 -72.353317 18.532595 0.00000 
+  1941.000000 2473.000000 -72.353317 18.532595 0.00000
   1644.000000 2409.000000 -72.367691 18.535810 0.000000
   1440.000000 2448.000000 -72.377457 18.534243 0.000000
   687.000000 2005.000000 -72.413315 18.554974 0.000000
@@ -638,14 +638,14 @@ ADD_TEST(prTvGCPsToRPCSensorModelImageCheckInputGcpPointsProjection_WithoutDEM $
   1891.000000 360.000000 -72.354301 18.629776 0.000000
   3989.000000 2639.000000 -72.255020 18.523664 0.000000
   417.000000 2317.000000 -72.426552 18.540876 0.000000
-  -err 100 # Tolerance in meters, the first goal of this test 
+  -err 100 # Tolerance in meters, the first goal of this test
            # is highlighting nan in projected point using the rpc model.
-           # and not to test the precision of the projection. 100 is then 
+           # and not to test the precision of the projection. 100 is then
            # to detect false reprojections results.
   )
 
 ADD_TEST(prTvGCPsToRPCSensorModelImageFilterAndOrtho ${PROJECTIONS_TESTS2}
-  --compare-image ${EPSILON_4} 
+  --compare-image ${EPSILON_4}
          ${BASELINE_FILES}/otbGCPsToRPCSensorModelImageFilterAndOrthoOutput.tif
          ${TEMP}/otbGCPsToRPCSensorModelImageFilterAndOrthoOutput.tif
          otbGCPsToRPCSensorModelImageFilterAndOrtho
@@ -653,7 +653,7 @@ ADD_TEST(prTvGCPsToRPCSensorModelImageFilterAndOrtho ${PROJECTIONS_TESTS2}
      ${TEMP}/otbGCPsToRPCSensorModelImageFilterAndOrthoOutput.tif
      
      782166.394827
-     2054821.977902  
+     2054821.977902
      500
      500
      5
@@ -665,7 +665,7 @@ ADD_TEST(prTvGCPsToRPCSensorModelImageFilterAndOrtho ${PROJECTIONS_TESTS2}
         1986.000000
         -72.351257
         18.555075
-        0.000000 
+        0.000000
 
         1963.000000
         1944.000000
@@ -816,27 +816,27 @@ ADD_TEST(prTuLeastSquareAffineTransformEstimatorNew ${PROJECTIONS_TESTS2}
          otbLeastSquareAffineTransformEstimatorNew)
 
 ADD_TEST(prTvLeastSquareAffineTransformEstimator ${PROJECTIONS_TESTS2}
-   --compare-ascii ${NOTOL} 
+   --compare-ascii ${NOTOL}
          ${BASELINE_FILES}/otbLeastSquareAffineTransformEstimatorOutput.txt
          ${TEMP}/otbLeastSquareAffineTransformEstimatorOutput.txt
          otbLeastSquareAffineTransformEstimator
-	 ${TEMP}/otbLeastSquareAffineTransformEstimatorOutput.txt
-	 840 394 783 7907 9925 11943
-	 798 911 197 5831 7738 9645
-	 335 768 277 5356 6737 8118
-	 553 477 628 6867 8526 10185
-	 364 513 952 9090 10920 12750
-	 916 635 717 8485 10754 13023
-	 141 606 16 2687 3451 4215
-	 242 137 804 6428 7612 8796
-	 156 400 129 2669 3355 4041
-	 108 998 218 5636 6961 8286
-	 512 839 612 8162 10126 12090
-	 296 637 524 6522 7980 9438
-	 493 972 292 6435 8193 9951
-	 771 526 769 8268 10335 12402
-	 400 891 283 5955 7530 9105
-	 352 807 919 10023 12102 14181
+         ${TEMP}/otbLeastSquareAffineTransformEstimatorOutput.txt
+         840 394 783 7907 9925 11943
+         798 911 197 5831 7738 9645
+         335 768 277 5356 6737 8118
+         553 477 628 6867 8526 10185
+         364 513 952 9090 10920 12750
+         916 635 717 8485 10754 13023
+         141 606 16 2687 3451 4215
+         242 137 804 6428 7612 8796
+         156 400 129 2669 3355 4041
+         108 998 218 5636 6961 8286
+         512 839 612 8162 10126 12090
+         296 637 524 6522 7980 9438
+         493 972 292 6435 8193 9951
+         771 526 769 8268 10335 12402
+         400 891 283 5955 7530 9105
+         352 807 919 10023 12102 14181
 )
 
 #========================= TESTS SINGAPOUR ===============================
@@ -844,15 +844,15 @@ ADD_TEST(prTvLeastSquareAffineTransformEstimator ${PROJECTIONS_TESTS2}
 #SET(EMMANUELDATA ${OTB_DATA_ROOT}/Emmanuel/Singapour/000000173549_01_P001_MUL)
 
 #ADD_TEST(prTvRegionProjectionResamplerSingapour ${PROJECTIONS_TESTS2}
-#				otbRegionProjectionResampler
+#                                otbRegionProjectionResampler
 #        ${EMMANUELDATA}/04MAR21031747-M1BS-000000173549_01_P001.TIF
 #        ${TEMP}/prTvRegionProjectionResamplerSingapour.tif
 #        103.8464 1.31
 #        500
-#				 500
-#				 10
-#				 0.00001
-#				 -0.00001
+#                                 500
+#                                 10
+#                                 0.00001
+#                                 -0.00001
 #        )
 
 #ADD_TEST(prTvOrthoRectificationSingapour ${PROJECTIONS_TESTS2}
@@ -861,9 +861,9 @@ ADD_TEST(prTvLeastSquareAffineTransformEstimator ${PROJECTIONS_TESTS2}
 #        ${TEMP}/prTvOrthoRectificationSingapour_UTM.tif
 #        371997.12 144885.4
 #        500
-#				 500
-#				 220
-#				 1
+#                                 500
+#                                 220
+#                                 1
 #        -1
 #        )
 
@@ -887,7 +887,7 @@ ENDIF(OTB_DATA_USE_LARGEINPUT)
 ADD_TEST(prTuGenericMapProjectionNew ${PROJECTIONS_TESTS3}  otbGenericMapProjectionNew )
 
 ADD_TEST(prTvGenericMapProjection ${PROJECTIONS_TESTS3}
-        --compare-ascii ${EPSILON_4} 
+        --compare-ascii ${EPSILON_4}
             ${BASELINE_FILES}/prTvGenericMapProjection.txt
             ${TEMP}/prTvGenericMapProjection.txt
         otbGenericMapProjection
@@ -896,30 +896,30 @@ ADD_TEST(prTvGenericMapProjection ${PROJECTIONS_TESTS3}
 
 ADD_TEST(prTuGenericRSTransformNew ${PROJECTIONS_TESTS3}  otbGenericRSTransformNew )
 
-ADD_TEST(prTvGenericRSTransform ${PROJECTIONS_TESTS3} 
+ADD_TEST(prTvGenericRSTransform ${PROJECTIONS_TESTS3}
          --compare-ascii ${EPSILON_4}
-	     ${BASELINE_FILES}/prTvGenericRSTransform.txt
-	     ${TEMP}/prTvGenericRSTransform.txt
-	 otbGenericRSTransform
-	     1.35617289802566
-	     43.4876035537
-	     ${TEMP}/prTvGenericRSTransform.txt
+             ${BASELINE_FILES}/prTvGenericRSTransform.txt
+             ${TEMP}/prTvGenericRSTransform.txt
+         otbGenericRSTransform
+             1.35617289802566
+             43.4876035537
+             ${TEMP}/prTvGenericRSTransform.txt
 )
 
-ADD_TEST(prTvGenericRSTransformWithSRID ${PROJECTIONS_TESTS3} 
+ADD_TEST(prTvGenericRSTransformWithSRID ${PROJECTIONS_TESTS3}
          --compare-ascii ${EPSILON_4}
-	     ${BASELINE_FILES}/prTvGenericRSTransform.txt
-	     ${TEMP}/prTvGenericRSTransform_WithSRID.txt
-	 otbGenericRSTransformWithSRID
-	     1.35617289802566
-	     43.4876035537
-	     ${TEMP}/prTvGenericRSTransform_WithSRID.txt
+             ${BASELINE_FILES}/prTvGenericRSTransform.txt
+             ${TEMP}/prTvGenericRSTransform_WithSRID.txt
+         otbGenericRSTransformWithSRID
+             1.35617289802566
+             43.4876035537
+             ${TEMP}/prTvGenericRSTransform_WithSRID.txt
 )
 
 
-ADD_TEST(prTvGenericRSTransformFromImage ${PROJECTIONS_TESTS3} 
-	       otbGenericRSTransformFromImage
-	       ${INPUTDATA}/WithoutProjRefWithKeywordlist.tif)
+ADD_TEST(prTvGenericRSTransformFromImage ${PROJECTIONS_TESTS3}
+               otbGenericRSTransformFromImage
+               ${INPUTDATA}/WithoutProjRefWithKeywordlist.tif)
 
 IF(OTB_DATA_USE_LARGEINPUT)
 ADD_TEST(prTvGenericRSTransformQuickbirdToulouseGeodesicPointChecking ${PROJECTIONS_TESTS3}
@@ -998,7 +998,7 @@ ADD_TEST(prTvVectorDataProjectionFilterFromMapToImage ${PROJECTIONS_TESTS3}
         ${TEMP}/prTvVectorDataProjectionFilterFromMapToImage.kml
         otbVectorDataProjectionFilterFromMapToImage
         ${INPUTDATA}/ToulousePoints-examples.shp
-        ${INPUTDATA}/QB_Toulouse_Ortho_PAN.tif 
+        ${INPUTDATA}/QB_Toulouse_Ortho_PAN.tif
         ${TEMP}/prTvVectorDataProjectionFilterFromMapToImage.kml
 )
 
@@ -1009,7 +1009,7 @@ ADD_TEST(prTvVectorDataProjectionFilterFromGeoToMap ${PROJECTIONS_TESTS3}
         #${TEMP}/prTvVectorDataProjectionFilterFromGeoToMap.shp
         otbVectorDataProjectionFilterFromGeoToMap
         ${TEMP}/prTvVectorDataProjectionFilterFromMapToGeo.kml
-        ${INPUTDATA}/QB_Toulouse_Ortho_PAN.tif 
+        ${INPUTDATA}/QB_Toulouse_Ortho_PAN.tif
         ${TEMP}/prTvVectorDataProjectionFilterFromGeoToMap.shp
 )
 SET_TESTS_PROPERTIES(prTvVectorDataProjectionFilterFromGeoToMap PROPERTIES DEPENDS prTvVectorDataProjectionFilterFromMapToGeo)
@@ -1044,8 +1044,8 @@ IF(OTB_DATA_USE_LARGEINPUT)
   ENDFOREACH()
 
 #  These tests will fail since data does not have geographic/cartographic information
-#  The call SET_TESTS_PROPERTIES(test PROPERTIES WILL_FAIL true) does not do what it is supposed to 
-# 
+#  The call SET_TESTS_PROPERTIES(test PROPERTIES WILL_FAIL true) does not do what it is supposed to
+#
 #  SET(VectorDataIntoImage_FILES_NOGEOM
 #    ${LARGEINPUT}/QB_EXTRACT/qb_extract_00_nogeom.tif
 #    ${LARGEINPUT}/QB_EXTRACT/qb_extract_00_nogeom_ENVI.hdr
@@ -1183,7 +1183,7 @@ ADD_TEST(prTuPhysicalToRPCSensorModelImageFilterNew ${PROJECTIONS_TESTS4}
 
 ADD_TEST(prTvPhysicalToRPCSensorModelImageFilter ${PROJECTIONS_TESTS4}
   otbPhysicalToRPCSensorModelImageFilter
-  ${INPUTDATA}/ToulouseExtract_WithGeom.tif 
+  ${INPUTDATA}/ToulouseExtract_WithGeom.tif
   15
   ${TEMP}/prTvotbPhysicalToRPCSensorModelImageFilter.tif
   )
@@ -1205,19 +1205,19 @@ ADD_TEST(prTvotbGenericRSResampleImageFilter ${PROJECTIONS_TESTS4}
   )
 
 
-# Experimental : Set a variable with the several sensors image 
+# Experimental : Set a variable with the several sensors image
 # paths
 # TODO : parse it with a cmake file in OTB-Data-LargeInput directory
 # Done here for the moment
 
-SET(SENSOR_TYPES 
+SET(SENSOR_TYPES
   "QUICKBIRD/TOULOUSE/000000128955_01_P001_PAN/02APR01105228-P1BS-000000128955_01_P001.TIF"
   "GEOEYE/LES_ROCHES/po_350134_bgrn_0000000.tif"
   "WORLDVIEW2/ROME/WV-2_standard_8band_bundle_16bit/052298844010_01_P001_MUL/09DEC10103019-M2AS-052298844010_01_P001.TIF"
 )
 
 FOREACH( file ${SENSOR_TYPES})
-  # Get the sensor name 
+  # Get the sensor name
   SET(sharp_regexp "([0-9A-Za-z_]*)[ ]*/[ ]*(.*)")
   STRING(REGEX REPLACE "${sharp_regexp}" "\\1" sensor_name "${file}")
   # Tests
@@ -1286,8 +1286,8 @@ ADD_TEST(prTuGeographicalDistanceNew ${PROJECTIONS_TESTS4}
 
 ADD_TEST(prTvGeographicalDistance ${PROJECTIONS_TESTS4}
   otbGeographicalDistance
-  -1.84944 53.14722 
-   0.14056 52.20444 
+  -1.84944 53.14722
+   0.14056 52.20444
    170254.85084
   ${EPSILON_4}
 )
diff --git a/Testing/Code/Radiometry/CMakeLists.txt b/Testing/Code/Radiometry/CMakeLists.txt
index 2d002537d22c1d142fa5a66f1b98500d4721a6be..f571ce485f6ac4d297fa45cd9864bfa8909fd8dd 100644
--- a/Testing/Code/Radiometry/CMakeLists.txt
+++ b/Testing/Code/Radiometry/CMakeLists.txt
@@ -43,12 +43,12 @@ ADD_TEST(raTvARVI_RAndBAndNIRVegetationIndexImageFilter ${RADIOMETRY_TESTS2}
                     ${TEMP}/raRAndBAndNIRVegetationIndex_ARVI_verySmallFSATSWcRcBcNir.tif
         otbRAndBAndNIRVegetationIndexImageFilter
         ARVI
-	${INPUTDATA}/verySmallFSATSW_r.tif
-	${INPUTDATA}/verySmallFSATSW_b.tif
-	${INPUTDATA}/verySmallFSATSW_nir.tif
-	${TEMP}/raRAndBAndNIRVegetationIndex_ARVI_verySmallFSATSWcRcBcNir.tif
+        ${INPUTDATA}/verySmallFSATSW_r.tif
+        ${INPUTDATA}/verySmallFSATSW_b.tif
+        ${INPUTDATA}/verySmallFSATSW_nir.tif
+        ${TEMP}/raRAndBAndNIRVegetationIndex_ARVI_verySmallFSATSWcRcBcNir.tif
         0.6 # Gamma parameter
-	)
+        )
 
 # -------            otb::MultiChannelRAndBAndNIRVegetationIndexImageFilter   ------------------------------
 
@@ -60,11 +60,11 @@ ADD_TEST(raTvARVI_MultiChannelRAndBAndNIRVegetationIndexImageFilter ${RADIOMETRY
                     ${TEMP}/raMultiChannelRAndBAndNIRVegetationIndex_ARVI_verySmallFSATSWcRcBcNir.tif
         otbMultiChannelRAndBAndNIRVegetationIndexImageFilter
         ARVI
-	${INPUTDATA}/verySmallFSATSW.tif
-	${TEMP}/raMultiChannelRAndBAndNIRVegetationIndex_ARVI_verySmallFSATSWcRcBcNir.tif
-	3 1 4
+        ${INPUTDATA}/verySmallFSATSW.tif
+        ${TEMP}/raMultiChannelRAndBAndNIRVegetationIndex_ARVI_verySmallFSATSWcRcBcNir.tif
+        3 1 4
     0.6 # Gamma parameter
-	)
+        )
 
 # -------            otb::ImageToLuminanceImageFilter   ------------------------------
 ADD_TEST(raTuImageToLuminanceImageFilterNew ${RADIOMETRY_TESTS2}
@@ -75,16 +75,16 @@ ADD_TEST(raTvImageToLuminanceImageFilter ${RADIOMETRY_TESTS2}
   --compare-image ${EPSILON_12}  ${BASELINE}/raTvImageToLuminanceImageFilter.tif
                           ${TEMP}/raTvImageToLuminanceImageFilter.tif
         otbImageToLuminanceImageFilter
-	${INPUTDATA}/verySmallFSATSW.tif
-	${TEMP}/raTvImageToLuminanceImageFilter.tif
-	10   #channel 1 alpha
-	20   #channel 2 alpha
-	30   #channel 3 alpha
-	40   #channel 4 alpha
-	1    #channel 1 beta
-	2    #channel 2 beta
-	3    #channel 3 beta
-	4    #channel 4 beta
+        ${INPUTDATA}/verySmallFSATSW.tif
+        ${TEMP}/raTvImageToLuminanceImageFilter.tif
+        10   #channel 1 alpha
+        20   #channel 2 alpha
+        30   #channel 3 alpha
+        40   #channel 4 alpha
+        1    #channel 1 beta
+        2    #channel 2 beta
+        3    #channel 3 beta
+        4    #channel 4 beta
          )
 
 IF(OTB_DATA_USE_LARGEINPUT)
@@ -92,16 +92,16 @@ ADD_TEST(raTvImageToLuminanceImageFilterAutoSpot5 ${RADIOMETRY_TESTS2}
   --compare-image ${EPSILON_12}  ${BASELINE}/raTvImageToLuminanceImageFilterAutoSpot5.tif
                           ${TEMP}/raTvImageToLuminanceImageFilterAutoSpot5.tif
         otbImageToLuminanceImageFilterAuto
-	${LARGEINPUT}/SPOT5/TEHERAN/IMAGERY.TIF
-	${TEMP}/raTvImageToLuminanceImageFilterAutoSpot5.tif
+        ${LARGEINPUT}/SPOT5/TEHERAN/IMAGERY.TIF
+        ${TEMP}/raTvImageToLuminanceImageFilterAutoSpot5.tif
          )
 
 ADD_TEST(raTvImageToLuminanceImageFilterAutoIkonos ${RADIOMETRY_TESTS2}
   --compare-image ${EPSILON_12}  ${BASELINE}/raTvImageToLuminanceImageFilterAutoIkonos.tif
                           ${TEMP}/raTvImageToLuminanceImageFilterAutoIkonos.tif
         otbImageToLuminanceImageFilterAuto
-	${LARGEINPUT}/IKONOS/BLOSSEVILLE/po_2619900_pan_0000000.tif
-	${TEMP}/raTvImageToLuminanceImageFilterAutoIkonos.tif
+        ${LARGEINPUT}/IKONOS/BLOSSEVILLE/po_2619900_pan_0000000.tif
+        ${TEMP}/raTvImageToLuminanceImageFilterAutoIkonos.tif
          )
 
 ADD_TEST(raTvImageToLuminanceImageFilterAutoWV2PAN ${RADIOMETRY_TESTS2}
@@ -166,29 +166,29 @@ ADD_TEST(raTvLuminanceToReflectanceImageFilter ${RADIOMETRY_TESTS2}
   --compare-image ${EPSILON_12}  ${BASELINE}/raTvLuminanceToReflectanceImageFilterDsol.tif
                           ${TEMP}/raTvLuminanceToReflectanceImageFilterDsol.tif
         otbLuminanceToReflectanceImageFilter
-	${INPUTDATA}/verySmallFSATSW.tif
-	${TEMP}/raTvLuminanceToReflectanceImageFilterDsol.tif
-	0.2 #radius
-	10  #channel 1 illumination
-	20  #channel 2 illumination
-	30  #channel 3 illumination
-	40  #channel 4 illumination
-	0.9923885328 #d/d0 corresponding to the date 03/05
+        ${INPUTDATA}/verySmallFSATSW.tif
+        ${TEMP}/raTvLuminanceToReflectanceImageFilterDsol.tif
+        0.2 #radius
+        10  #channel 1 illumination
+        20  #channel 2 illumination
+        30  #channel 3 illumination
+        40  #channel 4 illumination
+        0.9923885328 #d/d0 corresponding to the date 03/05
          )
 
 ADD_TEST(raTvLuminanceToReflectanceImageFilterDayMonth ${RADIOMETRY_TESTS2}
   --compare-image ${EPSILON_12}  ${BASELINE}/raTvLuminanceToReflectanceImageFilter.tif
                           ${TEMP}/raTvLuminanceToReflectanceImageFilterDayMounth.tif
         otbLuminanceToReflectanceImageFilter
-	${INPUTDATA}/verySmallFSATSW.tif
-	${TEMP}/raTvLuminanceToReflectanceImageFilterDayMounth.tif
-	0.2 #radius
-	10  #channel 1 illumination
-	20  #channel 2 illumination
-	30  #channel 3 illumination
-	40  #channel 4 illumination
-	3   #day
-	5   #mounth
+        ${INPUTDATA}/verySmallFSATSW.tif
+        ${TEMP}/raTvLuminanceToReflectanceImageFilterDayMounth.tif
+        0.2 #radius
+        10  #channel 1 illumination
+        20  #channel 2 illumination
+        30  #channel 3 illumination
+        40  #channel 4 illumination
+        3   #day
+        5   #mounth
         )
 
 IF(OTB_DATA_USE_LARGEINPUT)
@@ -197,16 +197,16 @@ ADD_TEST(raTvLuminanceToReflectanceImageFilterAutoSpot5 ${RADIOMETRY_TESTS2}
   --compare-image ${EPSILON_12}  ${BASELINE}/raTvLuminanceToReflectanceImageFilterAutoSpot5.tif
                           ${TEMP}/raTvLuminanceToReflectanceImageFilterAutoSpot5.tif
         otbLuminanceToReflectanceImageFilterAuto
-	${LARGEINPUT}/SPOT5/TEHERAN/IMAGERY.TIF
-	${TEMP}/raTvLuminanceToReflectanceImageFilterAutoSpot5.tif
+        ${LARGEINPUT}/SPOT5/TEHERAN/IMAGERY.TIF
+        ${TEMP}/raTvLuminanceToReflectanceImageFilterAutoSpot5.tif
          )
 
 ADD_TEST(raTvLuminanceToReflectanceImageFilterAutoIkonos ${RADIOMETRY_TESTS2}
   --compare-image ${EPSILON_12}  ${BASELINE}/raTvLuminanceToReflectanceImageFilterAutoIkonos.tif
                           ${TEMP}/raTvLuminanceToReflectanceImageFilterAutoIkonos.tif
         otbLuminanceToReflectanceImageFilterAuto
-	${LARGEINPUT}/IKONOS/BLOSSEVILLE/po_2619900_pan_0000000.tif
-	${TEMP}/raTvLuminanceToReflectanceImageFilterAutoIkonos.tif
+        ${LARGEINPUT}/IKONOS/BLOSSEVILLE/po_2619900_pan_0000000.tif
+        ${TEMP}/raTvLuminanceToReflectanceImageFilterAutoIkonos.tif
          )
 
 ADD_TEST(raTvLuminanceToReflectanceImageFilterAutoWV2PAN ${RADIOMETRY_TESTS2}
@@ -270,68 +270,68 @@ ADD_TEST(raTvImageToReflectanceImageFilter ${RADIOMETRY_TESTS2}
   --compare-image ${EPSILON_12}  ${BASELINE}/raTvImageToReflectanceImageFilterDsol.tif
                           ${TEMP}/raTvImageToReflectanceImageFilterDsol.tif
         otbImageToReflectanceImageFilter
-	${INPUTDATA}/verySmallFSATSW.tif
-	${TEMP}/raTvImageToReflectanceImageFilterDsol.tif
-	0.2 #radius
-	1   #channel 1 alpha
-	2   #channel 2 alpha
-	3   #channel 3 alpha
-	4   #channel 4 alpha
-	10  #channel 1 beta
-	11  #channel 2 beta
-	12  #channel 3 beta
-	13  #channel 4 beta
-	10  #channel 1 illumination
-	20  #channel 2 illumination
-	30  #channel 3 illumination
-	40  #channel 4 illumination
-	0.9923885328 #d/d0 corresponding to the date 03/05
+        ${INPUTDATA}/verySmallFSATSW.tif
+        ${TEMP}/raTvImageToReflectanceImageFilterDsol.tif
+        0.2 #radius
+        1   #channel 1 alpha
+        2   #channel 2 alpha
+        3   #channel 3 alpha
+        4   #channel 4 alpha
+        10  #channel 1 beta
+        11  #channel 2 beta
+        12  #channel 3 beta
+        13  #channel 4 beta
+        10  #channel 1 illumination
+        20  #channel 2 illumination
+        30  #channel 3 illumination
+        40  #channel 4 illumination
+        0.9923885328 #d/d0 corresponding to the date 03/05
          )
 
 ADD_TEST(raTvRomaniaImageToReflectance ${RADIOMETRY_TESTS2}
   --compare-image ${EPSILON_12}
-		  ${BASELINE}/raTvRomania_Reflectance.tif
+                  ${BASELINE}/raTvRomania_Reflectance.tif
                   ${TEMP}/raTvRomaniaReflectanceImage.tif
         otbImageToReflectanceImageFilter
-	${INPUTDATA}/Romania_Extract.tif
-	${TEMP}/raTvRomaniaReflectanceImage.tif
-	27.3                 # = 90-62.70 : elevation et azimuth solaire
+        ${INPUTDATA}/Romania_Extract.tif
+        ${TEMP}/raTvRomaniaReflectanceImage.tif
+        27.3                 # = 90-62.70 : elevation et azimuth solaire
         1.981247824          #channel 1 alpha = 0.881338*2.24800
-	4.332207085          #channel 2 alpha = 0.858713*5.04500
-	2.32064768           #channel 3 alpha = 0.685568*3.38500
-	9.3177861            #channel 4 alpha = 6.19122*1.50500
-	0                    #channel 1 beta
-	0                    #channel 2 beta
-	0                    #channel 3 beta
-	0                    #channel 4 beta
-	1057.56              #channel 1 illumination
-	1570.23              #channel 2 illumination
-	1842.94              #channel 3 illumination
-	232.820              #channel 4 illumination
-	0.9889145564708814   #= sqrt(0.977952) d/d0 corresponding to the date 03/05
+        4.332207085          #channel 2 alpha = 0.858713*5.04500
+        2.32064768           #channel 3 alpha = 0.685568*3.38500
+        9.3177861            #channel 4 alpha = 6.19122*1.50500
+        0                    #channel 1 beta
+        0                    #channel 2 beta
+        0                    #channel 3 beta
+        0                    #channel 4 beta
+        1057.56              #channel 1 illumination
+        1570.23              #channel 2 illumination
+        1842.94              #channel 3 illumination
+        232.820              #channel 4 illumination
+        0.9889145564708814   #= sqrt(0.977952) d/d0 corresponding to the date 03/05
         )
 
 ADD_TEST(raTvImageToReflectanceImageFilterDayMounth ${RADIOMETRY_TESTS2}
   --compare-image ${EPSILON_12}  ${BASELINE}/raTvImageToReflectanceImageFilter.tif
                           ${TEMP}/raTvImageToReflectanceImageFilterDayMounth.tif
         otbImageToReflectanceImageFilter
-	${INPUTDATA}/verySmallFSATSW.tif
-	${TEMP}/raTvImageToReflectanceImageFilterDayMounth.tif
-	0.2 #radius
-	1   #channel 1 alpha
-	2   #channel 2 alpha
-	3   #channel 3 alpha
-	4   #channel 4 alpha
-	10  #channel 1 beta
-	11  #channel 2 beta
-	12  #channel 3 beta
-	13  #channel 4 beta
-	10  #channel 1 illumination
-	20  #channel 2 illumination
-	30  #channel 3 illumination
-	40  #channel 4 illumination
-	3   #day
-	5   #mounth
+        ${INPUTDATA}/verySmallFSATSW.tif
+        ${TEMP}/raTvImageToReflectanceImageFilterDayMounth.tif
+        0.2 #radius
+        1   #channel 1 alpha
+        2   #channel 2 alpha
+        3   #channel 3 alpha
+        4   #channel 4 alpha
+        10  #channel 1 beta
+        11  #channel 2 beta
+        12  #channel 3 beta
+        13  #channel 4 beta
+        10  #channel 1 illumination
+        20  #channel 2 illumination
+        30  #channel 3 illumination
+        40  #channel 4 illumination
+        3   #day
+        5   #mounth
        )
 
 IF(OTB_DATA_USE_LARGEINPUT)
@@ -339,14 +339,14 @@ ADD_TEST(raTvImageToReflectanceImageFilterAuto ${RADIOMETRY_TESTS2}
   --compare-image ${EPSILON_12}  ${BASELINE}/raTvImageToReflectanceImageFilterAuto.tif
                           ${TEMP}/raTvImageToReflectanceImageFilterAuto.tif
         otbImageToReflectanceImageFilterAuto
-	${LARGEINPUT}/SPOT5/TEHERAN/IMAGERY.TIF
-	${TEMP}/raTvImageToReflectanceImageFilterAuto.tif
+        ${LARGEINPUT}/SPOT5/TEHERAN/IMAGERY.TIF
+        ${TEMP}/raTvImageToReflectanceImageFilterAuto.tif
          )
 
 ADD_TEST(raTuImageToReflectanceImageFilterAutoFORMOSAT2 ${RADIOMETRY_TESTS2}
         otbImageToReflectanceImageFilterAuto
-		${LARGEINPUT}/FORMOSAT/Sudouest_20071013_MS_fmsat/IMAGERY.TIF
-		${TEMP}/raTvImageToReflectanceImageFilterAutoFORMOSAT2.tif
+                ${LARGEINPUT}/FORMOSAT/Sudouest_20071013_MS_fmsat/IMAGERY.TIF
+                ${TEMP}/raTvImageToReflectanceImageFilterAutoFORMOSAT2.tif
          )
          
 ENDIF(OTB_DATA_USE_LARGEINPUT)
@@ -367,21 +367,21 @@ ADD_TEST(raTvDEMCaracteristicsExtractor ${RADIOMETRY_TESTS3}
                      ${TEMP}/raTvDEMCaracteristicsExtractorSlop.tif
                      ${BASELINE}/raTvDEMCaracteristicsExtractorAspect.tif
                      ${TEMP}/raTvDEMCaracteristicsExtractorAspect.tif
-		     ${BASELINE}/raTvDEMCaracteristicsExtractorIncidence.tif
+                     ${BASELINE}/raTvDEMCaracteristicsExtractorIncidence.tif
                      ${TEMP}/raTvDEMCaracteristicsExtractorIncidence.tif
                      ${BASELINE}/raTvDEMCaracteristicsExtractorExitance.tif
                      ${TEMP}/raTvDEMCaracteristicsExtractorExitance.tif
         otbDEMCaracteristicsExtractor
-	${INPUTDATA}/pyramide.tif
-	20 # view azimut
-	40 # view angle
-	10 # solar azimut
-	30 # solar angle
-	${TEMP}/raTvDEMCaracteristicsExtractorSlop.tif
-	${TEMP}/raTvDEMCaracteristicsExtractorAspect.tif
-	${TEMP}/raTvDEMCaracteristicsExtractorIncidence.tif
-	${TEMP}/raTvDEMCaracteristicsExtractorExitance.tif
-	)
+        ${INPUTDATA}/pyramide.tif
+        20 # view azimut
+        40 # view angle
+        10 # solar azimut
+        30 # solar angle
+        ${TEMP}/raTvDEMCaracteristicsExtractorSlop.tif
+        ${TEMP}/raTvDEMCaracteristicsExtractorAspect.tif
+        ${TEMP}/raTvDEMCaracteristicsExtractorIncidence.tif
+        ${TEMP}/raTvDEMCaracteristicsExtractorExitance.tif
+        )
 
 
 # -------            otb::AtmosphericCorrectionParameters   ------------------------------
@@ -394,11 +394,11 @@ ADD_TEST(raTuAtmosphericCorrectionParametersNew ${RADIOMETRY_TESTS3}
 # in otbAtmosphericCorrectionParameters.h/.cxx
 ADD_TEST(raTvFilterFunctionValuesTest ${RADIOMETRY_TESTS3}
         otbFilterFunctionValuesTest
-	${TEMP}/raTvFilterFunctionValuesTest.txt
-	0.5             # lambda min
-	0.7             # lambda max
-	0.05            # user step
-	0.2 0.5 0.3 0.9 0.8 # vector
+        ${TEMP}/raTvFilterFunctionValuesTest.txt
+        0.5             # lambda min
+        0.7             # lambda max
+        0.05            # user step
+        0.2 0.5 0.3 0.9 0.8 # vector
 )
 
 ##########           otb::FilterFunctionValues DigitalGlobe sensitivity files -------------------
@@ -440,8 +440,8 @@ ADD_TEST(raTvSIXSTraitsComputeAtmosphericParametersTest ${RADIOMETRY_TESTS3}
     --compare-ascii ${EPSILON_4} ${BASELINE_FILES}/raTvSIXSTraitsComputeAtmosphericParametersTest.txt
                            ${TEMP}/raTvSIXSTraitsComputeAtmosphericParametersTest.txt
         otbSIXSTraitsComputeAtmosphericParametersTest
-	${INPUTDATA}/in6S_otb
-	${TEMP}/raTvSIXSTraitsComputeAtmosphericParametersTest.txt
+        ${INPUTDATA}/in6S_otb
+        ${TEMP}/raTvSIXSTraitsComputeAtmosphericParametersTest.txt
 )
 
 
@@ -470,40 +470,40 @@ ADD_TEST(raTvReflectanceToSurfaceReflectanceImageFilter ${RADIOMETRY_TESTS3}
   --compare-image ${EPSILON_12}  ${BASELINE}/raTvReflectanceToSurfaceReflectanceImageFilter.tif
                               ${TEMP}/raTvReflectanceToSurfaceReflectanceImageFilter.tif
         otbReflectanceToSurfaceReflectanceImageFilterTest
-	${INPUTDATA}/verySmallFSATSW.tif
-	${TEMP}/raTvReflectanceToSurfaceReflectanceImageFilter.tif
-	# SAME VALUE FOR EACH CHANNEL
-	1 1 1 1 # intrinsic atmospheric reflectance
-	2 2 2 2 # spherical albedo of the atmosphere
-	3 3 3 3 # total transmission
-	2 2 2 2 # downward transmittance
-	3 3 3 3 # upward transmittance
+        ${INPUTDATA}/verySmallFSATSW.tif
+        ${TEMP}/raTvReflectanceToSurfaceReflectanceImageFilter.tif
+        # SAME VALUE FOR EACH CHANNEL
+        1 1 1 1 # intrinsic atmospheric reflectance
+        2 2 2 2 # spherical albedo of the atmosphere
+        3 3 3 3 # total transmission
+        2 2 2 2 # downward transmittance
+        3 3 3 3 # upward transmittance
        )
 
-IF(OTB_DATA_USE_LARGEINPUT)       
+IF(OTB_DATA_USE_LARGEINPUT)
 #this test was comment after the refactoring of astmospheric correction classes
-#//TODO Need to rewrite tests with baselines generated directly with 6S. 
+#//TODO Need to rewrite tests with baselines generated directly with 6S.
 #ADD_TEST(raTvReflectanceToSurfaceReflectanceImageFilter2 ${RADIOMETRY_TESTS3}
 #  --compare-ascii ${EPSILON_12}  ${BASELINE_FILES}/raTvReflectanceToSurfaceReflectanceImageFilter2.txt
 #                              ${TEMP}/raTvReflectanceToSurfaceReflectanceImageFilter2.txt
 #        otbReflectanceToSurfaceReflectanceImageFilterTest2
 #    ${LARGEINPUT}/SPOT5/TEHERAN/IMAGERY.TIF
 #    ${TEMP}/raTvReflectanceToSurfaceReflectanceImageFilter2.txt
-#       )      
-ENDIF(OTB_DATA_USE_LARGEINPUT)    
+#       )
+ENDIF(OTB_DATA_USE_LARGEINPUT)
 
 ADD_TEST(raTvRomaniaReflectanceToRomaniaSurfaceReflectanceImageFilter ${RADIOMETRY_TESTS3}
   --compare-image ${EPSILON_12}
-		  ${BASELINE}/raTvRomania_Correction.tif
-		  ${TEMP}/raTvRomaniaReflectanceToRomaniaSurfaceReflectanceImageFilter.tif
+                  ${BASELINE}/raTvRomania_Correction.tif
+                  ${TEMP}/raTvRomaniaReflectanceToRomaniaSurfaceReflectanceImageFilter.tif
         otbRomaniaReflectanceToRomaniaSurfaceReflectanceImageFilter
-		${BASELINE}/raTvRomania_Reflectance.tif
-		${TEMP}/raTvRomaniaReflectanceToRomaniaSurfaceReflectanceImageFilter.tif
-		${INPUTDATA}/romania_parameter.txt                           # atmo param;
-		${INPUTDATA}/RADIO_WAVELENGHT_SPECTRAL_BAND_SPOT4_1_B3.txt   # wavelengths, channel 3
-		${INPUTDATA}/RADIO_WAVELENGHT_SPECTRAL_BAND_SPOT4_1_B2.txt   # wavelengths, channel 2
-		${INPUTDATA}/RADIO_WAVELENGHT_SPECTRAL_BAND_SPOT4_1_B1.txt   # wavelengths, channel 1
-		${INPUTDATA}/RADIO_WAVELENGHT_SPECTRAL_BAND_SPOT4_1_MIR.txt  # wavelengths, channel 4
+                ${BASELINE}/raTvRomania_Reflectance.tif
+                ${TEMP}/raTvRomaniaReflectanceToRomaniaSurfaceReflectanceImageFilter.tif
+                ${INPUTDATA}/romania_parameter.txt                           # atmo param;
+                ${INPUTDATA}/RADIO_WAVELENGHT_SPECTRAL_BAND_SPOT4_1_B3.txt   # wavelengths, channel 3
+                ${INPUTDATA}/RADIO_WAVELENGHT_SPECTRAL_BAND_SPOT4_1_B2.txt   # wavelengths, channel 2
+                ${INPUTDATA}/RADIO_WAVELENGHT_SPECTRAL_BAND_SPOT4_1_B1.txt   # wavelengths, channel 1
+                ${INPUTDATA}/RADIO_WAVELENGHT_SPECTRAL_BAND_SPOT4_1_MIR.txt  # wavelengths, channel 4
       )
 
 # -------            otb::SurfaceAdjacencyEffect6SCorrectionSchemeFilter   ------------------------------
@@ -517,17 +517,17 @@ ADD_TEST(raTvSurfaceAdjacencyEffect6SCorrectionSchemeFilter ${RADIOMETRY_TESTS3}
 # --compare-ascii ${EPSILON_6} ${BASELINE_FILES}/raTvSurfaceAdjacencyEffect6SCorrectionSchemeFilterOutput6SVallues.txt
 #                           ${TEMP}/raTvSurfaceAdjacencyEffect6SCorrectionSchemeFilterOutput6SVallues.txt
         otbSurfaceAdjacencyEffect6SCorrectionSchemeFilter
-	${BASELINE}/raTvRomania_Correction.tif
-	${TEMP}/raTvSurfaceAdjacencyEffect6SCorrectionSchemeFilter.tif
-	2                                                            # Radius;
-	0.020                                                        # pixel spacing in kilometers
-	${INPUTDATA}/romania_parameter.txt                           # atmo param;
-	${INPUTDATA}/RADIO_WAVELENGHT_SPECTRAL_BAND_SPOT4_1_B3.txt   # wavelengths, channel 3
-	${INPUTDATA}/RADIO_WAVELENGHT_SPECTRAL_BAND_SPOT4_1_B2.txt   # wavelengths, channel 2
-	${INPUTDATA}/RADIO_WAVELENGHT_SPECTRAL_BAND_SPOT4_1_B1.txt   # wavelengths, channel 1
-	${INPUTDATA}/RADIO_WAVELENGHT_SPECTRAL_BAND_SPOT4_1_MIR.txt  # wavelengths, channel 4
-	# FOR plateform verification only : to remove when OK
-	${TEMP}/raTvSurfaceAdjacencyEffect6SCorrectionSchemeFilterOutput6SVallues.txt
+        ${BASELINE}/raTvRomania_Correction.tif
+        ${TEMP}/raTvSurfaceAdjacencyEffect6SCorrectionSchemeFilter.tif
+        2                                                            # Radius;
+        0.020                                                        # pixel spacing in kilometers
+        ${INPUTDATA}/romania_parameter.txt                           # atmo param;
+        ${INPUTDATA}/RADIO_WAVELENGHT_SPECTRAL_BAND_SPOT4_1_B3.txt   # wavelengths, channel 3
+        ${INPUTDATA}/RADIO_WAVELENGHT_SPECTRAL_BAND_SPOT4_1_B2.txt   # wavelengths, channel 2
+        ${INPUTDATA}/RADIO_WAVELENGHT_SPECTRAL_BAND_SPOT4_1_B1.txt   # wavelengths, channel 1
+        ${INPUTDATA}/RADIO_WAVELENGHT_SPECTRAL_BAND_SPOT4_1_MIR.txt  # wavelengths, channel 4
+        # FOR plateform verification only : to remove when OK
+        ${TEMP}/raTvSurfaceAdjacencyEffect6SCorrectionSchemeFilterOutput6SVallues.txt
 )
 
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -539,7 +539,7 @@ ADD_TEST(raTuAtmosphericCorrectionParametersTo6SAtmosphericRadiativeTermsNew ${R
 
 ADD_TEST(raTvAtmosphericCorrectionParametersTo6SAtmosphericRadiativeTerms ${RADIOMETRY_TESTS4}
 --compare-ascii ${EPSILON_4}
-		${BASELINE_FILES}/raTvSIXSTraitsComputeAtmosphericParametersTest.txt
+                ${BASELINE_FILES}/raTvSIXSTraitsComputeAtmosphericParametersTest.txt
                 ${TEMP}/raTvCorrectionTo6SRadiative.txt
         otbAtmosphericCorrectionParametersTo6SAtmosphericRadiativeTerms
                 ${INPUTDATA}/in6S_otb
@@ -548,7 +548,7 @@ ADD_TEST(raTvAtmosphericCorrectionParametersTo6SAtmosphericRadiativeTerms ${RADI
 
 ADD_TEST(raTvAtmosphericCorrectionSequencementTest ${RADIOMETRY_TESTS4}
         --compare-image ${EPSILON_10}
-		${BASELINE}/raTvRomaniaAtmosphericCorrectionSequencement.tif
+                ${BASELINE}/raTvRomaniaAtmosphericCorrectionSequencement.tif
                 ${TEMP}/raTvRomaniaAtmosphericCorrectionSequencement.tif
         otbAtmosphericCorrectionSequencementTest
         ${INPUTDATA}/Romania_Extract.tif
@@ -557,8 +557,8 @@ ADD_TEST(raTvAtmosphericCorrectionSequencementTest ${RADIOMETRY_TESTS4}
         ${INPUTDATA}/atmosphericCorrectionSequencement_alpha_beta.txt
 # LuminanceToReflectance parameters
         27.3    #elevation et azimuth solaire
-	4       #day
-	12      #month
+        4       #day
+        12      #month
         ${INPUTDATA}/atmosphericCorrectionSequencement_solar_illumination.txt
 # AtmosphericCorrectionParametersTo6SAtmosphericRadiativeTerms parameters
         152.7
@@ -572,8 +572,8 @@ ADD_TEST(raTvAtmosphericCorrectionSequencementTest ${RADIOMETRY_TESTS4}
         ${INPUTDATA}/atmosphericCorrectionSequencement_wavelength_spectral_bands_spot4_1.txt
 # ReflectanceToSurfaceReflectance parameters
 # SurfaceAdjacencyEffect6SCorrectionSchemeFilter parameters
-	2       # Radius;
-	0.020   # pixel spacing in kilometers
+        2       # Radius;
+        0.020   # pixel spacing in kilometers
         )
 
 
@@ -1116,15 +1116,15 @@ ADD_TEST(raTvAeronet_ArcachonLevel10_ExtractData ${RADIOMETRY_TESTS8}
 
 # -------            TerraSarBrightnessFunctor   ------------------------------
 ADD_TEST(raTvTerraSarBrightnessFunctor ${RADIOMETRY_TESTS9}
- --compare-ascii ${EPSILON_12}  
+ --compare-ascii ${EPSILON_12}
                                ${BASELINE_FILES}/raTvTerraSarBrightnessImageFunctor.txt
                                ${TEMP}/raTvTerraSarBrightnessImageFunctor.txt
         otbTerraSarBrightnessFunctor
-		12 # real pixel
-		12 # complex real part pixel
-		0  # complex imaginary part pixel
-		1  # calFactor
-		${TEMP}/raTvTerraSarBrightnessImageFunctor.txt
+                12 # real pixel
+                12 # complex real part pixel
+                0  # complex imaginary part pixel
+                1  # calFactor
+                ${TEMP}/raTvTerraSarBrightnessImageFunctor.txt
 )
 
 # -------            TerraSarBrightnessImageFilter   ------------------------------
@@ -1133,69 +1133,69 @@ ADD_TEST(raTuTerraSarBrightnessImageFilterNew ${RADIOMETRY_TESTS9}
 )
 
 ADD_TEST(raTvTerraSarBrightnessImageFilterTest ${RADIOMETRY_TESTS9}
-    --compare-image ${EPSILON_12}  
+    --compare-image ${EPSILON_12}
                 ${BASELINE}/raTvTerraSarBrightnessImageFilterTest.tif
                 ${TEMP}/raTvTerraSarBrightnessImageFilterTest.tif
         otbTerraSarBrightnessImageFilterTest
         ${INPUTDATA}/ExtractIMAGE_HH_SRA_strip_012.tif
         ${TEMP}/raTvTerraSarBrightnessImageFilterTest.tif
-	0 # don't use metadata
-	0 # results in linear scale
+        0 # don't use metadata
+        0 # results in linear scale
 )
 
 ADD_TEST(raTvTerraSarBrightnessImageComplexFilterTest ${RADIOMETRY_TESTS9}
-    --compare-image ${EPSILON_12}  
+    --compare-image ${EPSILON_12}
                 ${BASELINE}/raTvTerraSarBrightnessImageComplexFilterTest.tif
                 ${TEMP}/raTvTerraSarBrightnessImageComplexFilterTest.tif
         otbTerraSarBrightnessImageComplexFilterTest
         ${INPUTDATA}/ExtractIMAGE_HH_SRA_spot_074.tif
         ${TEMP}/raTvTerraSarBrightnessImageComplexFilterTest.tif
-	0 # don't use metadata
-	0 # results in linear scale
+        0 # don't use metadata
+        0 # results in linear scale
 )
 
 IF(OTB_DATA_USE_LARGEINPUT)
 ADD_TEST(raTvTerraSarBrightnessImageFilterUPSALA ${RADIOMETRY_TESTS9}
-    --compare-image ${EPSILON_12}  
+    --compare-image ${EPSILON_12}
                 ${BASELINE}/raTvTerraSarBrightnessImageFilter_UPSALA.tif
                 ${TEMP}/raTvTerraSarBrightnessImageFilter_UPSALA.tif
         otbTerraSarBrightnessImageFilterTest
         ${LARGEINPUT}/TERRASARX/UPSALA_GLACIER/TSX1_SAR__MGD/IMAGEDATA/IMAGE_HH_SRA_strip_012.tif
         ${TEMP}/raTvTerraSarBrightnessImageFilter_UPSALA.tif
-	1 # use metadata
-	0 # results in linear scale
-	2000 2000 250 250 # Extract
+        1 # use metadata
+        0 # results in linear scale
+        2000 2000 250 250 # Extract
 )
 
 ADD_TEST(raTvTerraSarBrightnessImageComplexFilterTORONTO ${RADIOMETRY_TESTS9}
-    --compare-image ${EPSILON_12}  
+    --compare-image ${EPSILON_12}
                 ${BASELINE}/raTvTerraSarBrightnessComplexImageFilter_TORONTO.tif
                 ${TEMP}/raTvTerraSarBrightnessImageComplexFilter_TORONTO.tif
         otbTerraSarBrightnessImageComplexFilterTest
         ${LARGEINPUT}/TERRASARX/TORONTO/TSX1_SAR__SSC/IMAGEDATA/IMAGE_HH_SRA_spot_074.cos
         ${TEMP}/raTvTerraSarBrightnessImageComplexFilter_TORONTO.tif
-	1 # use metadata
-	0 # results in linear scale
-	2000 2000 250 250 # Extract
+        1 # use metadata
+        0 # results in linear scale
+        2000 2000 250 250 # Extract
 )
 ENDIF(OTB_DATA_USE_LARGEINPUT)
 
 # -------            SarParametricMapFunction   ------------------------------
 ADD_TEST(raTuSarParametricMapFunction ${RADIOMETRY_TESTS9}
-	--compare-ascii ${NOTOL}
-		    ${BASELINE_FILES}/raTvSarParametricMapFunctionOutputAscii.txt
-	    	${TEMP}/raTvSarParametricMapFunctionOutputAscii.txt
+        --compare-ascii ${NOTOL}
+                    ${BASELINE_FILES}/raTvSarParametricMapFunctionOutputAscii.txt
+                    ${TEMP}/raTvSarParametricMapFunctionOutputAscii.txt
         otbSarParametricMapFunctionTest
-	 	${INPUTDATA}/scene.png
-	 	${TEMP}/raTvSarParametricMapFunctionOutputAscii.txt
+                 ${INPUTDATA}/scene.png
+                 ${TEMP}/raTvSarParametricMapFunctionOutputAscii.txt
 )
 ADD_TEST(raTvSarParametricMapFunctionToImageFilter  ${RADIOMETRY_TESTS9}
-	--compare-image ${EPSILON_12}
-	    	${BASELINE}/raTvSarParametricMapFunctionToImageFilter.tif
-	    	${TEMP}/raTvSarParametricMapFunctionToImageFilter.tif
+        --compare-image ${EPSILON_12}
+                    ${BASELINE}/raTvSarParametricMapFunctionToImageFilter.tif
+                    ${TEMP}/raTvSarParametricMapFunctionToImageFilter.tif
         otbSarParametricMapFunctionToImageFilter
-	    ${TEMP}/raTvSarParametricMapFunctionToImageFilter.tif
-	    100 200 # image size
+            ${TEMP}/raTvSarParametricMapFunctionToImageFilter.tif
+            100 200 # image size
 )
 
 
@@ -1208,103 +1208,103 @@ ADD_TEST(raTuSarRadiometricCalibrationFunctorWithoutNoise ${RADIOMETRY_TESTS9}
 )
 # -------            SarRadiometricCalibrationFunction   ------------------------------
 ADD_TEST(raTvSarRadiometricCalibrationFunction ${RADIOMETRY_TESTS9}
-	--compare-ascii ${NOTOL}
-		  ${BASELINE_FILES}/raTvSarRadiometricCalibrationFunctionOutputAscii.txt
-	      ${TEMP}/raTvSarRadiometricCalibrationFunctionOutputAsciiWithNoise.txt
+        --compare-ascii ${NOTOL}
+                  ${BASELINE_FILES}/raTvSarRadiometricCalibrationFunctionOutputAscii.txt
+              ${TEMP}/raTvSarRadiometricCalibrationFunctionOutputAsciiWithNoise.txt
         otbSarRadiometricCalibrationFunction
-	 	  ${INPUTDATA}/scene.png
-	 	  ${TEMP}/raTvSarRadiometricCalibrationFunctionOutputAsciiWithNoise.txt
+                   ${INPUTDATA}/scene.png
+                   ${TEMP}/raTvSarRadiometricCalibrationFunctionOutputAsciiWithNoise.txt
 )
 ADD_TEST(raTvSarRadiometricCalibrationFunctionWithoutNoise ${RADIOMETRY_TESTS9}
-	--compare-ascii ${NOTOL}
-		  ${BASELINE_FILES}/raTvSarRadiometricCalibrationFunctionOutputAscii.txt
-	      ${TEMP}/raTvSarRadiometricCalibrationFunctionOutputAsciiWithoutNoise.txt
+        --compare-ascii ${NOTOL}
+                  ${BASELINE_FILES}/raTvSarRadiometricCalibrationFunctionOutputAscii.txt
+              ${TEMP}/raTvSarRadiometricCalibrationFunctionOutputAsciiWithoutNoise.txt
         otbSarRadiometricCalibrationFunctionWithoutNoise
-	 	  ${INPUTDATA}/scene.png
-	 	  ${TEMP}/raTvSarRadiometricCalibrationFunctionOutputAsciiWithoutNoise.txt
+                   ${INPUTDATA}/scene.png
+                   ${TEMP}/raTvSarRadiometricCalibrationFunctionOutputAsciiWithoutNoise.txt
 )
 
 # -------  SarRadiometricCalibrationToImageFilter   ------------------------------
 
 IF(OTB_DATA_USE_LARGEINPUT)
 
-# Read data with a complex IFreader (Input data type = CInt16) and done ExtractROIFilter 
+# Read data with a complex IFreader (Input data type = CInt16) and done ExtractROIFilter
 # after RadiometricCalibFilter.
   ADD_TEST(raTvSarRadiometricCalibrationToImageWithComplexPixelFilter_TSX_PANGKALANBUUN  ${RADIOMETRY_TESTS9}
-	    --compare-image ${EPSILON_12}
-	    	${BASELINE}/raTvSarRadiometricCalibrationToImageFilter_TSX_PANGKALANBUUN_HH.tif
-	    	${TEMP}/raTvSarRadiometricCalibrationToImageFilter_TSX_PANGKALANBUUN_HH.tif
+            --compare-image ${EPSILON_12}
+                    ${BASELINE}/raTvSarRadiometricCalibrationToImageFilter_TSX_PANGKALANBUUN_HH.tif
+                    ${TEMP}/raTvSarRadiometricCalibrationToImageFilter_TSX_PANGKALANBUUN_HH.tif
         otbSarRadiometricCalibrationToImageFilterWithComplexPixelTest
-	        ${LARGEINPUT}/TERRASARX/PANGKALANBUUN/IMAGEDATA/IMAGE_HH_SRA_stripFar_008.cos
-	        ${TEMP}/raTvSarRadiometricCalibrationToImageFilter_TSX_PANGKALANBUUN_HH.tif
-	        1000 1000 250 250 # Extract
+                ${LARGEINPUT}/TERRASARX/PANGKALANBUUN/IMAGEDATA/IMAGE_HH_SRA_stripFar_008.cos
+                ${TEMP}/raTvSarRadiometricCalibrationToImageFilter_TSX_PANGKALANBUUN_HH.tif
+                1000 1000 250 250 # Extract
           )
 
-# Read data with a complex IFreader (Input data type = CInt16) and done ExtractROIFilter 
-# after RadiometricCalibFilter without take into account Noise. 
+# Read data with a complex IFreader (Input data type = CInt16) and done ExtractROIFilter
+# after RadiometricCalibFilter without take into account Noise.
   ADD_TEST(raTvSarRadiometricCalibrationToImageWithComplexPixelFilterWithoutNoise_TSX_PANGKALANBUUN  ${RADIOMETRY_TESTS9}
-	    --compare-image ${EPSILON_12}
-	    	${BASELINE}/raTvSarRadiometricCalibrationToImageFilter_TSX_PANGKALANBUUN_HH_WN.tif
-	    	${TEMP}/raTvSarRadiometricCalibrationToImageFilter_TSX_PANGKALANBUUN_HH_WN.tif
+            --compare-image ${EPSILON_12}
+                    ${BASELINE}/raTvSarRadiometricCalibrationToImageFilter_TSX_PANGKALANBUUN_HH_WN.tif
+                    ${TEMP}/raTvSarRadiometricCalibrationToImageFilter_TSX_PANGKALANBUUN_HH_WN.tif
         otbSarRadiometricCalibrationToImageFilterWithComplexPixelTestWithoutNoise
-	        ${LARGEINPUT}/TERRASARX/PANGKALANBUUN/IMAGEDATA/IMAGE_HH_SRA_stripFar_008.cos
-	        ${TEMP}/raTvSarRadiometricCalibrationToImageFilter_TSX_PANGKALANBUUN_HH_WN.tif
-	        1000 1000 250 250 # Extract
-          )    
+                ${LARGEINPUT}/TERRASARX/PANGKALANBUUN/IMAGEDATA/IMAGE_HH_SRA_stripFar_008.cos
+                ${TEMP}/raTvSarRadiometricCalibrationToImageFilter_TSX_PANGKALANBUUN_HH_WN.tif
+                1000 1000 250 250 # Extract
+          )
 
-# Read data with a scalar IFreader (Input data type = CInt16) and done ExtractROIFilter 
-# after RadiometricCalibFilter. 
+# Read data with a scalar IFreader (Input data type = CInt16) and done ExtractROIFilter
+# after RadiometricCalibFilter.
   ADD_TEST(raTvSarRadiometricCalibrationToImageWithRealPixelFilter_TSX_PANGKALANBUUN  ${RADIOMETRY_TESTS9}
-	    --compare-image ${EPSILON_12}
-	    	${BASELINE}/raTvSarRadiometricCalibrationToImageFilter_TSX_PANGKALANBUUN_HH.tif
-	    	${TEMP}/raTvSarRadiometricCalibrationToImageFilterRealPixel_TSX_PANGKALANBUUN_HH.tif
+            --compare-image ${EPSILON_12}
+                    ${BASELINE}/raTvSarRadiometricCalibrationToImageFilter_TSX_PANGKALANBUUN_HH.tif
+                    ${TEMP}/raTvSarRadiometricCalibrationToImageFilterRealPixel_TSX_PANGKALANBUUN_HH.tif
         otbSarRadiometricCalibrationToImageFilterWithRealPixelTest
-	        ${LARGEINPUT}/TERRASARX/PANGKALANBUUN/IMAGEDATA/IMAGE_HH_SRA_stripFar_008.cos
-	        ${TEMP}/raTvSarRadiometricCalibrationToImageFilterRealPixel_TSX_PANGKALANBUUN_HH.tif
-	         1000 1000 250 250 # Extract
+                ${LARGEINPUT}/TERRASARX/PANGKALANBUUN/IMAGEDATA/IMAGE_HH_SRA_stripFar_008.cos
+                ${TEMP}/raTvSarRadiometricCalibrationToImageFilterRealPixel_TSX_PANGKALANBUUN_HH.tif
+                 1000 1000 250 250 # Extract
           )
           
-# Read data with a complex IFreader (Input data type = CInt16) and done ExtractROIFilter 
-# before RadiometricCalibFilter. 
+# Read data with a complex IFreader (Input data type = CInt16) and done ExtractROIFilter
+# before RadiometricCalibFilter.
   ADD_TEST(raTvSarRadiometricCalibrationToImagePixelFilterWithExtractROIBefore_TSX_PANGKALANBUUN  ${RADIOMETRY_TESTS9}
-	    --compare-image ${EPSILON_12}
-	    	${BASELINE}/raTvSarRadiometricCalibrationToImageFilterWithExtractROIBefore_TSX_PANGKALANBUUN_HH.tif
-	    	${TEMP}/raTvSarRadiometricCalibrationToImageFilterWithExtractROIBefore_TSX_PANGKALANBUUN_HH.tif
+            --compare-image ${EPSILON_12}
+                    ${BASELINE}/raTvSarRadiometricCalibrationToImageFilterWithExtractROIBefore_TSX_PANGKALANBUUN_HH.tif
+                    ${TEMP}/raTvSarRadiometricCalibrationToImageFilterWithExtractROIBefore_TSX_PANGKALANBUUN_HH.tif
         otbSarRadiometricCalibrationToImageFilterWithExtractROIBeforeTest
-	    ${LARGEINPUT}/TERRASARX/PANGKALANBUUN/IMAGEDATA/IMAGE_HH_SRA_stripFar_008.cos
-	        ${TEMP}/raTvSarRadiometricCalibrationToImageFilterWithExtractROIBefore_TSX_PANGKALANBUUN_HH.tif
-	        1000 1000 250 250 # Extract
+            ${LARGEINPUT}/TERRASARX/PANGKALANBUUN/IMAGEDATA/IMAGE_HH_SRA_stripFar_008.cos
+                ${TEMP}/raTvSarRadiometricCalibrationToImageFilterWithExtractROIBefore_TSX_PANGKALANBUUN_HH.tif
+                1000 1000 250 250 # Extract
           )
 
-# Read data with a complex IFreader (Input data type = CInt16) and compare the result of 
-# CReader->SarRadiometricCalibFilter with CReader->ModulusFilter->SarRadiometricCalibFilter 
+# Read data with a complex IFreader (Input data type = CInt16) and compare the result of
+# CReader->SarRadiometricCalibFilter with CReader->ModulusFilter->SarRadiometricCalibFilter
   ADD_TEST(raTvSarRadiometricCalibrationToImageCompareFilter_TSX_PANGKALANBUUN  ${RADIOMETRY_TESTS9}
         otbSarRadiometricCalibrationToImageFilterCompareTest
-	       ${LARGEINPUT}/TERRASARX/PANGKALANBUUN/IMAGEDATA/IMAGE_HH_SRA_stripFar_008.cos
-	       1000 1000 250 250 # Extract
+               ${LARGEINPUT}/TERRASARX/PANGKALANBUUN/IMAGEDATA/IMAGE_HH_SRA_stripFar_008.cos
+               1000 1000 250 250 # Extract
           )
 
 
 # Read data with a complex IFreader (Input data type = CInt16)
   ADD_TEST(raTvSarRadiometricCalibrationToImageWithComplexPixelFilter_TSX_TORONTO ${RADIOMETRY_TESTS9}
-        --compare-image ${EPSILON_12}  
+        --compare-image ${EPSILON_12}
            ${BASELINE}/raTvSarRadiometricCalibrationToImageFilter_TSX_TORONTO.tif
            ${TEMP}/raTvSarRadiometricCalibrationToImageFilter_TSX_TORONTO.tif
         otbSarRadiometricCalibrationToImageFilterWithComplexPixelTest
            ${LARGEINPUT}/TERRASARX/TORONTO/TSX1_SAR__SSC/IMAGEDATA/IMAGE_HH_SRA_spot_074.cos
            ${TEMP}/raTvSarRadiometricCalibrationToImageFilter_TSX_TORONTO.tif
-		   2000 2000 250 250 # Extract
+                   2000 2000 250 250 # Extract
           )
 
 # Read data with a scalar IFreader (Input data type = UInt16)
   ADD_TEST(raTvSarRadiometricCalibrationToImageWithRealPixelFilter_TSX_UPSALA ${RADIOMETRY_TESTS9}
-        --compare-image ${EPSILON_12}  
+        --compare-image ${EPSILON_12}
            ${BASELINE}/raTvSarRadiometricCalibrationToImageFilter_TSX_UPSALA.tif
            ${TEMP}/raTvSarRadiometricCalibrationToImageFilter_TSX_UPSALA.tif
         otbSarRadiometricCalibrationToImageFilterWithRealPixelTest
            ${LARGEINPUT}/TERRASARX/UPSALA_GLACIER/TSX1_SAR__MGD/IMAGEDATA/IMAGE_HH_SRA_strip_012.tif
            ${TEMP}/raTvSarRadiometricCalibrationToImageFilter_TSX_UPSALA.tif
-	       2000 2000 250 250 # Extract
+               2000 2000 250 250 # Extract
           )
 
 ENDIF(OTB_DATA_USE_LARGEINPUT)
@@ -1319,21 +1319,21 @@ ADD_TEST(raTuSarBrightnessFunctorWithoutNoise ${RADIOMETRY_TESTS9}
 
 # -------            SarBrightnessFunction   ------------------------------
 ADD_TEST(raTvSarBrightnessFunction ${RADIOMETRY_TESTS9}
-	--compare-ascii ${NOTOL}
-	    	${BASELINE_FILES}/raTvSarBrightnessFunctionOutputAscii.txt
-	    	${TEMP}/raTvSarBrightnessFunctionOutputAsciiWithNoise.txt
+        --compare-ascii ${NOTOL}
+                    ${BASELINE_FILES}/raTvSarBrightnessFunctionOutputAscii.txt
+                    ${TEMP}/raTvSarBrightnessFunctionOutputAsciiWithNoise.txt
         otbSarBrightnessFunction
-	 	${INPUTDATA}/scene.png
-	 	${TEMP}/raTvSarBrightnessFunctionOutputAsciiWithNoise.txt
+                 ${INPUTDATA}/scene.png
+                 ${TEMP}/raTvSarBrightnessFunctionOutputAsciiWithNoise.txt
 )
 
 ADD_TEST(raTvSarBrightnessFunctionWithoutNoise ${RADIOMETRY_TESTS9}
-	--compare-ascii ${NOTOL}
-	    	${BASELINE_FILES}/raTvSarBrightnessFunctionOutputAscii.txt
-	    	${TEMP}/raTvSarBrightnessFunctionOutputAsciiWithoutNoise.txt
+        --compare-ascii ${NOTOL}
+                    ${BASELINE_FILES}/raTvSarBrightnessFunctionOutputAscii.txt
+                    ${TEMP}/raTvSarBrightnessFunctionOutputAsciiWithoutNoise.txt
         otbSarBrightnessFunctionWithoutNoise
-	 	${INPUTDATA}/scene.png
-	 	${TEMP}/raTvSarBrightnessFunctionOutputAsciiWithoutNoise.txt
+                 ${INPUTDATA}/scene.png
+                 ${TEMP}/raTvSarBrightnessFunctionOutputAsciiWithoutNoise.txt
 )
 
 # ------- SarBrightnessToImageFilter   ------------------------------
@@ -1341,36 +1341,36 @@ IF(OTB_DATA_USE_LARGEINPUT)
 
 # Read data with a scalar IFreader (Input data type = CInt16)
   ADD_TEST(raTvSarBrightnessToImageFilter  ${RADIOMETRY_TESTS9}
-	    --compare-image ${EPSILON_12}
-	    	${BASELINE}/raTvSarBrightnessToImageFilter_TSX_PANGKALANBUUN_HH.tif
-	    	${TEMP}/raTvSarBrightnessToImageFilter_TSX_PANGKALANBUUN_HH.tif
+            --compare-image ${EPSILON_12}
+                    ${BASELINE}/raTvSarBrightnessToImageFilter_TSX_PANGKALANBUUN_HH.tif
+                    ${TEMP}/raTvSarBrightnessToImageFilter_TSX_PANGKALANBUUN_HH.tif
         otbSarBrightnessToImageFilterTest
-	        ${LARGEINPUT}/TERRASARX/PANGKALANBUUN/IMAGEDATA/IMAGE_HH_SRA_stripFar_008.cos
-	        ${TEMP}/raTvSarBrightnessToImageFilter_TSX_PANGKALANBUUN_HH.tif
-	        1000 1000 250 250 # Extract
+                ${LARGEINPUT}/TERRASARX/PANGKALANBUUN/IMAGEDATA/IMAGE_HH_SRA_stripFar_008.cos
+                ${TEMP}/raTvSarBrightnessToImageFilter_TSX_PANGKALANBUUN_HH.tif
+                1000 1000 250 250 # Extract
           )
 
-# Read data with a real IFreader (Input data type = CInt16) and done ExtractROIFilter 
-# after BrightnessCalibFilter without take into account Noise. 
+# Read data with a real IFreader (Input data type = CInt16) and done ExtractROIFilter
+# after BrightnessCalibFilter without take into account Noise.
   ADD_TEST(raTvSarBrightnessToImageFilterWithoutNoise  ${RADIOMETRY_TESTS9}
-	    --compare-image ${EPSILON_12}
-	    	${BASELINE}/raTvSarBrightnessToImageFilter_TSX_PANGKALANBUUN_HH_WN.tif
-	    	${TEMP}/raTvSarBrightnessToImageFilter_TSX_PANGKALANBUUN_HH_WN.tif
+            --compare-image ${EPSILON_12}
+                    ${BASELINE}/raTvSarBrightnessToImageFilter_TSX_PANGKALANBUUN_HH_WN.tif
+                    ${TEMP}/raTvSarBrightnessToImageFilter_TSX_PANGKALANBUUN_HH_WN.tif
         otbSarBrightnessToImageFilterTestWithoutNoise
-	        ${LARGEINPUT}/TERRASARX/PANGKALANBUUN/IMAGEDATA/IMAGE_HH_SRA_stripFar_008.cos
-	        ${TEMP}/raTvSarBrightnessToImageFilter_TSX_PANGKALANBUUN_HH_WN.tif
-	        1000 1000 250 250 # Extract
+                ${LARGEINPUT}/TERRASARX/PANGKALANBUUN/IMAGEDATA/IMAGE_HH_SRA_stripFar_008.cos
+                ${TEMP}/raTvSarBrightnessToImageFilter_TSX_PANGKALANBUUN_HH_WN.tif
+                1000 1000 250 250 # Extract
           )
 
 # Read data with a scalar IFreader (Input data type = CInt16)
 ADD_TEST(raTvSarBrightnessToImageWithComplexPixelFilter  ${RADIOMETRY_TESTS9}
-	    --compare-image ${EPSILON_12}
-	    	${BASELINE}/raTvSarBrightnessToImageFilter_TSX_PANGKALANBUUN_HH.tif
-	    	${TEMP}/raTvSarBrightnessToImageFilterComplexPixel_TSX_PANGKALANBUUN_HH.tif
+            --compare-image ${EPSILON_12}
+                    ${BASELINE}/raTvSarBrightnessToImageFilter_TSX_PANGKALANBUUN_HH.tif
+                    ${TEMP}/raTvSarBrightnessToImageFilterComplexPixel_TSX_PANGKALANBUUN_HH.tif
         otbSarBrightnessToImageWithComplexPixelFilterTest
-	        ${LARGEINPUT}/TERRASARX/PANGKALANBUUN/IMAGEDATA/IMAGE_HH_SRA_stripFar_008.cos
-	        ${TEMP}/raTvSarBrightnessToImageFilterComplexPixel_TSX_PANGKALANBUUN_HH.tif
-	        1000 1000 250 250 # Extract
+                ${LARGEINPUT}/TERRASARX/PANGKALANBUUN/IMAGEDATA/IMAGE_HH_SRA_stripFar_008.cos
+                ${TEMP}/raTvSarBrightnessToImageFilterComplexPixel_TSX_PANGKALANBUUN_HH.tif
+                1000 1000 250 250 # Extract
         )
 
 ENDIF(OTB_DATA_USE_LARGEINPUT)
diff --git a/Testing/Code/SARPolarimetry/CMakeLists.txt b/Testing/Code/SARPolarimetry/CMakeLists.txt
index 2c6587ef2e7575238680eb6cb82b5cc876207082..ac56a2ac397709499691c366f9e19c62e04fda7f 100644
--- a/Testing/Code/SARPolarimetry/CMakeLists.txt
+++ b/Testing/Code/SARPolarimetry/CMakeLists.txt
@@ -44,7 +44,7 @@ ADD_TEST(saTvPolarimetricSynthesisFilter ${SARPOLARIMETRY_TESTS1}
          22.0     # KhiI
          58.0     # PsiR
          45.0     # KhiR
-	)
+        )
 
  # With 3 channels
 ADD_TEST(saTvHHnHVnVVPolarimetricSynthesisFilter ${SARPOLARIMETRY_TESTS1}
@@ -59,7 +59,7 @@ ADD_TEST(saTvHHnHVnVVPolarimetricSynthesisFilter ${SARPOLARIMETRY_TESTS1}
          22.0
          58.0
          45.0
-	)
+        )
 
  # With HH and HV channels
 ADD_TEST(saTvHHnHVPolarimetricSynthesisFilter ${SARPOLARIMETRY_TESTS1}
@@ -73,7 +73,7 @@ ADD_TEST(saTvHHnHVPolarimetricSynthesisFilter ${SARPOLARIMETRY_TESTS1}
          22.0
          58.0
          45.0
-	)
+        )
 
 # With VH and VV channels
 ADD_TEST(saTvVHnVVPolarimetricSynthesisFilter ${SARPOLARIMETRY_TESTS1}
@@ -87,11 +87,11 @@ ADD_TEST(saTvVHnVVPolarimetricSynthesisFilter ${SARPOLARIMETRY_TESTS1}
          22.0
          58.0
          45.0
-	)
+        )
 
 ADD_TEST(saTuMultiChannelsPolarimetricSynthesisFilterNew ${SARPOLARIMETRY_TESTS1}
         otbMultiChannelsPolarimetricSynthesisFilterNew
-	)
+        )
 
 # With vector image HH, HV, VH and VV channels
 IF(OTB_DATA_USE_LARGEINPUT)
@@ -105,7 +105,7 @@ ADD_TEST(saTvVectorMultiChannelsPolarimetricSynthesisFilter ${SARPOLARIMETRY_TES
          0.0     # KhiI
          0.0     # PsiR
          0.0     # KhiR
-	)
+        )
 ENDIF(OTB_DATA_USE_LARGEINPUT)
 
 
@@ -122,45 +122,45 @@ ADD_TEST(saTvMultiChannelsPolarimetricSynthesisFilter ${SARPOLARIMETRY_TESTS1}
          22.0     # KhiI
          58.0     # PsiR
          45.0     # KhiR
-	)
+        )
 
 # otbSinclairToCircularCovarianceMatrixFunctor
 ADD_TEST(saTuSinclairToCircularCovarianceMatrixFunctor ${SARPOLARIMETRY_TESTS1}
-		otbSinclairToCircularCovarianceMatrixFunctor
+                otbSinclairToCircularCovarianceMatrixFunctor
 )
 
 # otbSinclairToMuellerMatrixFunctor
 ADD_TEST(saTuSinclairToMuellerMatrixFunctor ${SARPOLARIMETRY_TESTS1}
-		otbSinclairToMuellerMatrixFunctor
+                otbSinclairToMuellerMatrixFunctor
 )
 
 # otbSinclairToReciprocalCovariancMatrixeFunctor
 ADD_TEST(saTuSinclairToReciprocalCovarianceMatrixFunctor ${SARPOLARIMETRY_TESTS1}
-		otbSinclairToReciprocalCovarianceMatrixFunctor
+                otbSinclairToReciprocalCovarianceMatrixFunctor
 )
 
 # otbSinclairToCoherencyFunctor
 ADD_TEST(saTuSinclairToCoherencyMatrixFunctor ${SARPOLARIMETRY_TESTS1}
-		otbSinclairToCoherencyMatrixFunctor
+                otbSinclairToCoherencyMatrixFunctor
 )
 
 # otbSinclairToReciprocalCircularCovarianceMatrixFunctor
 ADD_TEST(saTuSinclairToReciprocalCircularCovarianceMatrixFunctor ${SARPOLARIMETRY_TESTS1}
-		otbSinclairToReciprocalCircularCovarianceMatrixFunctor
+                otbSinclairToReciprocalCircularCovarianceMatrixFunctor
 )
 
 # otbSinclairToCovarianceFunctor
 ADD_TEST(saTuSinclairToCovarianceMatrixFunctor ${SARPOLARIMETRY_TESTS1}
-		otbSinclairToCovarianceMatrixFunctor
+                otbSinclairToCovarianceMatrixFunctor
 )
 
 # otbSinclairToReciprocalCoherencyFunctor
 ADD_TEST(saTuSinclairToReciprocalCoherencyMatrixFunctor ${SARPOLARIMETRY_TESTS1}
-		otbSinclairToReciprocalCoherencyMatrixFunctor
+                otbSinclairToReciprocalCoherencyMatrixFunctor
 )
 
 ADD_TEST(saTuSinclairImageFilterNew ${SARPOLARIMETRY_TESTS1}
-		otbSinclairImageFilterNew
+                otbSinclairImageFilterNew
 )
 
 # Sinclair To Covariance Image Filter
@@ -173,7 +173,7 @@ ADD_TEST(saTvSinclairImageFilter_SinclairToCovariance ${SARPOLARIMETRY_TESTS1}
         ${INPUTDATA}/RSAT_imagery_HV.tif
         ${INPUTDATA}/RSAT_imagery_VV.tif
         ${TEMP}/saTvSinclairImageFilter_SinclairToCovariance.tif
-	)
+        )
 
 # Sinclair To Circular Covariance Image Filter
 ADD_TEST(saTvSinclairImageFilter_SinclairToCircularCovarianceMatrix ${SARPOLARIMETRY_TESTS1}
@@ -185,7 +185,7 @@ ADD_TEST(saTvSinclairImageFilter_SinclairToCircularCovarianceMatrix ${SARPOLARIM
         ${INPUTDATA}/RSAT_imagery_HV.tif
         ${INPUTDATA}/RSAT_imagery_VV.tif
         ${TEMP}/saTvSinclairImageFilter_SinclairToCircularCovarianceMatrix.tif
-	)
+        )
 
 # Sinclair To Coherency Image Filter
 ADD_TEST(saTvSinclairImageFilter_SinclairToCoherency ${SARPOLARIMETRY_TESTS1}
@@ -197,7 +197,7 @@ ADD_TEST(saTvSinclairImageFilter_SinclairToCoherency ${SARPOLARIMETRY_TESTS1}
         ${INPUTDATA}/RSAT_imagery_HV.tif
         ${INPUTDATA}/RSAT_imagery_VV.tif
         ${TEMP}/saTvSinclairImageFilter_SinclairToCoherency.tif
-	)
+        )
 
 # Sinclair To Mueller Image Filter
 ADD_TEST(saTvSinclairImageFilter_SinclairToMueller ${SARPOLARIMETRY_TESTS1}
@@ -209,11 +209,11 @@ ADD_TEST(saTvSinclairImageFilter_SinclairToMueller ${SARPOLARIMETRY_TESTS1}
         ${INPUTDATA}/RSAT_imagery_HV.tif
         ${INPUTDATA}/RSAT_imagery_VV.tif
         ${TEMP}/saTvSinclairImageFilter_SinclairToMueller.tif
-	)
+        )
 
 
 ADD_TEST(saTuSinclairReciprocalImageFilterNew ${SARPOLARIMETRY_TESTS1}
-		otbSinclairReciprocalImageFilterNew
+                otbSinclairReciprocalImageFilterNew
 )
 
 # Sinclair To Reciprocal Covariance Image Filter
@@ -226,7 +226,7 @@ ADD_TEST(saTvSinclairReciprocalImageFilter_SinclairToReciprocalCovariance ${SARP
         ${INPUTDATA}/RSAT_imagery_HV.tif
         ${INPUTDATA}/RSAT_imagery_VV.tif
         ${TEMP}/saTvSinclairImageFilter_SinclairToReciprocalCovariance.tif
-	)
+        )
 
 # Sinclair To Reciprocal Circular Covariance Image Filter
 ADD_TEST(saTvSinclairReciprocalImageFilter_SinclairToReciprocalCircularCovarianceMatrix ${SARPOLARIMETRY_TESTS1}
@@ -238,7 +238,7 @@ ADD_TEST(saTvSinclairReciprocalImageFilter_SinclairToReciprocalCircularCovarianc
         ${INPUTDATA}/RSAT_imagery_HV.tif
         ${INPUTDATA}/RSAT_imagery_VV.tif
         ${TEMP}/saTvSinclairImageFilter_SinclairToReciprocalCircularCovarianceMatrix.tif
-	)
+        )
 
 # Sinclair To Reciprocal Coherency Image Filter
 ADD_TEST(saTvSinclairReciprocalImageFilter_SinclairToReciprocalCoherency ${SARPOLARIMETRY_TESTS1}
@@ -250,7 +250,7 @@ ADD_TEST(saTvSinclairReciprocalImageFilter_SinclairToReciprocalCoherency ${SARPO
         ${INPUTDATA}/RSAT_imagery_HV.tif
         ${INPUTDATA}/RSAT_imagery_VV.tif
         ${TEMP}/saTvSinclairImageFilter_SinclairToReciprocalCoherency.tif
-	)
+        )
 
 
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -260,7 +260,7 @@ ADD_TEST(saTvSinclairReciprocalImageFilter_SinclairToReciprocalCoherency ${SARPO
 
 # Reciprocal Covariance To Coherency Image Filter
 ADD_TEST(saTuReciprocalCovarianceToReciprocalCoherencyImageFilterNew ${SARPOLARIMETRY_TESTS2}
-		otbReciprocalCovarianceToReciprocalCoherencyImageFilterNew
+                otbReciprocalCovarianceToReciprocalCoherencyImageFilterNew
 )
 
 ADD_TEST(saTvReciprocalCovarianceToReciprocalCoherencyImageFilter ${SARPOLARIMETRY_TESTS2}
@@ -269,11 +269,11 @@ ADD_TEST(saTvReciprocalCovarianceToReciprocalCoherencyImageFilter ${SARPOLARIMET
         otbReciprocalCovarianceToReciprocalCoherencyImageFilter
         ${BASELINE}/saTvSinclairImageFilter_SinclairToReciprocalCovariance.tif
         ${TEMP}/saTvMLCToCoherencyImageFilter.tif
-	)
+        )
 
 # Reciprocal Covariance To Coherency Degree Image Filter
 ADD_TEST(saTuReciprocalCovarianceToCoherencyDegreeImageFilterNew ${SARPOLARIMETRY_TESTS2}
-		otbReciprocalCovarianceToCoherencyDegreeImageFilterNew
+                otbReciprocalCovarianceToCoherencyDegreeImageFilterNew
 )
 
 ADD_TEST(saTvReciprocalCovarianceToCoherencyDegreeImageFilter ${SARPOLARIMETRY_TESTS2}
@@ -282,11 +282,11 @@ ADD_TEST(saTvReciprocalCovarianceToCoherencyDegreeImageFilter ${SARPOLARIMETRY_T
         otbReciprocalCovarianceToCoherencyDegreeImageFilter
         ${BASELINE}/saTvSinclairImageFilter_SinclairToReciprocalCovariance.tif
         ${TEMP}/saTvMLCToCoherencyDegreeImageFilter.tif
-	)
+        )
 
 # Reciprocal Covariance To Circular Coherency Degree Image Filter
 ADD_TEST(saTuReciprocalLinearCovarianceToReciprocalCircularCovarianceImageFilterNew ${SARPOLARIMETRY_TESTS2}
-		otbReciprocalLinearCovarianceToReciprocalCircularCovarianceImageFilterNew
+                otbReciprocalLinearCovarianceToReciprocalCircularCovarianceImageFilterNew
 )
 
 ADD_TEST(saTvReciprocalLinearCovarianceToReciprocalCircularCovarianceImageFilter ${SARPOLARIMETRY_TESTS2}
@@ -295,11 +295,11 @@ ADD_TEST(saTvReciprocalLinearCovarianceToReciprocalCircularCovarianceImageFilter
         otbReciprocalLinearCovarianceToReciprocalCircularCovarianceImageFilter
         ${BASELINE}/saTvSinclairImageFilter_SinclairToReciprocalCovariance.tif
         ${TEMP}/saTvMLCToCircularCoherencyDegreeImageFilter.tif
-	)
+        )
 
 # Reciprocal H Alpha Image Filter
 ADD_TEST(saTuReciprocalHAlphaImageFilterNew ${SARPOLARIMETRY_TESTS2}
-		otbReciprocalHAlphaImageFilterNew
+                otbReciprocalHAlphaImageFilterNew
 )
 
 ADD_TEST(saTvReciprocalHAlphaImageFilter ${SARPOLARIMETRY_TESTS2}
@@ -308,11 +308,11 @@ ADD_TEST(saTvReciprocalHAlphaImageFilter ${SARPOLARIMETRY_TESTS2}
         otbReciprocalHAlphaImageFilter
         ${BASELINE}/saTvSinclairImageFilter_SinclairToReciprocalCoherency.tif
         ${TEMP}/saTvReciprocalHAlphaImageFilter.tif
-	)
+        )
 
 # Reciprocal Coherency To Mueller Image Filter
 ADD_TEST(saTuReciprocalCoherencyToReciprocalMuellerImageFilterNew ${SARPOLARIMETRY_TESTS2}
-		otbReciprocalCoherencyToReciprocalMuellerImageFilterNew
+                otbReciprocalCoherencyToReciprocalMuellerImageFilterNew
 )
 
 ADD_TEST(saTvReciprocalCoherencyToReciprocalMuellerImageFilter ${SARPOLARIMETRY_TESTS2}
@@ -321,11 +321,11 @@ ADD_TEST(saTvReciprocalCoherencyToReciprocalMuellerImageFilter ${SARPOLARIMETRY_
         otbReciprocalCoherencyToReciprocalMuellerImageFilter
         ${BASELINE}/saTvSinclairImageFilter_SinclairToReciprocalCoherency.tif
         ${TEMP}/saTvReciprocalCoherencyToMuellerImageFilter.tif
-	)
+        )
 
 # Mueller To polarisation degree and power Image Filter
 ADD_TEST(saTuMuellerToPolarisationDegreeAndPowerImageFilterNew ${SARPOLARIMETRY_TESTS2}
-		otbMuellerToPolarisationDegreeAndPowerImageFilterNew
+                otbMuellerToPolarisationDegreeAndPowerImageFilterNew
 )
 
 ADD_TEST(saTvMuellerToPolarisationDegreeAndPowerImageFilter ${SARPOLARIMETRY_TESTS2}
@@ -334,15 +334,15 @@ ADD_TEST(saTvMuellerToPolarisationDegreeAndPowerImageFilter ${SARPOLARIMETRY_TES
         otbMuellerToPolarisationDegreeAndPowerImageFilter
         ${BASELINE}/saTvSinclairImageFilter_SinclairToMueller.tif
         ${TEMP}/saTvMuellerToPolarisationDegreeAndPowerImageFilter.tif
-	)
+        )
 
 # Mueller To Covariance Image Filter
 ADD_TEST(saTvMuellerToReciprocalCovarianceFunctor ${SARPOLARIMETRY_TESTS2}
-		otbMuellerToReciprocalCovarianceFunctor
+                otbMuellerToReciprocalCovarianceFunctor
 )
 
 ADD_TEST(saTuMuellerToReciprocalCovarianceImageFilterNew ${SARPOLARIMETRY_TESTS2}
-		otbMuellerToReciprocalCovarianceImageFilterNew
+                otbMuellerToReciprocalCovarianceImageFilterNew
 )
 
 ADD_TEST(saTvMuellerToReciprocalCovarianceImageFilter ${SARPOLARIMETRY_TESTS2}
@@ -351,15 +351,15 @@ ADD_TEST(saTvMuellerToReciprocalCovarianceImageFilter ${SARPOLARIMETRY_TESTS2}
         otbMuellerToReciprocalCovarianceImageFilter
         ${BASELINE}/saTvSinclairImageFilter_SinclairToMueller.tif
         ${TEMP}/saTvMuellerToMLCImageFilter.tif
-	)
+        )
 
 # Polarimetric Data
 ADD_TEST(saTuPolarimetricDataNew ${SARPOLARIMETRY_TESTS2}
-		otbPolarimetricDataNew
+                otbPolarimetricDataNew
 )
 
 ADD_TEST(saTvPolarimetricDataTest ${SARPOLARIMETRY_TESTS2}
-		otbPolarimetricDataTest
+                otbPolarimetricDataTest
 )
 
 
diff --git a/Testing/Code/SpatialReasoning/CMakeLists.txt b/Testing/Code/SpatialReasoning/CMakeLists.txt
index 2b2c58ee79497b3718f6d3eec46810b4db6dd197..f85a93d86df8246893c25d604ecd5d069fe95493 100644
--- a/Testing/Code/SpatialReasoning/CMakeLists.txt
+++ b/Testing/Code/SpatialReasoning/CMakeLists.txt
@@ -23,15 +23,15 @@ ADD_TEST(srTuRCC8CalculatorNew ${SPATIALREASONING_TESTS1}
 
 ADD_TEST(srTvRCC8Calculator ${SPATIALREASONING_TESTS1}
    --compare-ascii ${NOTOL}
- 		   ${BASELINE_FILES}/srRCC8CalculatorOutput.txt
- 		   ${TEMP}/srRCC8CalculatorOutput.txt
-	 otbImageToImageRCC8Calculator
-	 4
-	 ${TEMP}/srRCC8CalculatorOutput.txt
-	 ${INPUTDATA}/rcc8_mire1.png
-	 ${INPUTDATA}/rcc8_mire2.png
-	 ${INPUTDATA}/rcc8_mire3.png
-	 ${INPUTDATA}/rcc8_mire4.png
+                    ${BASELINE_FILES}/srRCC8CalculatorOutput.txt
+                    ${TEMP}/srRCC8CalculatorOutput.txt
+         otbImageToImageRCC8Calculator
+         4
+         ${TEMP}/srRCC8CalculatorOutput.txt
+         ${INPUTDATA}/rcc8_mire1.png
+         ${INPUTDATA}/rcc8_mire2.png
+         ${INPUTDATA}/rcc8_mire3.png
+         ${INPUTDATA}/rcc8_mire4.png
 )
 
 
@@ -42,15 +42,15 @@ ADD_TEST(srTuPolygonRCC8CalculatorNew ${SPATIALREASONING_TESTS1}
 
 ADD_TEST(srTvPolygonRCC8Calculator ${SPATIALREASONING_TESTS1}
    --compare-ascii ${NOTOL}
- 		   ${BASELINE_FILES}/srRCC8PolygonToPolygonCalculatorOutput.txt
- 		   ${TEMP}/srRCC8PolygonToPolygonCalculatorOutput.txt
-	 otbPolygonToPolygonRCC8Calculator
-	 4
-	 ${TEMP}/srRCC8PolygonToPolygonCalculatorOutput.txt
-	 ${INPUTDATA}/rcc8_mire1.png
-	 ${INPUTDATA}/rcc8_mire2.png
-	 ${INPUTDATA}/rcc8_mire3.png
-	 ${INPUTDATA}/rcc8_mire4.png
+                    ${BASELINE_FILES}/srRCC8PolygonToPolygonCalculatorOutput.txt
+                    ${TEMP}/srRCC8PolygonToPolygonCalculatorOutput.txt
+         otbPolygonToPolygonRCC8Calculator
+         4
+         ${TEMP}/srRCC8PolygonToPolygonCalculatorOutput.txt
+         ${INPUTDATA}/rcc8_mire1.png
+         ${INPUTDATA}/rcc8_mire2.png
+         ${INPUTDATA}/rcc8_mire3.png
+         ${INPUTDATA}/rcc8_mire4.png
 )
 
 # -------            otb::RCC8VertexBase   --------------------------
@@ -60,9 +60,9 @@ ADD_TEST(srTuRCC8VertexBaseNew ${SPATIALREASONING_TESTS1}
 
 ADD_TEST(srTvRCC8VertexBase ${SPATIALREASONING_TESTS1}
          otbRCC8VertexBase
-	 5
-	 5
-	 )
+         5
+         5
+         )
 
 # -------            otb::RCC8VertexWithCompacity----------------------
 
@@ -71,10 +71,10 @@ ADD_TEST(srTuRCC8VertexWithCompacityNew ${SPATIALREASONING_TESTS1}
 
 ADD_TEST(srTvRCC8VertexWithCompacity ${SPATIALREASONING_TESTS1}
          otbRCC8VertexWithCompacity
-	 5
-	 5
-	 0.125354
-	 )
+         5
+         5
+         0.125354
+         )
 
 # -------            otb::RCC8VertexWithCompacity----------------------
 
@@ -83,7 +83,7 @@ ADD_TEST(srTuRCC8EdgeNew ${SPATIALREASONING_TESTS1}
 
 ADD_TEST(srTvRCC8Edge ${SPATIALREASONING_TESTS1}
          otbRCC8Edge
-	 )
+         )
 
 
 # -------            otb::RCC8Graph   --------------------------
@@ -94,7 +94,7 @@ ADD_TEST(srTuRCC8GraphNew ${SPATIALREASONING_TESTS1}
 
 ADD_TEST(srTvRCC8Graph ${SPATIALREASONING_TESTS1}
          otbRCC8Graph
-	 )
+         )
 
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ otbSPATIALREASONINGTests2 ~~~~~~~~~~~~~~~~~~~~~~
@@ -110,11 +110,11 @@ ADD_TEST(srTuRCC8GraphFileWriterNew ${SPATIALREASONING_TESTS2}
          otbRCC8GraphFileWriterNew)
 
 ADD_TEST(srTvRCC8GraphFileWriter ${SPATIALREASONING_TESTS2}
-	--compare-ascii	${NOTOL}
-			${BASELINE_FILES}/srRCC8GraphWriterOutput1.dot
-			${TEMP}/srRCC8GraphWriterOutput1.dot
-	 otbRCC8GraphFileWriter
-			${TEMP}/srRCC8GraphWriterOutput1.dot
+        --compare-ascii        ${NOTOL}
+                        ${BASELINE_FILES}/srRCC8GraphWriterOutput1.dot
+                        ${TEMP}/srRCC8GraphWriterOutput1.dot
+         otbRCC8GraphFileWriter
+                        ${TEMP}/srRCC8GraphWriterOutput1.dot
 )
 
 # -------        otb::RCC8GraphFileReader   --------------------------
@@ -123,18 +123,18 @@ ADD_TEST(srTuRCC8GraphFileReaderNew ${SPATIALREASONING_TESTS2}
          otbRCC8GraphFileReaderNew)
 
 ADD_TEST(srTvRCC8GraphFileReader ${SPATIALREASONING_TESTS2}
-	 otbRCC8GraphFileReader
-			${TEMP}/srRCC8GraphWriterOutput1.dot
+         otbRCC8GraphFileReader
+                        ${TEMP}/srRCC8GraphWriterOutput1.dot
 )
 SET_TESTS_PROPERTIES(srTvRCC8GraphFileReader PROPERTIES DEPENDS srTvRCC8GraphFileWriter)
 
 ADD_TEST(srTvRCC8GraphIOEndToEnd ${SPATIALREASONING_TESTS2}
-	--compare-ascii	${NOTOL}
-			${BASELINE_FILES}/srRCC8GraphWriterOutput1.dot
-			${TEMP}/srRCC8GraphIOEndToEndOut.dot
-	 otbRCC8GraphIOEndToEnd
-	                ${BASELINE_FILES}/srRCC8GraphWriterOutput1.dot
-			${TEMP}/srRCC8GraphIOEndToEndOut.dot
+        --compare-ascii        ${NOTOL}
+                        ${BASELINE_FILES}/srRCC8GraphWriterOutput1.dot
+                        ${TEMP}/srRCC8GraphIOEndToEndOut.dot
+         otbRCC8GraphIOEndToEnd
+                        ${BASELINE_FILES}/srRCC8GraphWriterOutput1.dot
+                        ${TEMP}/srRCC8GraphIOEndToEndOut.dot
 )
 
 # -------        otb::ImageListToRCC8GraphFilter   --------------------------
@@ -152,53 +152,53 @@ ADD_TEST(srTuMultiSegToRCC8GraphFilterNew ${SPATIALREASONING_TESTS2}
 
 
 ADD_TEST(srTvMultiSegToRCC8GraphFilter1 ${SPATIALREASONING_TESTS2}
-	--compare-ascii	${NOTOL}
-			${BASELINE_FILES}/srRCC8GraphFilterOutput.dot
-			${TEMP}/srRCC8GraphFilterOutput.dot
-	 otbImageMultiSegmentationToRCC8GraphFilter
-			${TEMP}/srRCC8GraphFilterOutput.dot
-			0
-			2
-			${INPUTDATA}/Seg1InputForRCC8Graph.tif
-			${INPUTDATA}/Seg2InputForRCC8Graph.tif
+        --compare-ascii        ${NOTOL}
+                        ${BASELINE_FILES}/srRCC8GraphFilterOutput.dot
+                        ${TEMP}/srRCC8GraphFilterOutput.dot
+         otbImageMultiSegmentationToRCC8GraphFilter
+                        ${TEMP}/srRCC8GraphFilterOutput.dot
+                        0
+                        2
+                        ${INPUTDATA}/Seg1InputForRCC8Graph.tif
+                        ${INPUTDATA}/Seg2InputForRCC8Graph.tif
 )
 
 ADD_TEST(srTvMultiSegToRCC8GraphFilter1WithOpti ${SPATIALREASONING_TESTS2}
-	--compare-ascii	${NOTOL}
-			${BASELINE_FILES}/srRCC8GraphFilterOutput.dot
-			${TEMP}/srRCC8GraphFilterOutputWithOpti.dot
-	 otbImageMultiSegmentationToRCC8GraphFilter
-			${TEMP}/srRCC8GraphFilterOutputWithOpti.dot
-			1
-			2
-			${INPUTDATA}/Seg1InputForRCC8Graph.tif
-			${INPUTDATA}/Seg2InputForRCC8Graph.tif
+        --compare-ascii        ${NOTOL}
+                        ${BASELINE_FILES}/srRCC8GraphFilterOutput.dot
+                        ${TEMP}/srRCC8GraphFilterOutputWithOpti.dot
+         otbImageMultiSegmentationToRCC8GraphFilter
+                        ${TEMP}/srRCC8GraphFilterOutputWithOpti.dot
+                        1
+                        2
+                        ${INPUTDATA}/Seg1InputForRCC8Graph.tif
+                        ${INPUTDATA}/Seg2InputForRCC8Graph.tif
 )
 
 ADD_TEST(srTvMultiSegToRCC8GraphFilter2 ${SPATIALREASONING_TESTS2}
-	--compare-ascii ${NOTOL}
-			${BASELINE_FILES}/srRCC8GraphFilterOutput2.dot
-			${TEMP}/srRCC8GraphFilterOutput2.dot
-	 otbImageMultiSegmentationToRCC8GraphFilter
-			${TEMP}/srRCC8GraphFilterOutput2.dot
-			0
-			3
-			${INPUTDATA}/Seg3InputForRCC8Graph.tif
-			${INPUTDATA}/Seg4InputForRCC8Graph.tif
-			${INPUTDATA}/Seg5InputForRCC8Graph.tif
+        --compare-ascii ${NOTOL}
+                        ${BASELINE_FILES}/srRCC8GraphFilterOutput2.dot
+                        ${TEMP}/srRCC8GraphFilterOutput2.dot
+         otbImageMultiSegmentationToRCC8GraphFilter
+                        ${TEMP}/srRCC8GraphFilterOutput2.dot
+                        0
+                        3
+                        ${INPUTDATA}/Seg3InputForRCC8Graph.tif
+                        ${INPUTDATA}/Seg4InputForRCC8Graph.tif
+                        ${INPUTDATA}/Seg5InputForRCC8Graph.tif
 )
 
 ADD_TEST(srTvMultiSegToRCC8GraphFilter2WithOpti ${SPATIALREASONING_TESTS2}
-	--compare-ascii ${NOTOL}
-			${BASELINE_FILES}/srRCC8GraphFilterOutput2.dot
-			${TEMP}/srRCC8GraphFilterOutput2WithOpti.dot
-	 otbImageMultiSegmentationToRCC8GraphFilter
-			${TEMP}/srRCC8GraphFilterOutput2WithOpti.dot
-			1
-			3
-			${INPUTDATA}/Seg3InputForRCC8Graph.tif
-			${INPUTDATA}/Seg4InputForRCC8Graph.tif
-			${INPUTDATA}/Seg5InputForRCC8Graph.tif
+        --compare-ascii ${NOTOL}
+                        ${BASELINE_FILES}/srRCC8GraphFilterOutput2.dot
+                        ${TEMP}/srRCC8GraphFilterOutput2WithOpti.dot
+         otbImageMultiSegmentationToRCC8GraphFilter
+                        ${TEMP}/srRCC8GraphFilterOutput2WithOpti.dot
+                        1
+                        3
+                        ${INPUTDATA}/Seg3InputForRCC8Graph.tif
+                        ${INPUTDATA}/Seg4InputForRCC8Graph.tif
+                        ${INPUTDATA}/Seg5InputForRCC8Graph.tif
 )
 
 # -------        otb::PolygonListToRCC8GraphFilter   --------------------------
@@ -209,27 +209,27 @@ ADD_TEST(srTuPolygonListToRCC8GraphFilterNew ${SPATIALREASONING_TESTS2}
 
 
 ADD_TEST(srTvPolygonListToRCC8GraphFilter ${SPATIALREASONING_TESTS2}
-	--compare-ascii ${NOTOL}
-		${BASELINE_FILES}/srTvPolygonListToRCC8GraphFilterOuptut.dot
-		${TEMP}/srTvPolygonListToRCC8GraphFilterOuptut.dot
+        --compare-ascii ${NOTOL}
+                ${BASELINE_FILES}/srTvPolygonListToRCC8GraphFilterOuptut.dot
+                ${TEMP}/srTvPolygonListToRCC8GraphFilterOuptut.dot
          otbPolygonListToRCC8GraphFilter
-	 4
-	 ${TEMP}/srTvPolygonListToRCC8GraphFilterOuptut.dot
-	 ${INPUTDATA}/rcc8_mire1.png
-	 ${INPUTDATA}/rcc8_mire2.png
-	 ${INPUTDATA}/rcc8_mire3.png
-	 ${INPUTDATA}/rcc8_mire4.png)
+         4
+         ${TEMP}/srTvPolygonListToRCC8GraphFilterOuptut.dot
+         ${INPUTDATA}/rcc8_mire1.png
+         ${INPUTDATA}/rcc8_mire2.png
+         ${INPUTDATA}/rcc8_mire3.png
+         ${INPUTDATA}/rcc8_mire4.png)
 
 ADD_TEST(srTvPolygonListToRCC8GraphFilter2 ${SPATIALREASONING_TESTS2}
-	--compare-ascii ${NOTOL}
-		${BASELINE_FILES}/srTvPolygonListToRCC8GraphFilter2Ouptut.dot
-		${TEMP}/srTvPolygonListToRCC8GraphFilter2Ouptut.dot
+        --compare-ascii ${NOTOL}
+                ${BASELINE_FILES}/srTvPolygonListToRCC8GraphFilter2Ouptut.dot
+                ${TEMP}/srTvPolygonListToRCC8GraphFilter2Ouptut.dot
          otbPolygonListToRCC8GraphFilter
-	 3
-	 ${TEMP}/srTvPolygonListToRCC8GraphFilter2Ouptut.dot
-	 ${INPUTDATA}/Seg3InputForRCC8Graph.tif
-	 ${INPUTDATA}/Seg4InputForRCC8Graph.tif
-	 ${INPUTDATA}/Seg5InputForRCC8Graph.tif
+         3
+         ${TEMP}/srTvPolygonListToRCC8GraphFilter2Ouptut.dot
+         ${INPUTDATA}/Seg3InputForRCC8Graph.tif
+         ${INPUTDATA}/Seg4InputForRCC8Graph.tif
+         ${INPUTDATA}/Seg5InputForRCC8Graph.tif
 )
 
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
diff --git a/Testing/Code/TestSystem/CMakeLists.txt b/Testing/Code/TestSystem/CMakeLists.txt
index ae2865d7ad2a939e4dbc3ee05eeacd0893bbcb8f..270993ad69be9bfe23a714f5d8bef6c6c4fd47d1 100644
--- a/Testing/Code/TestSystem/CMakeLists.txt
+++ b/Testing/Code/TestSystem/CMakeLists.txt
@@ -21,7 +21,7 @@ SET(EPSILON_3 0.001)
 SET(TESTSYSTEM_TESTS ${CXX_TEST_PATH}/otbTestSystemTests)
 
 #Test if the current working copy corresponds to the nightly revision number
-ADD_TEST(tsTvIsNightlyRevision ${TESTSYSTEM_TESTS}   
+ADD_TEST(tsTvIsNightlyRevision ${TESTSYSTEM_TESTS}
          otbIsNightlyRevision
          ${OTB_WC_REVISION}
          http://www.orfeo-toolbox.org/nightly/libNightlyNumber )
@@ -127,7 +127,7 @@ ADD_TEST(tsTvCompareAsciiepsilon3_WhiteSpaceOK ${TESTSYSTEM_TESTS}
        ${INPUTDATA}/tsTvCompareAsciiEpsilon3_TestOK.txt
        ${TEMP}/tsTvCompareAsciiEpsilon3_TestOK.txt
   )
-# sould be ko  
+# sould be ko
 ADD_TEST(tsTvCompareAsciiepsilon3_WhiteSpaceKO ${TESTSYSTEM_TESTS}
    --compare-ascii ${EPSILON_3}
        ${BASELINE_FILES}/tsTvCompareAsciiEpsilon3_Base.txt
diff --git a/Testing/Code/Visu/CMakeLists.txt b/Testing/Code/Visu/CMakeLists.txt
index e1e22a57f91ccba5637e2ad015a922fec595e208..433415a3ddcd9bb8f5265105139fc079ded82730 100644
--- a/Testing/Code/Visu/CMakeLists.txt
+++ b/Testing/Code/Visu/CMakeLists.txt
@@ -37,7 +37,7 @@ ADD_TEST(viTuFixedSizeFullImageWidgetNew ${VISU_TESTS1}
 
 ADD_TEST(viTvFixedSizFullImageWidget ${VISU_TESTS1}
         otbFixedSizeFullImageWidget
-	${INPUTDATA}/poupees.png
+        ${INPUTDATA}/poupees.png
         )
 
 # -------       otb::FullResolutionImageWidget -----------------------------------
@@ -48,7 +48,7 @@ ADD_TEST(viTuFullResolutionImageWidgetNew ${VISU_TESTS1}
 
 ADD_TEST(viTvFullResolutionImageWidget ${VISU_TESTS1}
         otbFullResolutionImageWidget
-	${INPUTDATA}/poupees.png
+        ${INPUTDATA}/poupees.png
         )
 
 # -------   otb::ZoomableImageWidget  -----------------------------------
@@ -59,7 +59,7 @@ ADD_TEST(viTuZoomableImageWidgetNew ${VISU_TESTS1}
 
 ADD_TEST(viTvZoomableImageWidget ${VISU_TESTS1}
         otbZoomableImageWidget
-	${INPUTDATA}/poupees.png
+        ${INPUTDATA}/poupees.png
         )
 
 # -------   otb::ImageViewer  -----------------------------------
@@ -70,7 +70,7 @@ ADD_TEST(viTuImageViewerNew ${VISU_TESTS1}
 
 ADD_TEST(viTvImageViewerWithOtbVectorImage ${VISU_TESTS1}
         otbImageViewer
-	${INPUTDATA}/couleurs.jpg 3
+        ${INPUTDATA}/couleurs.jpg 3
         )
 
 ADD_TEST(viTvImageViewerWithOtbImage ${VISU_TESTS1}
@@ -81,22 +81,22 @@ ADD_TEST(viTvImageViewerWithOtbImage ${VISU_TESTS1}
 IF(OTB_DATA_USE_LARGEINPUT)
 ADD_TEST(viTvImageViewerWithLargeOtbVectorImage ${VISU_TESTS1}
         otbImageViewer
-	${IMAGEDATA}/QUICKBIRD/TOULOUSE/000000128955_01_P001_PAN/02APR01105228-P1BS-000000128955_01_P001.TIF 0
+        ${IMAGEDATA}/QUICKBIRD/TOULOUSE/000000128955_01_P001_PAN/02APR01105228-P1BS-000000128955_01_P001.TIF 0
         )
 
 ADD_TEST(viTvModulusImageViewerWithComplexImage ${VISU_TESTS1}
         otbImageViewer
-	${IMAGEDATA}/RADARSAT1/GOMA2/SCENE01/DAT_01.001 1
+        ${IMAGEDATA}/RADARSAT1/GOMA2/SCENE01/DAT_01.001 1
         )
 
 ADD_TEST(viTvPhaseImageViewerWithComplexImage ${VISU_TESTS1}
         otbImageViewer
-	${IMAGEDATA}/RADARSAT1/GOMA2/SCENE01/DAT_01.001 2
+        ${IMAGEDATA}/RADARSAT1/GOMA2/SCENE01/DAT_01.001 2
         )
 
 ADD_TEST(viTvImageViewerWithLargeOtbImage ${VISU_TESTS1}
         otbImageViewerWithOtbImage
-	${IMAGEDATA}/QUICKBIRD/TOULOUSE/000000128955_01_P001_PAN/02APR01105228-P1BS-000000128955_01_P001.TIF 0
+        ${IMAGEDATA}/QUICKBIRD/TOULOUSE/000000128955_01_P001_PAN/02APR01105228-P1BS-000000128955_01_P001.TIF 0
         )
 ENDIF(OTB_DATA_USE_LARGEINPUT)
 
@@ -105,45 +105,45 @@ ENDIF(OTB_DATA_USE_LARGEINPUT)
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 ADD_TEST(viTvImageViewerWithMultiBandFilter ${VISU_TESTS2}
         otbImageViewerWithMultiBandFilter
-	${INPUTDATA}/couleurs.jpg
+        ${INPUTDATA}/couleurs.jpg
         )
 
 ADD_TEST(viTvDoubleImageViewerWithLink ${VISU_TESTS2}
         otbDoubleImageViewerWithLink
-	${INPUTDATA}/couleurs.jpg
-	${INPUTDATA}/couleurs.jpg
+        ${INPUTDATA}/couleurs.jpg
+        ${INPUTDATA}/couleurs.jpg
         )
 
 # -------   otb::ImageToGrayscaleAnaglyphImageFilter  -----------------------------------
 
 ADD_TEST(viTuImageToGrayscaleAnaglyphImageFilterNew ${VISU_TESTS2}
-	otbImageToGrayscaleAnaglyphImageFilterNew
+        otbImageToGrayscaleAnaglyphImageFilterNew
 )
 
 ADD_TEST(viTvImageToGrayscaleAnaglyphImageFilter ${VISU_TESTS2}
-	--compare-image  ${EPSILON_6}
-	${BASELINE}/viTvGrayscaleAnaglyphFilterResult.tif
-	${TEMP}/viTvGrayscaleAnaglyphFilterResult.tif
-	otbImageToGrayscaleAnaglyphImageFilter
-	${INPUTDATA}/anaglyphInput1.tif
-	${INPUTDATA}/anaglyphInput2.tif
-	${TEMP}/viTvGrayscaleAnaglyphFilterResult.tif
+        --compare-image  ${EPSILON_6}
+        ${BASELINE}/viTvGrayscaleAnaglyphFilterResult.tif
+        ${TEMP}/viTvGrayscaleAnaglyphFilterResult.tif
+        otbImageToGrayscaleAnaglyphImageFilter
+        ${INPUTDATA}/anaglyphInput1.tif
+        ${INPUTDATA}/anaglyphInput2.tif
+        ${TEMP}/viTvGrayscaleAnaglyphFilterResult.tif
 )
 
 # -------   otb::VectorImageToColorAnaglyphVectorImageFilter  ---------------------------
 
 ADD_TEST(viTuVectorImageToColorAnaglyphVectorImageFilterNew ${VISU_TESTS2}
-	otbVectorImageToColorAnaglyphVectorImageFilterNew
+        otbVectorImageToColorAnaglyphVectorImageFilterNew
 )
 
 ADD_TEST(viTvVectorImageToColorAnaglyphVectorImageFilter ${VISU_TESTS2}
-	--compare-image ${EPSILON_6}
-	${BASELINE}/viTvColorAnaglyphFilterResult.tif
-	${TEMP}/viTvColorAnaglyphFilterResult.tif
-	otbVectorImageToColorAnaglyphVectorImageFilter
-	${INPUTDATA}/anaglyphInput1.tif
-	${INPUTDATA}/anaglyphInput2.tif
-	${TEMP}/viTvColorAnaglyphFilterResult.tif
+        --compare-image ${EPSILON_6}
+        ${BASELINE}/viTvColorAnaglyphFilterResult.tif
+        ${TEMP}/viTvColorAnaglyphFilterResult.tif
+        otbVectorImageToColorAnaglyphVectorImageFilter
+        ${INPUTDATA}/anaglyphInput1.tif
+        ${INPUTDATA}/anaglyphInput2.tif
+        ${TEMP}/viTvColorAnaglyphFilterResult.tif
 )
 
 # -------  otb::ImageWidgetPolygonForm -------------------------------------------
@@ -152,8 +152,8 @@ ADD_TEST(viTuImageWidgetPolygonFormNew ${VISU_TESTS2}
 
 ADD_TEST(viTuImageWidgetPolygonForm ${VISU_TESTS2}
          otbImageWidgetPolygonForm
-	      	${INPUTDATA}/poupees.tif
-		20 100 70 100 70 90 50 90 50 80 70 80 70 60 90 60 90 50 70 50 70 30 20 30
+                      ${INPUTDATA}/poupees.tif
+                20 100 70 100 70 90 50 90 50 80 70 80 70 60 90 60 90 50 70 50 70 30 20 30
 )
 
 # -------       otb::HistogramAndTransferFunctionWidgtet -----------------------------------
@@ -164,7 +164,7 @@ ADD_TEST(viTuHistogramAndTransferFunctionWidgetNew ${VISU_TESTS2}
 
 ADD_TEST(viTvHistogramAndTransferFunctionWidget ${VISU_TESTS2}
         otbHistogramAndTransferFunctionWidget
-	${INPUTDATA}/GomaAvant.png
+        ${INPUTDATA}/GomaAvant.png
         )
 
 # -------       otb::ImageWidgetTransferFunctions -----------------------------------
@@ -175,18 +175,18 @@ ADD_TEST(viTuImageWidgetTransferFunctionsNew ${VISU_TESTS2}
 
 ADD_TEST(viTvImageWidgetTransferFunctions ${VISU_TESTS2}
 --compare-ascii ${EPSILON_6}
-		${BASELINE_FILES}/viTvImageWidgetTransferFunctionsOutput.txt
-		${TEMP}/viTvImageWidgetTransferFunctionsOutput.txt
+                ${BASELINE_FILES}/viTvImageWidgetTransferFunctionsOutput.txt
+                ${TEMP}/viTvImageWidgetTransferFunctionsOutput.txt
         otbImageWidgetTransferFunctions
-	${TEMP}/viTvImageWidgetTransferFunctionsOutput.txt
+        ${TEMP}/viTvImageWidgetTransferFunctionsOutput.txt
         )
 
 #----------   otb::ImageViewer (Testing overlay, related to bug 35 -----------
 ADD_TEST(viTvImageViewerWithOverlay ${VISU_TESTS2}
-	otbImageViewerWithOverlay
-		${INPUTDATA}/couleurs.tif
-		128
-		128
+        otbImageViewerWithOverlay
+                ${INPUTDATA}/couleurs.tif
+                128
+                128
 )
 
 # -------       Fichiers sources CXX -----------------------------------
diff --git a/Testing/Code/Visualization/CMakeLists.txt b/Testing/Code/Visualization/CMakeLists.txt
index f21c21c481173ae1a79bef93188ae43eab6344f1..1cf897199a0fef44f8cdde6b7970592b15ec0b7a 100644
--- a/Testing/Code/Visualization/CMakeLists.txt
+++ b/Testing/Code/Visualization/CMakeLists.txt
@@ -434,7 +434,7 @@ ${INPUTDATA}/Capitole-Shadows.shp
 #------------ otb::AmplitudeFuntor ----------------------
 
 ADD_TEST(vrTuAmplitudeFunctorTest ${VISUALIZATION_TESTS3}
-	otbAmplitudeFunctorTest
+        otbAmplitudeFunctorTest
 )
 
 
diff --git a/Testing/Fa/CMakeLists.txt b/Testing/Fa/CMakeLists.txt
index bd6803230c419777e06083e185861528c552bc52..cb697a0f8ea73ec5ce15d90a2fcc175978c7974d 100644
--- a/Testing/Fa/CMakeLists.txt
+++ b/Testing/Fa/CMakeLists.txt
@@ -167,15 +167,15 @@ ADD_TEST(FA-00013-io_WriteImageTIFF_bis ${COMMON_TESTS}
 IF (OTB_USE_DEPRECATED)
 # ---  FA 00052 : Floating point exception lecture ROI_QB_MUL_1.png  ---
 ADD_TEST(FA-00052-vi_Floating_Point_Exception ${VISU_TESTS}
-	otbImageViewer
-	${EXAMPLES_DATA}/ROI_QB_MUL_1.png
-	3
+        otbImageViewer
+        ${EXAMPLES_DATA}/ROI_QB_MUL_1.png
+        3
          )
 ENDIF (OTB_USE_DEPRECATED)
 
 # ---  FA 00060 : Pb Map activation  ---
 ADD_TEST(FA-00060-le_Map_Activation ${CXX_TEST_PATH}/MapActivation
-	${INPUTDATA}/list.tif
+        ${INPUTDATA}/list.tif
         4
         4
         20
@@ -186,28 +186,28 @@ ADD_TEST(FA-00060-le_Map_Activation ${CXX_TEST_PATH}/MapActivation
         ${TEMP}/FA-00013-le-som.hdr
         ${TEMP}/FA-00013-le-actMap.png
         ${TEMP}/FA-00013-le-som.hdr
-	)
+        )
 
 # ---  FA 000295 : Pb Mean Shift clustering module  ---
 ADD_TEST(000295-MeanShiftVectorImageFilterWithStreamingShrink ${CXX_TEST_PATH}/000295-MeanShiftVectorImageFilterWithStreamingShrink
-	${INPUTDATA}/qb_RoadExtract2sub200x200.tif
+        ${INPUTDATA}/qb_RoadExtract2sub200x200.tif
         20 50 500 10
-	)
+        )
 
 # -------       End of fixed FAs -----------------------------------
 
 ADD_TEST(FA-00070-vi_Streaming_Stat ${CXX_TEST_PATH}/StreamingStat
-	${EXAMPLES_DATA}/qb_RoadExtract.tif
+        ${EXAMPLES_DATA}/qb_RoadExtract.tif
          )
 
 ADD_TEST(FA-00070-vi_Streaming_Stat_bis ${CXX_TEST_PATH}/StreamingStat
-	${EXAMPLES_DATA}/amst.png
+        ${EXAMPLES_DATA}/amst.png
          )
 
 
 # -------       From Mantis tracker   -----------------------------------
 ADD_TEST(FA-0000041-mean_shift1 ${CXX_TEST_PATH}/0000041-mean_shift
-	${INPUTDATA}/QB_Suburb.png
+        ${INPUTDATA}/QB_Suburb.png
         12
         7
         100
@@ -215,10 +215,10 @@ ADD_TEST(FA-0000041-mean_shift1 ${CXX_TEST_PATH}/0000041-mean_shift
         ${TEMP}/segmented_image1.tif
         ${TEMP}/labelled_image1.tif
         ${TEMP}/boundary_of_labelled_image1.tif
-	)
+        )
 
 ADD_TEST(FA-0000041-mean_shift2 ${CXX_TEST_PATH}/0000041-mean_shift
-	${INPUTDATA}/QB_Suburb.png
+        ${INPUTDATA}/QB_Suburb.png
         20
         7
         100
@@ -226,31 +226,31 @@ ADD_TEST(FA-0000041-mean_shift2 ${CXX_TEST_PATH}/0000041-mean_shift
         ${TEMP}/segmented_image2.tif
         ${TEMP}/labelled_image2.tif
         ${TEMP}/boundary_of_labelled_image2.tif
-	)
+        )
 IF(OTB_DATA_USE_LARGEINPUT)
 ADD_TEST(FA-00134-feature_extraction ${CXX_TEST_PATH}/00134-feature_extraction
-	${IMAGEDATA}/QUICKBIRD/TOULOUSE/000000128955_01_P001_MUL/02APR01105228-M1BS-000000128955_01_P001.TIF
+        ${IMAGEDATA}/QUICKBIRD/TOULOUSE/000000128955_01_P001_MUL/02APR01105228-M1BS-000000128955_01_P001.TIF
         ${TEMP}/extracted_filter_134.tif
         5
         500 # extract start index
         300 # extract size
-	)
-	
-	
-	ADD_TEST(FA-Spot5SensorModel ${CXX_TEST_PATH}/SensorModelBorder
+        )
+        
+        
+        ADD_TEST(FA-Spot5SensorModel ${CXX_TEST_PATH}/SensorModelBorder
   ${IMAGEDATA}/SPOT5/TEHERAN/IMAGERY.TIF
   ${TEMP}/FA-Spot5SensorModel.txt
   )
 ENDIF(OTB_DATA_USE_LARGEINPUT)
 
 IF(OTB_USE_VISU_GUI)
-ADD_TEST(FA-0000132-jpg ${CXX_TEST_PATH}/0000132-jpg 
+ADD_TEST(FA-0000132-jpg ${CXX_TEST_PATH}/0000132-jpg
         ${INPUTDATA}/toulouse_auat.jpg
-	)
+        )
 ENDIF(OTB_USE_VISU_GUI)
 
 IF(USE_FFTWD OR USE_FFTWF)
-ADD_TEST(FA-0000169-fftcomplextocomplex ${CXX_TEST_PATH}/0000169-fftcomplextocomplex 
+ADD_TEST(FA-0000169-fftcomplextocomplex ${CXX_TEST_PATH}/0000169-fftcomplextocomplex
   )
 ENDIF(USE_FFTWD OR USE_FFTWF)
 
@@ -258,10 +258,10 @@ ENDIF(USE_FFTWD OR USE_FFTWF)
 # FIXME Desactivated until http://bugs.orfeo-toolbox.org/view.php?id=94
 # has somebody working on it
 # ADD_TEST(FA-0000094-fe-PolygonsVectorization ${CXX_TEST_PATH}/PolygonsVectorization
-# 	-in ${INPUTDATA}/objtest2.tif
-# 	-ot ${TEMP}/output.txt
-# 	-out ${TEMP}/objtest2-result.tif
-# 	)
+#         -in ${INPUTDATA}/objtest2.tif
+#         -ot ${TEMP}/output.txt
+#         -out ${TEMP}/objtest2-result.tif
+#         )
 
 ADD_EXECUTABLE(AlignementsQB  AlignementsQB.cxx)
 TARGET_LINK_LIBRARIES(AlignementsQB OTBFeatureExtraction OTBIO OTBCommon)
diff --git a/Testing/Utilities/CMakeLists.txt b/Testing/Utilities/CMakeLists.txt
index 32210109679e7fa7b2720df3a9d089fd8f8ce1ed..d50cbb00e0549c436b646ad0e98261ebc3cd5bf4 100644
--- a/Testing/Utilities/CMakeLists.txt
+++ b/Testing/Utilities/CMakeLists.txt
@@ -30,18 +30,18 @@ SET(UTILITIES_TESTS ${CXX_TEST_PATH}/otbUtilitiesTests)
 IF(OTB_DATA_USE_LARGEINPUT)
 
 ADD_TEST(utTvOssimKeywordlistToulouseQuickBirdTest ${UTILITIES_TESTS}
---ignore-order --compare-ascii ${EPSILON_6}  
-	       ${BASELINE_FILES}/utOssimKeywordlistToulouseQuickBird.txt
-	       ${TEMP}/utOssimKeywordlistToulouseQuickBird.txt
+--ignore-order --compare-ascii ${EPSILON_6}
+               ${BASELINE_FILES}/utOssimKeywordlistToulouseQuickBird.txt
+               ${TEMP}/utOssimKeywordlistToulouseQuickBird.txt
         ossimKeywordlistTest
         ${IMAGEDATA}/QUICKBIRD/TOULOUSE/000000128955_01_P001_PAN/02APR01105228-P1BS-000000128955_01_P001.TIF
         ${TEMP}/utOssimKeywordlistToulouseQuickBird.txt
         )
 
 ADD_TEST(utTvOssimKeywordlistBlossevilleIkonosTest ${UTILITIES_TESTS}
---ignore-order --compare-ascii ${NOTOL} 
-	        ${BASELINE_FILES}/utOssimKeywordlistBlossevilleIkonos.txt
-		${TEMP}/utOssimKeywordlistBlossevilleIkonos.txt
+--ignore-order --compare-ascii ${NOTOL}
+                ${BASELINE_FILES}/utOssimKeywordlistBlossevilleIkonos.txt
+                ${TEMP}/utOssimKeywordlistBlossevilleIkonos.txt
         ossimKeywordlistTest
         ${IMAGEDATA}/IKONOS/BLOSSEVILLE/po_2619900_grn_0000000.tif
         ${TEMP}/utOssimKeywordlistBlossevilleIkonos.txt
@@ -55,27 +55,27 @@ ADD_TEST(utTuOssimElevManagerTest ${UTILITIES_TESTS}
 IF(OTB_DATA_USE_LARGEINPUT)
 ADD_TEST(utTvOssimXmlDocumentTest ${UTILITIES_TESTS}
         ossimXmlDocumentTest
-	${IMAGEDATA}/TERRASARX/TORONTO/TSX1_SAR__SSC/TSX1_SAR__SSC.xml
+        ${IMAGEDATA}/TERRASARX/TORONTO/TSX1_SAR__SSC/TSX1_SAR__SSC.xml
         )
 ENDIF(OTB_DATA_USE_LARGEINPUT)
 
 ADD_TEST(utTvOssimTileMapModelTestToulouse ${UTILITIES_TESTS}
-	--compare-ascii ${NOTOL}
-		${BASELINE_FILES}/utOssimTileMapModelToulouse.txt
-		${TEMP}/utOssimTileMapModelToulouse.txt
-	ossimTileMapModelTest
-	43.6044
-	1.44295
-	${TEMP}/utOssimTileMapModelToulouse.txt
-	)
-	
+        --compare-ascii ${NOTOL}
+                ${BASELINE_FILES}/utOssimTileMapModelToulouse.txt
+                ${TEMP}/utOssimTileMapModelToulouse.txt
+        ossimTileMapModelTest
+        43.6044
+        1.44295
+        ${TEMP}/utOssimTileMapModelToulouse.txt
+        )
+        
 ADD_TEST(utTvOssimpluginsHermiteInterpolationTest ${UTILITIES_TESTS}
      ossimpluginsHermiteInterpolationTest)
 
 IF(OTB_DATA_USE_LARGEINPUT)
 ADD_TEST(utTvOssimpluginsHermiteInterpolationPlateformPositionRadarSat2Test ${UTILITIES_TESTS}
-	ossimpluginsHermiteInterpolationPlateformPositionTest
-	${IMAGEDATA}/RADARSAT2/ALTONA/Fine_Quad-Pol_Dataset/PK6621_DK406_FQ9_20080405_124900_HH_VV_HV_VH_SLC_Altona/product.xml
+        ossimpluginsHermiteInterpolationPlateformPositionTest
+        ${IMAGEDATA}/RADARSAT2/ALTONA/Fine_Quad-Pol_Dataset/PK6621_DK406_FQ9_20080405_124900_HH_VV_HV_VH_SLC_Altona/product.xml
     )
 ENDIF(OTB_DATA_USE_LARGEINPUT)
 
@@ -112,24 +112,24 @@ ADD_TEST(utTvSvmTestGenericModelTest ${UTILITIES_TESTS}
 
 ADD_TEST(utTvSvmGenericKernelBasicOperationsTest ${UTILITIES_TESTS}
 --compare-ascii ${NOTOL}  ${BASELINE_FILES}/utTvsvmGenericKernelBasicOperationsTest.txt
-                	 ${TEMP}/svmGenericKernelBasicOperationsTest.txt
+                         ${TEMP}/svmGenericKernelBasicOperationsTest.txt
               svmGenericKernelBasicOperationsTest
-		 ${TEMP}/svmGenericKernelBasicOperationsTest.txt
+                 ${TEMP}/svmGenericKernelBasicOperationsTest.txt
 )
 
 ADD_TEST(utTvSvmComposedKernelFunctorTest ${UTILITIES_TESTS}
 --compare-n-ascii ${NOTOL} 3
-		  ${BASELINE_FILES}/utTvSVMComposedKernelFunctorResTest.txt
-		  ${TEMP}/SVMComposedKernelFunctorTestRes.txt
-		  ${BASELINE_FILES}/utTvSVMComposedKernelFunctorTest.txt
-		  ${TEMP}/SVMComposedKernelFunctorTestOutput.txt
-		  ${BASELINE_FILES}/utTvSVMComposedKernelFunctorTest.txt
-		  ${TEMP}/SVMComposedKernelFunctorTestOutputBis.txt
+                  ${BASELINE_FILES}/utTvSVMComposedKernelFunctorResTest.txt
+                  ${TEMP}/SVMComposedKernelFunctorTestRes.txt
+                  ${BASELINE_FILES}/utTvSVMComposedKernelFunctorTest.txt
+                  ${TEMP}/SVMComposedKernelFunctorTestOutput.txt
+                  ${BASELINE_FILES}/utTvSVMComposedKernelFunctorTest.txt
+                  ${TEMP}/SVMComposedKernelFunctorTestOutputBis.txt
 
                otbSVMComposedKernelFunctorTest
-	           ${TEMP}/SVMComposedKernelFunctorTestRes.txt
-	           ${TEMP}/SVMComposedKernelFunctorTestOutput.txt
-		   ${TEMP}/SVMComposedKernelFunctorTestOutputBis.txt
+                   ${TEMP}/SVMComposedKernelFunctorTestRes.txt
+                   ${TEMP}/SVMComposedKernelFunctorTestOutput.txt
+                   ${TEMP}/SVMComposedKernelFunctorTestOutputBis.txt
 )
 
 # -------            lib otb6S   ------------------------------
@@ -352,13 +352,13 @@ ENDIF(OTB_DATA_USE_LARGEINPUT)
 # Case for release 2.2.1
 IF(OTB_COMPILE_JPEG2000)
 ADD_TEST(utTvOpenJpegEncoder ${UTILITIES_TESTS}
-	openJpegEncoder
-	${TEMP}/testjpeg.j2k
+        openJpegEncoder
+        ${TEMP}/testjpeg.j2k
 )
 
 ADD_TEST(utTvOpenJpegDecoder ${UTILITIES_TESTS}
-	openJpegDecoder
-	${TEMP}/testjpeg.j2k
+        openJpegDecoder
+        ${TEMP}/testjpeg.j2k
 )
 SET_TESTS_PROPERTIES(utTvOpenJpegDecoder PROPERTIES DEPENDS utTvOpenJpegEncoder)
 ENDIF(OTB_COMPILE_JPEG2000)
@@ -373,43 +373,43 @@ ENDIF(NOT OTB_USE_EXTERNAL_EXPAT)
 # -------            lib OpenThreads  ------------------------------
 IF(NOT OTB_USE_EXTERNAL_OPENTHREADS)
   ADD_TEST(utTvOpenthreadsSimpleThreader ${UTILITIES_TESTS}
-	openthreadsSimpleThreader
-	2 # [NUM_ELTS]
-	1 # [NUM_THREADS]
-	)
+        openthreadsSimpleThreader
+        2 # [NUM_ELTS]
+        1 # [NUM_THREADS]
+        )
   ADD_TEST(utTvOpenthreadsWorkCrew ${UTILITIES_TESTS}
-	openthreadsWorkCrew
-	1 # [NUM_THREADS]
-	)
+        openthreadsWorkCrew
+        1 # [NUM_THREADS]
+        )
 ENDIF(NOT OTB_USE_EXTERNAL_OPENTHREADS)
 
 # -------            SIFT   -------------------------------------
 ADD_TEST(utTv2DSiftImageSquareSyntheticRotate10 ${UTILITIES_TESTS}
-	 itk2DScaleInvariantFeatureImageFilterTest
-	 ${INPUTDATA}/carre.png
+         itk2DScaleInvariantFeatureImageFilterTest
+         ${INPUTDATA}/carre.png
          ${TEMP}/itk2DScaleInvariantFeatureImageFilter_carre1.png
-	 ${TEMP}/itk2DScaleInvariantFeatureImageFilter_carre2.png
-	 ${TEMP}/itk2DScaleInvariantFeatureImageFilter_carre_keys1.png
-	 ${TEMP}/itk2DScaleInvariantFeatureImageFilter_carre_keys2.png
-	 1 10 0.5 0  )
+         ${TEMP}/itk2DScaleInvariantFeatureImageFilter_carre2.png
+         ${TEMP}/itk2DScaleInvariantFeatureImageFilter_carre_keys1.png
+         ${TEMP}/itk2DScaleInvariantFeatureImageFilter_carre_keys2.png
+         1 10 0.5 0  )
 
 ADD_TEST(utTv2DSiftImageGridSyntheticRotate10 ${UTILITIES_TESTS}
-	 itk2DScaleInvariantFeatureImageFilterTest
-	 ${INPUTDATA}/damier.png
-	 ${TEMP}/itk2DScaleInvariantFeatureImageFilter_damier1.png
-	 ${TEMP}/itk2DScaleInvariantFeatureImageFilter_damier2.png
-	 ${TEMP}/itk2DScaleInvariantFeatureImageFilter_damier_keys1.png
-	 ${TEMP}/itk2DScaleInvariantFeatureImageFilter_damier_keys2.png
-	 1 10 0.5 0 )
+         itk2DScaleInvariantFeatureImageFilterTest
+         ${INPUTDATA}/damier.png
+         ${TEMP}/itk2DScaleInvariantFeatureImageFilter_damier1.png
+         ${TEMP}/itk2DScaleInvariantFeatureImageFilter_damier2.png
+         ${TEMP}/itk2DScaleInvariantFeatureImageFilter_damier_keys1.png
+         ${TEMP}/itk2DScaleInvariantFeatureImageFilter_damier_keys2.png
+         1 10 0.5 0 )
 
 ADD_TEST(utTv2DSiftImageSceneSyntheticRotate10 ${UTILITIES_TESTS}
-	 itk2DScaleInvariantFeatureImageFilterTest
-	 ${INPUTDATA}/scene.png
-	 ${TEMP}/itk2DScaleInvariantFeatureImageFilter_scene1.png
-	 ${TEMP}/itk2DScaleInvariantFeatureImageFilter_scene2.png
-	 ${TEMP}/itk2DScaleInvariantFeatureImageFilter_scene_keys1.png
-	 ${TEMP}/itk2DScaleInvariantFeatureImageFilter_scene_keys2.png
-	 1 10 0.5 0 )
+         itk2DScaleInvariantFeatureImageFilterTest
+         ${INPUTDATA}/scene.png
+         ${TEMP}/itk2DScaleInvariantFeatureImageFilter_scene1.png
+         ${TEMP}/itk2DScaleInvariantFeatureImageFilter_scene2.png
+         ${TEMP}/itk2DScaleInvariantFeatureImageFilter_scene_keys1.png
+         ${TEMP}/itk2DScaleInvariantFeatureImageFilter_scene_keys2.png
+         1 10 0.5 0 )
 
 # -------            lib Kml   ------------------------------
 FOREACH(id_test createkml helloattrs helloenum hellofolder hellogeometry helloregion helloworld parsekml )
diff --git a/Utilities/otbossim/CMakeLists.txt b/Utilities/otbossim/CMakeLists.txt
index 26e3f3f9ec2b90d011666b1702dafa8978391a5a..cdfcc16544ca3cd746206bb591d793ac310f3f3f 100644
--- a/Utilities/otbossim/CMakeLists.txt
+++ b/Utilities/otbossim/CMakeLists.txt
@@ -27,7 +27,7 @@ INCLUDE_DIRECTORIES(${OTB_SOURCE_DIR}/Utilities/otbossim/include)
 INCLUDE_DIRECTORIES(${OTB_BINARY_DIR}/Utilities/otbossim/include)
 
 CONFIGURE_FILE(${OTB_SOURCE_DIR}/Utilities/otbossim/include/ossim/ossimConfig.h.in
-	       ${OTB_BINARY_DIR}/Utilities/otbossim/include/ossim/ossimConfig.h)
+               ${OTB_BINARY_DIR}/Utilities/otbossim/include/ossim/ossimConfig.h)
 
 
 
@@ -113,7 +113,7 @@ IF(NOT OTB_DISABLE_UTILITIES_COMPILATION)
 #  )
   #TARGET_LINK_LIBRARIES(otbossim ${GDAL_LIBRARY})#To make sure that gdal appear before geotiff
   TARGET_LINK_LIBRARIES(otbossim  ${GEOTIFF_LIBRARY} ${TIFF_LIBRARY} ${JPEG_LIBRARY} ${GDAL_LIBRARY} ${OPENTHREADS_LIBRARY})
-  SET_TARGET_PROPERTIES(otbossim 
+  SET_TARGET_PROPERTIES(otbossim
                         PROPERTIES VERSION "${OSSIM_SVN_REVISION}.${OSSIM_OTB_PATCH}.0"
                                    SOVERSION "${OSSIM_SVN_REVISION}.${OSSIM_OTB_PATCH}")
 
diff --git a/Utilities/otbossim/src/ossim/CMakeLists.txt b/Utilities/otbossim/src/ossim/CMakeLists.txt
index 5867092a43e5421cebd7412d6f21be7354dba8a1..3262989ac4d39fea508d835e0d1f5f75504955fb 100644
--- a/Utilities/otbossim/src/ossim/CMakeLists.txt
+++ b/Utilities/otbossim/src/ossim/CMakeLists.txt
@@ -2,26 +2,26 @@ SET(LIB_NAME ossim)
 
 ########################################### BEGIN: GRAB SOURCE FILES ##########################################
 FILE(GLOB ossim_dll_main_SRCS RELATIVE_PATH ${CMAKE_CURRENT_SOURCE_DIR} "${CMAKE_CURRENT_SOURCE_DIR}/dll_main/*.cpp")
-FILE(GLOB ossim_SRCS  RELATIVE_PATH ${CMAKE_CURRENT_SOURCE_DIR} 
-        "${CMAKE_CURRENT_SOURCE_DIR}/ossimConfig*.cpp" 
-        "${CMAKE_CURRENT_SOURCE_DIR}/ossimVer*.cpp" 
-        "${CMAKE_CURRENT_SOURCE_DIR}/init/*.cpp" "${CMAKE_CURRENT_SOURCE_DIR}/init/*.c" 
-        "${CMAKE_CURRENT_SOURCE_DIR}/base/*.cpp" "${CMAKE_CURRENT_SOURCE_DIR}/base/*.c" 
-        "${CMAKE_CURRENT_SOURCE_DIR}/elevation/*.cpp" "${CMAKE_CURRENT_SOURCE_DIR}/elevation/*.c" 
-        "${CMAKE_CURRENT_SOURCE_DIR}/font/*.cpp" "${CMAKE_CURRENT_SOURCE_DIR}/font/*.c" 
-        "${CMAKE_CURRENT_SOURCE_DIR}/imaging/*.cpp" "${CMAKE_CURRENT_SOURCE_DIR}/imaging/*.c" 
-        "${CMAKE_CURRENT_SOURCE_DIR}/matrix/*.cpp" "${CMAKE_CURRENT_SOURCE_DIR}/matrix/*.c" 
+FILE(GLOB ossim_SRCS  RELATIVE_PATH ${CMAKE_CURRENT_SOURCE_DIR}
+        "${CMAKE_CURRENT_SOURCE_DIR}/ossimConfig*.cpp"
+        "${CMAKE_CURRENT_SOURCE_DIR}/ossimVer*.cpp"
+        "${CMAKE_CURRENT_SOURCE_DIR}/init/*.cpp" "${CMAKE_CURRENT_SOURCE_DIR}/init/*.c"
+        "${CMAKE_CURRENT_SOURCE_DIR}/base/*.cpp" "${CMAKE_CURRENT_SOURCE_DIR}/base/*.c"
+        "${CMAKE_CURRENT_SOURCE_DIR}/elevation/*.cpp" "${CMAKE_CURRENT_SOURCE_DIR}/elevation/*.c"
+        "${CMAKE_CURRENT_SOURCE_DIR}/font/*.cpp" "${CMAKE_CURRENT_SOURCE_DIR}/font/*.c"
+        "${CMAKE_CURRENT_SOURCE_DIR}/imaging/*.cpp" "${CMAKE_CURRENT_SOURCE_DIR}/imaging/*.c"
+        "${CMAKE_CURRENT_SOURCE_DIR}/matrix/*.cpp" "${CMAKE_CURRENT_SOURCE_DIR}/matrix/*.c"
         "${CMAKE_CURRENT_SOURCE_DIR}/parallel/*.cpp" "${CMAKE_CURRENT_SOURCE_DIR}/parallel/*.c"
-        "${CMAKE_CURRENT_SOURCE_DIR}/projection/*.cpp" "${CMAKE_CURRENT_SOURCE_DIR}/projection/*.c" 
-        "${CMAKE_CURRENT_SOURCE_DIR}/support_data/*.cpp" "${CMAKE_CURRENT_SOURCE_DIR}/support_data/*.c" 
-        "${CMAKE_CURRENT_SOURCE_DIR}/util/*.cpp" "${CMAKE_CURRENT_SOURCE_DIR}/util/*.c" 
-        "${CMAKE_CURRENT_SOURCE_DIR}/vec/*.cpp" "${CMAKE_CURRENT_SOURCE_DIR}/vec/*.c" 
-        "${CMAKE_CURRENT_SOURCE_DIR}/vpfutil/*.cpp" "${CMAKE_CURRENT_SOURCE_DIR}/vpfutil/*.c" 
+        "${CMAKE_CURRENT_SOURCE_DIR}/projection/*.cpp" "${CMAKE_CURRENT_SOURCE_DIR}/projection/*.c"
+        "${CMAKE_CURRENT_SOURCE_DIR}/support_data/*.cpp" "${CMAKE_CURRENT_SOURCE_DIR}/support_data/*.c"
+        "${CMAKE_CURRENT_SOURCE_DIR}/util/*.cpp" "${CMAKE_CURRENT_SOURCE_DIR}/util/*.c"
+        "${CMAKE_CURRENT_SOURCE_DIR}/vec/*.cpp" "${CMAKE_CURRENT_SOURCE_DIR}/vec/*.c"
+        "${CMAKE_CURRENT_SOURCE_DIR}/vpfutil/*.cpp" "${CMAKE_CURRENT_SOURCE_DIR}/vpfutil/*.c"
         "${CMAKE_CURRENT_SOURCE_DIR}/plugin/*.cpp" "${CMAKE_CURRENT_SOURCE_DIR}/plugin/*.c"
         "${CMAKE_CURRENT_SOURCE_DIR}/kbool/*.cpp" "${CMAKE_CURRENT_SOURCE_DIR}/kbool/*.c")
 
 IF(WIN32)
-	LIST(APPEND ossim_SRCS "${ossim_dll_main_SRCS}")
+        LIST(APPEND ossim_SRCS "${ossim_dll_main_SRCS}")
 ENDIF(WIN32)
 
 ADD_DEFINITIONS("-DOSSIMMAKINGDLL")
@@ -43,10 +43,10 @@ FILE(GLOB ossim_vec_HDRS RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}" "${CMAKE_CURRENT
 FILE(GLOB ossim_vpfutil_HDRS RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}" "${CMAKE_CURRENT_SOURCE_DIR}/../../include/ossim/vpfutil/*.h")
 
 MESSAGE( "${ossim_HDRS}" )
-SET(OSSIM_HEADER_FILES 
-	${ossim_HDRS}
- 	${ossim_base_HDRS} ${ossim_elevation_HDRS} ${ossim_font_HDRS}  ${ossim_imaging_HDRS} ${ossim_init_HDRS} ${ossim_kbool_HDRS} 
-	${ossim_matrix_HDRS} ${ossim_parallel_HDRS} ${ossim_plugin_HDRS} ${ossim_projection_HDRS} ${ossim_support_data_HDRS} ${ossim_util_HDRS} ${ossim_vec_HDRS}  ${ossim_vpfutil_HDRS} )
+SET(OSSIM_HEADER_FILES
+        ${ossim_HDRS}
+         ${ossim_base_HDRS} ${ossim_elevation_HDRS} ${ossim_font_HDRS}  ${ossim_imaging_HDRS} ${ossim_init_HDRS} ${ossim_kbool_HDRS}
+        ${ossim_matrix_HDRS} ${ossim_parallel_HDRS} ${ossim_plugin_HDRS} ${ossim_projection_HDRS} ${ossim_support_data_HDRS} ${ossim_util_HDRS} ${ossim_vec_HDRS}  ${ossim_vpfutil_HDRS} )
 
 
 ################################## APPLE Framework support deep header mapping ###################################
@@ -100,30 +100,30 @@ IF(APPLE)
 ENDIF(APPLE)
 
 #################################### SETUP the required link parameters using the Ossim macro ####################################
-OSSIM_LINK_LIBRARY(${LIB_NAME} 
-                   COMPONENT_NAME ossim 
+OSSIM_LINK_LIBRARY(${LIB_NAME}
+                   COMPONENT_NAME ossim
                    TYPE ${OSSIM_USER_DEFINED_DYNAMIC_OR_STATIC}
                    LIBRARIES ${JPEG_LIBRARIES} ${TIFF_LIBRARIES} ${GEOTIFF_LIBRARIES} ${OPENTHREADS_LIBRARIES} ${FREETYPE_LIBRARIES} ${MPI_LIBRARIES} ${ZLIB_LIBRARIES} ${DL_LIBRARY}
-                   HEADERS "${OSSIM_HEADER_FILES}" 
+                   HEADERS "${OSSIM_HEADER_FILES}"
                    PUBLIC_HEADERS "${ossim_HDRS}"
                    SOURCE_FILES "${ossim_SRCS}"
                    INSTALL_LIB VERSION_SYMLINKS INSTALL_HEADERS)
 
-########################################################## If DO special case for ossim core needs to have the files mapped properly ################################ 
+########################################################## If DO special case for ossim core needs to have the files mapped properly ################################
 IF(NOT OSSIM_BUILD_FRAMEWORKS OR NOT APPLE)
-   install(FILES ${ossim_HDRS} DESTINATION include/ossim COMPONENT ossim) 
-   install(FILES ${ossim_base_HDRS} DESTINATION include/ossim/base COMPONENT ossim) 
+   install(FILES ${ossim_HDRS} DESTINATION include/ossim COMPONENT ossim)
+   install(FILES ${ossim_base_HDRS} DESTINATION include/ossim/base COMPONENT ossim)
    install(FILES ${ossim_elevation_HDRS} DESTINATION include/ossim/elevation COMPONENT ossim)
    install(FILES ${ossim_font_HDRS} DESTINATION include/ossim/font COMPONENT ossim)
-   install(FILES ${ossim_imaging_HDRS} DESTINATION include/ossim/imaging COMPONENT ossim) 
-   install(FILES ${ossim_init_HDRS} DESTINATION include/ossim/init COMPONENT ossim) 
-   install(FILES ${ossim_kbool_HDRS} DESTINATION include/ossim/kbool COMPONENT ossim) 
-   install(FILES ${ossim_matrix_HDRS} DESTINATION include/ossim/matrix COMPONENT ossim) 
-   install(FILES ${ossim_parallel_HDRS} DESTINATION include/ossim/parallel COMPONENT ossim) 
-   install(FILES ${ossim_plugin_HDRS} DESTINATION include/ossim/plugin COMPONENT ossim) 
-   install(FILES ${ossim_projection_HDRS} DESTINATION include/ossim/projection COMPONENT ossim) 
-   install(FILES ${ossim_support_data_HDRS} DESTINATION include/ossim/support_data COMPONENT ossim) 
-   install(FILES ${ossim_util_HDRS} DESTINATION include/ossim/util COMPONENT ossim) 
-   install(FILES ${ossim_vec_HDRS} DESTINATION include/ossim/vec COMPONENT ossim) 
-   install(FILES ${ossim_vpfutil_HDRS} DESTINATION include/ossim/vpfutil COMPONENT ossim) 
+   install(FILES ${ossim_imaging_HDRS} DESTINATION include/ossim/imaging COMPONENT ossim)
+   install(FILES ${ossim_init_HDRS} DESTINATION include/ossim/init COMPONENT ossim)
+   install(FILES ${ossim_kbool_HDRS} DESTINATION include/ossim/kbool COMPONENT ossim)
+   install(FILES ${ossim_matrix_HDRS} DESTINATION include/ossim/matrix COMPONENT ossim)
+   install(FILES ${ossim_parallel_HDRS} DESTINATION include/ossim/parallel COMPONENT ossim)
+   install(FILES ${ossim_plugin_HDRS} DESTINATION include/ossim/plugin COMPONENT ossim)
+   install(FILES ${ossim_projection_HDRS} DESTINATION include/ossim/projection COMPONENT ossim)
+   install(FILES ${ossim_support_data_HDRS} DESTINATION include/ossim/support_data COMPONENT ossim)
+   install(FILES ${ossim_util_HDRS} DESTINATION include/ossim/util COMPONENT ossim)
+   install(FILES ${ossim_vec_HDRS} DESTINATION include/ossim/vec COMPONENT ossim)
+   install(FILES ${ossim_vpfutil_HDRS} DESTINATION include/ossim/vpfutil COMPONENT ossim)
 ENDIF(NOT OSSIM_BUILD_FRAMEWORKS OR NOT APPLE)
diff --git a/Utilities/otbossimplugins/CMakeLists.txt b/Utilities/otbossimplugins/CMakeLists.txt
index fa563ec4840f3db0a460e36ba839372d37557245..8aa5f85b043f055a8ee8643aaed3a5d91c664a54 100644
--- a/Utilities/otbossimplugins/CMakeLists.txt
+++ b/Utilities/otbossimplugins/CMakeLists.txt
@@ -9,8 +9,8 @@ SET(OSSIMPLUGINS_SVN_REVISION "18162")
 # patch number for OTB modifications applied on top of OSSIM_SVN_REVISION (used for .so versioning)
 SET(OSSIMPLUGINS_OTB_PATCH "1")
 
-INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR} 
-  ${CMAKE_CURRENT_SOURCE_DIR}/ossim 
+INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}
+  ${CMAKE_CURRENT_SOURCE_DIR}/ossim
 #  ${OTB_SOURCE_DIR}/Utilities/otbossim/include
 #  ${OTB_BINARY_DIR}/Utilities/otbossim/include
 )