From 2f7fe64e1257c017117a58742a17fb6c3d0d1a58 Mon Sep 17 00:00:00 2001 From: Guillaume Pasero <guillaume.pasero@c-s.fr> Date: Tue, 16 Oct 2018 18:13:02 +0200 Subject: [PATCH] BUG: #1734: replace envi format with TIF --- Examples/Filtering/test/CMakeLists.txt | 18 ++-- .../OSSIMAdapters/test/CMakeLists.txt | 2 +- .../AppClassification/test/CMakeLists.txt | 6 +- Modules/Core/ImageBase/test/CMakeLists.txt | 20 ++-- Modules/Core/Transform/test/CMakeLists.txt | 14 +-- .../RoadExtraction/test/CMakeLists.txt | 36 +++---- Modules/Feature/Corner/test/CMakeLists.txt | 2 +- .../Feature/Descriptors/test/CMakeLists.txt | 12 +-- Modules/Feature/Edge/test/CMakeLists.txt | 94 +++++++++---------- .../ChangeDetection/test/CMakeLists.txt | 18 ++-- .../ImageManipulation/test/CMakeLists.txt | 38 ++++---- .../MorphologicalPyramid/test/CMakeLists.txt | 34 +++---- .../Filtering/Projection/test/CMakeLists.txt | 6 +- Modules/IO/ImageIO/test/CMakeLists.txt | 18 ++-- .../Learning/LearningBase/test/CMakeLists.txt | 6 +- Modules/Learning/SOM/test/CMakeLists.txt | 46 ++++----- .../DisplacementField/test/CMakeLists.txt | 36 +++---- 17 files changed, 203 insertions(+), 203 deletions(-) diff --git a/Examples/Filtering/test/CMakeLists.txt b/Examples/Filtering/test/CMakeLists.txt index 4404e1add6..972d860fc2 100644 --- a/Examples/Filtering/test/CMakeLists.txt +++ b/Examples/Filtering/test/CMakeLists.txt @@ -132,13 +132,13 @@ otb_add_test(NAME fiTeMathematicalMorphologyGrayscaleFiltersTest COMMAND ${OTB_T otb_add_test(NAME fiTeLaplacianRecursiveGaussianImageFilter1Test COMMAND ${OTB_TEST_DRIVER} --compare-n-images ${NOTOL} 2 - ${BASELINE}/LaplacianRecursiveGaussianImageFilteroutput5.hdr - ${TEMP}/LaplacianRecursiveGaussianImageFilteroutput5.hdr + ${BASELINE}/LaplacianRecursiveGaussianImageFilteroutput5.tif + ${TEMP}/LaplacianRecursiveGaussianImageFilteroutput5.tif ${BASELINE}/LaplacianRecursiveGaussianImageFilterOutput5.png ${TEMP}/LaplacianRecursiveGaussianImageFilterOutput5.png Execute $<TARGET_FILE:LaplacianRecursiveGaussianImageFilter1> ${INPUTDATA}/ROISpot5.png - ${TEMP}/LaplacianRecursiveGaussianImageFilteroutput5.hdr + ${TEMP}/LaplacianRecursiveGaussianImageFilteroutput5.tif 5 ${TEMP}/LaplacianRecursiveGaussianImageFilterOutput5.png ) @@ -148,13 +148,13 @@ otb_add_test(NAME fiTeLaplacianRecursiveGaussianImageFilter1Test COMMAND ${OTB_T otb_add_test(NAME fiTeLaplacianRecursiveGaussianImageFilter2Test COMMAND ${OTB_TEST_DRIVER} --compare-n-images ${NOTOL} 2 - ${BASELINE}/LaplacianRecursiveGaussianImageFilter2output5.hdr - ${TEMP}/LaplacianRecursiveGaussianImageFilter2output5.hdr + ${BASELINE}/LaplacianRecursiveGaussianImageFilter2output5.tif + ${TEMP}/LaplacianRecursiveGaussianImageFilter2output5.tif ${BASELINE}/LaplacianRecursiveGaussianImageFilter2Output5.png ${TEMP}/LaplacianRecursiveGaussianImageFilter2Output5.png Execute $<TARGET_FILE:LaplacianRecursiveGaussianImageFilter2> ${INPUTDATA}/ROISpot5.png - ${TEMP}/LaplacianRecursiveGaussianImageFilter2output5.hdr + ${TEMP}/LaplacianRecursiveGaussianImageFilter2output5.tif 5 ${TEMP}/LaplacianRecursiveGaussianImageFilter2Output5.png ) @@ -210,13 +210,13 @@ otb_add_test(NAME fiTeBinaryThresholdImageFilterTest COMMAND ${OTB_TEST_DRIVER} otb_add_test(NAME fiTeDerivativeImageFilterTest COMMAND ${OTB_TEST_DRIVER} --compare-n-images ${NOTOL} 2 - ${BASELINE}/DerivativeImageFilterFloatOutput.hdr - ${TEMP}/DerivativeImageFilterFloatOutput.hdr + ${BASELINE}/DerivativeImageFilterFloatOutput.tif + ${TEMP}/DerivativeImageFilterFloatOutput.tif ${BASELINE}/DerivativeImageFilterOutput.png ${TEMP}/DerivativeImageFilterOutput.png Execute $<TARGET_FILE:DerivativeImageFilter> ${INPUTDATA}/ROISpot5.png - ${TEMP}/DerivativeImageFilterFloatOutput.hdr + ${TEMP}/DerivativeImageFilterFloatOutput.tif ${TEMP}/DerivativeImageFilterOutput.png 1 0 ) diff --git a/Modules/Adapters/OSSIMAdapters/test/CMakeLists.txt b/Modules/Adapters/OSSIMAdapters/test/CMakeLists.txt index 807fb5c7aa..7b9d54c234 100644 --- a/Modules/Adapters/OSSIMAdapters/test/CMakeLists.txt +++ b/Modules/Adapters/OSSIMAdapters/test/CMakeLists.txt @@ -169,7 +169,7 @@ otb_add_test(NAME prTvossimElevManagerTest2 COMMAND otbOSSIMAdaptersTestDriver otb_add_test(NAME prTvossimElevManagerTest4 COMMAND otbOSSIMAdaptersTestDriver --compare-image ${EPSILON_9} ${BASELINE}/prTvossimElevManagerTest4 - ${TEMP}/prTvossimElevManagerTest4.hdr + ${TEMP}/prTvossimElevManagerTest4.tif otbOssimElevManagerTest4 ${INPUTDATA}/DEM/srtm_directory ${TEMP}/prTvossimElevManagerTest4 diff --git a/Modules/Applications/AppClassification/test/CMakeLists.txt b/Modules/Applications/AppClassification/test/CMakeLists.txt index 08f664a1d5..831403ceb4 100644 --- a/Modules/Applications/AppClassification/test/CMakeLists.txt +++ b/Modules/Applications/AppClassification/test/CMakeLists.txt @@ -46,7 +46,7 @@ otb_test_application(NAME apTvClSOMClassificationFull -vm ${INPUTDATA}/poupees_sub_c1.png -tp 0.8 -ts 13000 - -som ${TEMP}/apTvClSOMClassificationMap.hdr + -som ${TEMP}/apTvClSOMClassificationMap.tif -sx 30 -sy 30 -nx 9 @@ -59,8 +59,8 @@ otb_test_application(NAME apTvClSOMClassificationFull VALID --compare-n-images ${NOTOL} 2 ${BASELINE}/apTvClSOMClassificationFull.tif ${TEMP}/apTvClSOMClassificationFull.tif - ${BASELINE}/apTvClSOMClassificationMap.hdr - ${TEMP}/apTvClSOMClassificationMap.hdr) + ${BASELINE}/apTvClSOMClassificationMap.tif + ${TEMP}/apTvClSOMClassificationMap.tif) #----------- ImageClassifier TESTS ---------------- diff --git a/Modules/Core/ImageBase/test/CMakeLists.txt b/Modules/Core/ImageBase/test/CMakeLists.txt index b2ac501075..4e1896b536 100644 --- a/Modules/Core/ImageBase/test/CMakeLists.txt +++ b/Modules/Core/ImageBase/test/CMakeLists.txt @@ -133,11 +133,11 @@ otb_add_test(NAME coTvMultiChannelROI_RGB2RGB_PNG COMMAND otbImageBaseTestDriver -channels 1 2 3 ) otb_add_test(NAME coTvMultiChannelROI_5c_BSQ COMMAND otbImageBaseTestDriver - --compare-image ${NOTOL} ${BASELINE}/coMultiChannelExtractROI_RGB_ENVI_poupees_303_2_134_330_channels_12321.hdr - ${TEMP}/coMultiChannelExtractROI_RGB_ENVI_poupees_303_2_134_330_channels_12321.hdr + --compare-image ${NOTOL} ${BASELINE}/coMultiChannelExtractROI_RGB_ENVI_poupees_303_2_134_330_channels_12321.tif + ${TEMP}/coMultiChannelExtractROI_RGB_ENVI_poupees_303_2_134_330_channels_12321.tif otbMultiChannelExtractROI ${INPUTDATA}/poupees.hdr - ${TEMP}/coMultiChannelExtractROI_RGB_ENVI_poupees_303_2_134_330_channels_12321.hdr + ${TEMP}/coMultiChannelExtractROI_RGB_ENVI_poupees_303_2_134_330_channels_12321.tif -startX 303 -startY 2 -sizeX 134 -sizeY 330 -channels 1 2 3 2 1 ) otb_add_test(NAME coTvMultiChannelROI_RGB2NG_PNG1 COMMAND otbImageBaseTestDriver @@ -204,8 +204,8 @@ otb_add_test(NAME coTvExtractROITestMetaData_HDR COMMAND otbImageBaseTestDriver --ignore-lines-with 4 Origin: Source: Image ImportImageContainer otbExtractROITestMetaData LARGEINPUT{QUICKBIRD/TOULOUSE/000000128955_01_P001_PAN/02APR01105228-P1BS-000000128955_01_P001.TIF} - ${TEMP}/coTvExtractROITestMetaData1.hdr - ${TEMP}/coTvExtractROITestMetaData2.hdr + ${TEMP}/coTvExtractROITestMetaData1.tif + ${TEMP}/coTvExtractROITestMetaData2.tif ${TEMP}/coTvExtractROITestMetaData1_hdr.txt ${TEMP}/coTvExtractROITestMetaData2_hdr.txt ) @@ -698,7 +698,7 @@ otb_add_test(NAME ioTvMultiChannelROI_JPEG2000_2_TIF_res3_2 COMMAND otbImageBa otb_add_test(NAME ioTvMultiMonoChannelROI_RADARSAT2ENVI COMMAND otbImageBaseTestDriver otbMultiToMonoChannelExtractROI -ushort LARGEINPUT{RADARSAT1/GOMA/SCENE01/} - -ushort ${TEMP}/ioMultiMonoChannelROI_RADARSAT2ENVI_2559_3591_337_280.hdr + -ushort ${TEMP}/ioMultiMonoChannelROI_RADARSAT2ENVI_2559_3591_337_280.tif -startX 2559 -startY 3591 -sizeX 337 -sizeY 280 ) # FIXME this test depends on an other test which requires largeinput. Need to circle the test with it(otb_data_use_large_input). It should not happen @@ -706,11 +706,11 @@ if(OTB_DATA_USE_LARGEINPUT) # --- RADARSAT (GDAL) dir name --- otb_add_test(NAME ioTvMultiMonoChannelROI_RADARSAT_ENVI2ENVI COMMAND otbImageBaseTestDriver # THOMAS (provisoire) : Images OK mais erreur au DIFF ITK !!! - # --compare-image ${EPSILON_9} ${BASELINE}/ioMultiMonoChannelROI_RADARSAT2ENVI_2559_3591_337_280.hdr - # ${TEMP}/ioMultiMonoChannelROI_RADARSAT_ENVI2ENVI_2559_3591_337_280_2.hdr + # --compare-image ${EPSILON_9} ${BASELINE}/ioMultiMonoChannelROI_RADARSAT2ENVI_2559_3591_337_280.tif + # ${TEMP}/ioMultiMonoChannelROI_RADARSAT_ENVI2ENVI_2559_3591_337_280_2.tif otbMultiToMonoChannelExtractROI - -ushort ${TEMP}/ioMultiMonoChannelROI_RADARSAT2ENVI_2559_3591_337_280.hdr - -ushort ${TEMP}/ioMultiMonoChannelROI_RADARSAT_ENVI2ENVI_2559_3591_337_280_2.hdr + -ushort ${TEMP}/ioMultiMonoChannelROI_RADARSAT2ENVI_2559_3591_337_280.tif + -ushort ${TEMP}/ioMultiMonoChannelROI_RADARSAT_ENVI2ENVI_2559_3591_337_280_2.tif -startX 0 -startY 0 -sizeX ParseHdfSubsetName337 -sizeY 280 ) set_tests_properties(ioTvMultiMonoChannelROI_RADARSAT_ENVI2ENVI PROPERTIES DEPENDS ioTvMultiMonoChannelROI_RADARSAT2ENVI) diff --git a/Modules/Core/Transform/test/CMakeLists.txt b/Modules/Core/Transform/test/CMakeLists.txt index 58aa22bd30..b79876631a 100644 --- a/Modules/Core/Transform/test/CMakeLists.txt +++ b/Modules/Core/Transform/test/CMakeLists.txt @@ -92,11 +92,11 @@ otb_add_test(NAME prTvTestCreateProjectionWithOSSIM_Toulouse COMMAND otbTransfor ) otb_add_test(NAME bfTvLogPolarTransformResample COMMAND otbTransformTestDriver - --compare-image ${EPSILON_7} ${BASELINE}/bfLogPolarTransformResampleOutput.hdr - ${TEMP}/bfLogPolarTransformResampleOutput.hdr + --compare-image ${EPSILON_7} ${BASELINE}/bfLogPolarTransformResampleOutput.tif + ${TEMP}/bfLogPolarTransformResampleOutput.tif otbLogPolarTransformResample ${INPUTDATA}/circle.hdr - ${TEMP}/bfLogPolarTransformResampleOutput.hdr + ${TEMP}/bfLogPolarTransformResampleOutput.tif ) otb_add_test(NAME bfTvLogPolarTransform COMMAND otbTransformTestDriver @@ -169,11 +169,11 @@ otb_add_test(NAME bfTvInverseLogPolarTransform COMMAND otbTransformTestDriver 6 0 0 10 20 45 60 3.14 3.14 1 0 0 1 ) otb_add_test(NAME bfTvInverseLogPolarTransformResample COMMAND otbTransformTestDriver - --compare-image ${NOTOL} ${BASELINE}/bfInverseLogPolarTransformResampleOutput.hdr - ${TEMP}/bfInverseLogPolarTransformResampleOutput.hdr + --compare-image ${NOTOL} ${BASELINE}/bfInverseLogPolarTransformResampleOutput.tif + ${TEMP}/bfInverseLogPolarTransformResampleOutput.tif otbInverseLogPolarTransformResample - ${BASELINE}/bfLogPolarTransformResampleOutput.hdr - ${TEMP}/bfInverseLogPolarTransformResampleOutput.hdr + ${BASELINE}/bfLogPolarTransformResampleOutput.tif + ${TEMP}/bfInverseLogPolarTransformResampleOutput.tif ) otb_add_test(NAME bfTvStreamingResampleImageFilterWithAffineTransform COMMAND otbTransformTestDriver otbStreamingResampleImageFilterWithAffineTransform diff --git a/Modules/Detection/RoadExtraction/test/CMakeLists.txt b/Modules/Detection/RoadExtraction/test/CMakeLists.txt index c33f442a42..cbc3d301b8 100644 --- a/Modules/Detection/RoadExtraction/test/CMakeLists.txt +++ b/Modules/Detection/RoadExtraction/test/CMakeLists.txt @@ -59,12 +59,12 @@ otb_add_test(NAME feTvLikelihoodPathListFilter COMMAND otbRoadExtractionTestDriv otb_add_test(NAME feTvRemoveWrongDirectionFilter COMMAND otbRoadExtractionTestDriver --compare-image ${EPSILON_8} - ${BASELINE}/feTvRemoveWrongDirectionOutput.hdr - ${TEMP}/feTvRemoveWrongDirectionOutput.hdr + ${BASELINE}/feTvRemoveWrongDirectionOutput.tif + ${TEMP}/feTvRemoveWrongDirectionOutput.tif otbRemoveWrongDirectionFilter ${INPUTDATA}/InputForRoadDetection_IsolatedRem.hdr ${INPUTDATA}/InputForRoadDetectionScalarProductDir.hdr - ${TEMP}/feTvRemoveWrongDirectionOutput.hdr + ${TEMP}/feTvRemoveWrongDirectionOutput.tif ) otb_add_test(NAME feTvSimplifyPathListFilter COMMAND otbRoadExtractionTestDriver @@ -89,21 +89,21 @@ otb_add_test(NAME feTvAlignMV2ITK COMMAND otbRoadExtractionTestDriver otb_add_test(NAME feTvNonMaxRemovalByDirectionFilter COMMAND otbRoadExtractionTestDriver --compare-image ${EPSILON_8} - ${BASELINE}/feTvNonMaxRemovalByDirectionOutput.hdr - ${TEMP}/feTvNonMaxRemovalByDirectionOutput.hdr + ${BASELINE}/feTvNonMaxRemovalByDirectionOutput.tif + ${TEMP}/feTvNonMaxRemovalByDirectionOutput.tif otbNonMaxRemovalByDirectionFilter ${INPUTDATA}/InputForRoadDetection_WrongRem.hdr ${INPUTDATA}/InputForRoadDetectionScalarProductDir.hdr - ${TEMP}/feTvNonMaxRemovalByDirectionOutput.hdr + ${TEMP}/feTvNonMaxRemovalByDirectionOutput.tif ) otb_add_test(NAME feTvRoadExtractionFilter COMMAND otbRoadExtractionTestDriver --compare-image ${EPSILON_8} - ${BASELINE}/feTvOutputRoadDetection.hdr - ${TEMP}/feTvOutputRoadDetection.hdr + ${BASELINE}/feTvOutputRoadDetection.tif + ${TEMP}/feTvOutputRoadDetection.tif otbRoadExtractionFilter ${INPUTDATA}/qb_RoadExtract.img.hdr - ${TEMP}/feTvOutputRoadDetection.hdr + ${TEMP}/feTvOutputRoadDetection.tif 337 557 432 859 # ReferencePixel 1.0 # Alpha 0.00005 # AmplitudeThreshold @@ -154,12 +154,12 @@ otb_add_test(NAME feTvParallelLinePathListFilter COMMAND otbRoadExtractionTestDr otb_add_test(NAME feTvRemoveIsolatedByDirectionFilter COMMAND otbRoadExtractionTestDriver --compare-image ${EPSILON_8} - ${BASELINE}/feTvRemoveIsolatedByDirectionOutput.hdr - ${TEMP}/feTvRemoveIsolatedByDirectionOutput.hdr + ${BASELINE}/feTvRemoveIsolatedByDirectionOutput.tif + ${TEMP}/feTvRemoveIsolatedByDirectionOutput.tif otbRemoveIsolatedByDirectionFilter ${INPUTDATA}/InputForRoadDetectionScalarProductMod.hdr ${INPUTDATA}/InputForRoadDetectionScalarProductDir.hdr - ${TEMP}/feTvRemoveIsolatedByDirectionOutput.hdr + ${TEMP}/feTvRemoveIsolatedByDirectionOutput.tif ) otb_add_test(NAME fzTvVectorDataToRoadDescriptionFilter COMMAND otbRoadExtractionTestDriver @@ -183,14 +183,14 @@ otb_add_test(NAME feTpSimplifyManyPathListFilter COMMAND otbRoadExtractionTestDr otb_add_test(NAME feTvNeighborhoodScalarProductFilter COMMAND otbRoadExtractionTestDriver --compare-n-images ${EPSILON_6} 2 - ${BASELINE}/feTvNeighborhoodScalarProductModulusOutput.hdr - ${TEMP}/feTvNeighborhoodScalarProductModulusOutput.hdr - ${BASELINE}/feTvNeighborhoodScalarProductDirectionOutput.hdr - ${TEMP}/feTvNeighborhoodScalarProductDirectionOutput.hdr + ${BASELINE}/feTvNeighborhoodScalarProductModulusOutput.tif + ${TEMP}/feTvNeighborhoodScalarProductModulusOutput.tif + ${BASELINE}/feTvNeighborhoodScalarProductDirectionOutput.tif + ${TEMP}/feTvNeighborhoodScalarProductDirectionOutput.tif otbNeighborhoodScalarProductFilter ${INPUTDATA}/InputForRoadDetection_SpectralAngle.hdr - ${TEMP}/feTvNeighborhoodScalarProductModulusOutput.hdr - ${TEMP}/feTvNeighborhoodScalarProductDirectionOutput.hdr + ${TEMP}/feTvNeighborhoodScalarProductModulusOutput.tif + ${TEMP}/feTvNeighborhoodScalarProductDirectionOutput.tif 1.0 ) diff --git a/Modules/Feature/Corner/test/CMakeLists.txt b/Modules/Feature/Corner/test/CMakeLists.txt index b2e4394d99..bdbe07435d 100644 --- a/Modules/Feature/Corner/test/CMakeLists.txt +++ b/Modules/Feature/Corner/test/CMakeLists.txt @@ -81,7 +81,7 @@ otb_add_test(NAME feTvHarrisPoupee COMMAND otbCornerTestDriver otb_add_test(NAME feTvHarrisProduceImageToValidHarrisToPointSet COMMAND otbCornerTestDriver otbHarrisImage ${INPUTDATA}/small_points.hdr - ${TEMP}/small_points_harris.hdr + ${TEMP}/small_points_harris.tif 1.0 1.0 1.0) otb_add_test(NAME feTvHarrisImageQB COMMAND otbCornerTestDriver diff --git a/Modules/Feature/Descriptors/test/CMakeLists.txt b/Modules/Feature/Descriptors/test/CMakeLists.txt index fd88b49246..6e567acdbd 100644 --- a/Modules/Feature/Descriptors/test/CMakeLists.txt +++ b/Modules/Feature/Descriptors/test/CMakeLists.txt @@ -171,14 +171,14 @@ otb_add_test(NAME feTvImageToSIFTKeyPointSetFilterQB_SuburbOutputAscii COMMAND o otb_add_test(NAME feTvForwardFourierMellinImageFilter COMMAND otbDescriptorsTestDriver --compare-n-images ${EPSILON_6} 2 - ${BASELINE}/feForwardFourierMellinImageFilterReal.hdr - ${TEMP}/feForwardFourierMellinImageFilterReal.hdr - ${BASELINE}/feForwardFourierMellinImageFilterImag.hdr - ${TEMP}/feForwardFourierMellinImageFilterImag.hdr + ${BASELINE}/feForwardFourierMellinImageFilterReal.tif + ${TEMP}/feForwardFourierMellinImageFilterReal.tif + ${BASELINE}/feForwardFourierMellinImageFilterImag.tif + ${TEMP}/feForwardFourierMellinImageFilterImag.tif otbFourierMellinImageFilter ${INPUTDATA}/circle.hdr - ${TEMP}/feForwardFourierMellinImageFilterReal.hdr - ${TEMP}/feForwardFourierMellinImageFilterImag.hdr) + ${TEMP}/feForwardFourierMellinImageFilterReal.tif + ${TEMP}/feForwardFourierMellinImageFilterImag.tif) otb_add_test(NAME feTvImageToHessianDeterminantImageFilter COMMAND otbDescriptorsTestDriver --compare-image ${EPSILON_3} diff --git a/Modules/Feature/Edge/test/CMakeLists.txt b/Modules/Feature/Edge/test/CMakeLists.txt index 5872517718..3389a4e9f5 100644 --- a/Modules/Feature/Edge/test/CMakeLists.txt +++ b/Modules/Feature/Edge/test/CMakeLists.txt @@ -72,11 +72,11 @@ otb_add_test(NAME bfTvHorizontalSobelVectorImageFilter COMMAND otbEdgeTestDriver -out ${TEMP}/bfTvHorizontalSobelVectorImageFilter.tif) otb_add_test(NAME feTvAsymmetricFusionOfLineDetector COMMAND otbEdgeTestDriver - --compare-image ${EPSILON_8} ${BASELINE}/feFiltreAsymmetricFusion_amst_2_3.hdr - ${TEMP}/feFiltreAsymmetricFusion_amst_2_3.hdr + --compare-image ${EPSILON_8} ${BASELINE}/feFiltreAsymmetricFusion_amst_2_3.tif + ${TEMP}/feFiltreAsymmetricFusion_amst_2_3.tif otbAsymmetricFusionOfLineDetector ${INPUTDATA}/amst.png - ${TEMP}/feFiltreAsymmetricFusion_amst_2_3.hdr + ${TEMP}/feFiltreAsymmetricFusion_amst_2_3.tif 2 3) @@ -97,20 +97,20 @@ otb_add_test(NAME feTvLocalHoughDraw2 COMMAND otbEdgeTestDriver 20 20 1) otb_add_test(NAME feTvLocalHoughDraw COMMAND otbEdgeTestDriver - --compare-image ${EPSILON_8} ${BASELINE}/feFiltreLocalHoughDraw_ImageLine_20_20_2.hdr - ${TEMP}/feFiltreLocalHoughDraw_ImageLine_20_20_2.hdr + --compare-image ${EPSILON_8} ${BASELINE}/feFiltreLocalHoughDraw_ImageLine_20_20_2.tif + ${TEMP}/feFiltreLocalHoughDraw_ImageLine_20_20_2.tif otbLocalHoughDraw ${INPUTDATA}/ImageLine.bsq.hdr - ${TEMP}/feFiltreLocalHoughDraw_ImageLine_20_20_2.hdr + ${TEMP}/feFiltreLocalHoughDraw_ImageLine_20_20_2.tif 20 20 1) otb_add_test(NAME feTvAssociativeSymmetricalSum COMMAND otbEdgeTestDriver - --compare-image ${EPSILON_8} ${BASELINE}/feFiltreASS_amst_2_3.hdr - ${TEMP}/feFiltreASS_amst_2_3.hdr + --compare-image ${EPSILON_8} ${BASELINE}/feFiltreASS_amst_2_3.tif + ${TEMP}/feFiltreASS_amst_2_3.tif otbAssociativeSymmetricalSum - ${BASELINE}/feFiltreLineRatioLinear_amst_2_3.hdr - ${BASELINE}/feFiltreLineCorrelationLinear_amst_2_3.hdr - ${TEMP}/feFiltreASS_amst_2_3.hdr) + ${BASELINE}/feFiltreLineRatioLinear_amst_2_3.tif + ${BASELINE}/feFiltreLineCorrelationLinear_amst_2_3.tif + ${TEMP}/feFiltreASS_amst_2_3.tif) @@ -136,11 +136,11 @@ otb_add_test(NAME bfTvEdgeDensityImageFilter COMMAND otbEdgeTestDriver ) otb_add_test(NAME feTvLineCorrelation COMMAND otbEdgeTestDriver - --compare-image ${EPSILON_8} ${BASELINE}/feFiltreLineCorrelation_amst_2_3.hdr - ${TEMP}/feFiltreLineCorrelation_amst_2_3.hdr + --compare-image ${EPSILON_8} ${BASELINE}/feFiltreLineCorrelation_amst_2_3.tif + ${TEMP}/feFiltreLineCorrelation_amst_2_3.tif otbLineCorrelationDetector ${INPUTDATA}/amst.png - ${TEMP}/feFiltreLineCorrelation_amst_2_3.hdr + ${TEMP}/feFiltreLineCorrelation_amst_2_3.tif 2 3) otb_add_test(NAME bfTvSobelVectorImageFilter COMMAND otbEdgeTestDriver @@ -160,12 +160,12 @@ otb_add_test(NAME feTvHoughTransform2DLinesImage COMMAND otbEdgeTestDriver ) otb_add_test(NAME feTvPixelSuppressionByDirection COMMAND otbEdgeTestDriver - --compare-image ${NOTOL} ${BASELINE}/feFiltrePixelSuppr_ImageLine_2_0_3.hdr - ${TEMP}/feFiltrePixelSuppr_ImageLine_2_0_3.hdr + --compare-image ${NOTOL} ${BASELINE}/feFiltrePixelSuppr_ImageLine_2_0_3.tif + ${TEMP}/feFiltrePixelSuppr_ImageLine_2_0_3.tif otbPixelSuppressionByDirection ${INPUTDATA}/ImageLine_hd.bsq.hdr ${INPUTDATA}/ImageLineDir.bsq.hdr - ${TEMP}/feFiltrePixelSuppr_ImageLine_2_0_3.hdr + ${TEMP}/feFiltrePixelSuppr_ImageLine_2_0_3.tif 2 0.3) @@ -179,28 +179,28 @@ otb_add_test(NAME feTvLocalHough COMMAND otbEdgeTestDriver 20 20 1) otb_add_test(NAME feTvExtractSegments COMMAND otbEdgeTestDriver - --compare-image ${NOTOL} ${BASELINE}/feFiltreExtractSegments_ImageLine.hdr - ${TEMP}/feFiltreExtractSegments_ImageLine.hdr + --compare-image ${NOTOL} ${BASELINE}/feFiltreExtractSegments_ImageLine.tif + ${TEMP}/feFiltreExtractSegments_ImageLine.tif otbExtractSegments ${INPUTDATA}/ImageLine_hd.bsq.hdr ${INPUTDATA}/ImageLineDir.bsq.hdr - ${TEMP}/feFiltreExtractSegments_ImageLine.hdr + ${TEMP}/feFiltreExtractSegments_ImageLine.tif 10 0.3 10 10 3 10 0.5) otb_add_test(NAME feTvLineRatio COMMAND otbEdgeTestDriver - --compare-image ${EPSILON_8} ${BASELINE}/feFiltreLineRatio_amst_2_3.hdr - ${TEMP}/feFiltreLineRatio_amst_2_3.hdr + --compare-image ${EPSILON_8} ${BASELINE}/feFiltreLineRatio_amst_2_3.tif + ${TEMP}/feFiltreLineRatio_amst_2_3.tif otbLineRatioDetector ${INPUTDATA}/amst.png - ${TEMP}/feFiltreLineRatio_amst_2_3.hdr + ${TEMP}/feFiltreLineRatio_amst_2_3.tif 2 3) otb_add_test(NAME feTvTouziDir COMMAND otbEdgeTestDriver - --compare-image ${EPSILON_8} ${BASELINE}/feFiltreTouzi_amst_dir_3.hdr - ${TEMP}/feFiltreTouzi_amst_dir_3.hdr + --compare-image ${EPSILON_8} ${BASELINE}/feFiltreTouzi_amst_dir_3.tif + ${TEMP}/feFiltreTouzi_amst_dir_3.tif otbTouziEdgeDetectorDirection ${INPUTDATA}/amst.png - ${TEMP}/feFiltreTouzi_amst_dir_3.hdr + ${TEMP}/feFiltreTouzi_amst_dir_3.tif 3) otb_add_test(NAME bfTvVerticalSobelVectorImageFilter COMMAND otbEdgeTestDriver @@ -232,35 +232,35 @@ otb_add_test(NAME feTvStreamingLineSegmentDetector1000 COMMAND otbEdgeTestDriver ) otb_add_test(NAME feTvTouzi COMMAND otbEdgeTestDriver - --compare-image ${EPSILON_8} ${BASELINE}/feFiltreTouzi_amst_3.hdr - ${TEMP}/feFiltreTouzi_amst_3.hdr + --compare-image ${EPSILON_8} ${BASELINE}/feFiltreTouzi_amst_3.tif + ${TEMP}/feFiltreTouzi_amst_3.tif otbTouziEdgeDetector ${INPUTDATA}/amst.png - ${TEMP}/feFiltreTouzi_amst_3.hdr + ${TEMP}/feFiltreTouzi_amst_3.tif 3) otb_add_test(NAME feTvLineRatioLinearAmsters1 COMMAND otbEdgeTestDriver --compare-n-images ${EPSILON_8} 2 - ${BASELINE}/feFiltreLineRatioLinear_amst_ers1_ima_extrait.hdr - ${TEMP}/feFiltreLineRatioLinear_amst_ers1_ima_extrait.hdr - ${BASELINE}/feFiltreLineRatioLinear_amst_dir_ers1_ima_extrait.hdr - ${TEMP}/feFiltreLineRatioLinear_amst_dir_ers1_ima_extrait.hdr + ${BASELINE}/feFiltreLineRatioLinear_amst_ers1_ima_extrait.tif + ${TEMP}/feFiltreLineRatioLinear_amst_ers1_ima_extrait.tif + ${BASELINE}/feFiltreLineRatioLinear_amst_dir_ers1_ima_extrait.tif + ${TEMP}/feFiltreLineRatioLinear_amst_dir_ers1_ima_extrait.tif otbLineRatioDetectorLinear ${INPUTDATA}/amst_ers1.ima.extrait.419_187_70_66.hdr - ${TEMP}/feFiltreLineRatioLinear_amst_ers1_ima_extrait.hdr - ${TEMP}/feFiltreLineRatioLinear_amst_dir_ers1_ima_extrait.hdr + ${TEMP}/feFiltreLineRatioLinear_amst_ers1_ima_extrait.tif + ${TEMP}/feFiltreLineRatioLinear_amst_dir_ers1_ima_extrait.tif 1 2) otb_add_test(NAME feTvLineRatioLinear COMMAND otbEdgeTestDriver --compare-n-images ${EPSILON_8} 2 - ${BASELINE}/feFiltreLineRatioLinear_amst_2_3.hdr - ${TEMP}/feFiltreLineRatioLinear_amst_2_3.hdr - ${BASELINE}/feFiltreLineRatioLinear_amst_dir_2_3.hdr - ${TEMP}/feFiltreLineRatioLinear_amst_dir_2_3.hdr + ${BASELINE}/feFiltreLineRatioLinear_amst_2_3.tif + ${TEMP}/feFiltreLineRatioLinear_amst_2_3.tif + ${BASELINE}/feFiltreLineRatioLinear_amst_dir_2_3.tif + ${TEMP}/feFiltreLineRatioLinear_amst_dir_2_3.tif otbLineRatioDetectorLinear ${INPUTDATA}/amst.png - ${TEMP}/feFiltreLineRatioLinear_amst_2_3.hdr - ${TEMP}/feFiltreLineRatioLinear_amst_dir_2_3.hdr + ${TEMP}/feFiltreLineRatioLinear_amst_2_3.tif + ${TEMP}/feFiltreLineRatioLinear_amst_dir_2_3.tif 2 3) otb_add_test(NAME feTvLineSegmentDetector COMMAND otbEdgeTestDriver @@ -274,14 +274,14 @@ otb_add_test(NAME feTvLineSegmentDetector COMMAND otbEdgeTestDriver otb_add_test(NAME feTvLineCorrelationLinear COMMAND otbEdgeTestDriver --compare-n-images ${EPSILON_8} 2 - ${BASELINE}/feFiltreLineCorrelationLinear_amst_2_3.hdr - ${TEMP}/feFiltreLineCorrelationLinear_amst_2_3.hdr - ${BASELINE}/feFiltreLineCorrelationLinear_amst_dir_2_3.hdr - ${TEMP}/feFiltreLineCorrelationLinear_amst_dir_2_3.hdr + ${BASELINE}/feFiltreLineCorrelationLinear_amst_2_3.tif + ${TEMP}/feFiltreLineCorrelationLinear_amst_2_3.tif + ${BASELINE}/feFiltreLineCorrelationLinear_amst_dir_2_3.tif + ${TEMP}/feFiltreLineCorrelationLinear_amst_dir_2_3.tif otbLineCorrelationDetectorLinear ${INPUTDATA}/amst.png - ${TEMP}/feFiltreLineCorrelationLinear_amst_2_3.hdr - ${TEMP}/feFiltreLineCorrelationLinear_amst_dir_2_3.hdr + ${TEMP}/feFiltreLineCorrelationLinear_amst_2_3.tif + ${TEMP}/feFiltreLineCorrelationLinear_amst_dir_2_3.tif 2 3) otb_add_test(NAME feTvFillGapsFilter COMMAND otbEdgeTestDriver diff --git a/Modules/Filtering/ChangeDetection/test/CMakeLists.txt b/Modules/Filtering/ChangeDetection/test/CMakeLists.txt index f978339e6e..248aba75a8 100644 --- a/Modules/Filtering/ChangeDetection/test/CMakeLists.txt +++ b/Modules/Filtering/ChangeDetection/test/CMakeLists.txt @@ -53,13 +53,13 @@ otb_add_test(NAME cdTvJHMI COMMAND otbChangeDetectionTestDriver otb_add_test(NAME cdTvMeanDiff COMMAND otbChangeDetectionTestDriver --compare-image ${EPSILON_10} - ${BASELINE}/cdMeanDiffImage.hdr - ${TEMP}/cdMeanDiffImage.hdr + ${BASELINE}/cdMeanDiffImage.tif + ${TEMP}/cdMeanDiffImage.tif otbMeanDiffChangeDetectionTest ${INPUTDATA}/GomaAvant.png ${INPUTDATA}/GomaApres.png 2 - ${TEMP}/cdMeanDiffImage.hdr + ${TEMP}/cdMeanDiffImage.tif ) otb_add_test(NAME cdTvMultivariateAlterationDetectorImageFilterSameNbBands COMMAND otbChangeDetectionTestDriver @@ -113,22 +113,22 @@ otb_add_test(NAME cdTvCorrel COMMAND otbChangeDetectionTestDriver otb_add_test(NAME cdTvKullbackLeiblerProfileImageFilter COMMAND otbChangeDetectionTestDriver --compare-image ${EPSILON_10} - ${BASELINE}/cdTVKullbackLeiblerProfileImageFilterOutput.hdr - ${TEMP}/cdTVKullbackLeiblerProfileImageFilterOutput.hdr + ${BASELINE}/cdTVKullbackLeiblerProfileImageFilterOutput.tif + ${TEMP}/cdTVKullbackLeiblerProfileImageFilterOutput.tif otbKullbackLeiblerProfileImageFilter ${INPUTDATA}/GomaAvant.png ${INPUTDATA}/GomaApres.png - ${TEMP}/cdTVKullbackLeiblerProfileImageFilterOutput.hdr + ${TEMP}/cdTVKullbackLeiblerProfileImageFilterOutput.tif 5 51) otb_add_test(NAME cdTvKullbackLeiblerDistanceImageFilter COMMAND otbChangeDetectionTestDriver --compare-image ${EPSILON_10} - ${BASELINE}/cdTVKullbackLeiblerDistanceImageFilterOutput.hdr - ${TEMP}/cdTVKullbackLeiblerDistanceImageFilterOutput.hdr + ${BASELINE}/cdTVKullbackLeiblerDistanceImageFilterOutput.tif + ${TEMP}/cdTVKullbackLeiblerDistanceImageFilterOutput.tif otbKullbackLeiblerDistanceImageFilter ${INPUTDATA}/GomaAvant.png ${INPUTDATA}/GomaApres.png - ${TEMP}/cdTVKullbackLeiblerDistanceImageFilterOutput.hdr + ${TEMP}/cdTVKullbackLeiblerDistanceImageFilterOutput.tif 35) otb_add_test(NAME cdTvMeanRatio COMMAND otbChangeDetectionTestDriver diff --git a/Modules/Filtering/ImageManipulation/test/CMakeLists.txt b/Modules/Filtering/ImageManipulation/test/CMakeLists.txt index adc5227175..b464ed2614 100644 --- a/Modules/Filtering/ImageManipulation/test/CMakeLists.txt +++ b/Modules/Filtering/ImageManipulation/test/CMakeLists.txt @@ -127,21 +127,21 @@ otb_add_test(NAME feTvSqrtSpectralAngleImageFilter COMMAND otbImageManipulationT otb_add_test(NAME bfTvStreamingShrinkImageFilterQBPAN COMMAND otbImageManipulationTestDriver --compare-image ${NOTOL} - ${BASELINE}/bfTvStreamingShrinkImageFilterQBPANOutput.hdr - ${TEMP}/bfTvStreamingShrinkImageFilterQBPANOutput.hdr + ${BASELINE}/bfTvStreamingShrinkImageFilterQBPANOutput.tif + ${TEMP}/bfTvStreamingShrinkImageFilterQBPANOutput.tif otbStreamingShrinkImageFilter LARGEINPUT{QUICKBIRD/TOULOUSE/000000128955_01_P001_PAN/02APR01105228-P1BS-000000128955_01_P001.TIF} - ${TEMP}/bfTvStreamingShrinkImageFilterQBPANOutput.hdr + ${TEMP}/bfTvStreamingShrinkImageFilterQBPANOutput.tif 50 ) otb_add_test(NAME bfTvStreamingShrinkImageFilterQBMUL COMMAND otbImageManipulationTestDriver --compare-image ${NOTOL} - ${BASELINE}/bfTvStreamingShrinkImageFilterQBMULOutput.hdr - ${TEMP}/bfTvStreamingShrinkImageFilterQBMULOutput.hdr + ${BASELINE}/bfTvStreamingShrinkImageFilterQBMULOutput.tif + ${TEMP}/bfTvStreamingShrinkImageFilterQBMULOutput.tif otbStreamingShrinkImageFilter LARGEINPUT{QUICKBIRD/TOULOUSE/000000128955_01_P001_MUL/02APR01105228-M1BS-000000128955_01_P001.TIF} - ${TEMP}/bfTvStreamingShrinkImageFilterQBMULOutput.hdr + ${TEMP}/bfTvStreamingShrinkImageFilterQBMULOutput.tif 20 ) @@ -466,11 +466,11 @@ otb_add_test(NAME bfTvBoundingRegionCalculator COMMAND otbImageManipulationTestD otb_add_test(NAME bfTvPerBandVectorImageFilterWithSobelFilter COMMAND otbImageManipulationTestDriver --compare-image ${EPSILON_7} - ${BASELINE}/bfTvPerBandVectorImageFilterWithSobelFilterOutput.hdr - ${TEMP}/bfTvPerBandVectorImageFilterWithSobelFilterOutput.hdr + ${BASELINE}/bfTvPerBandVectorImageFilterWithSobelFilterOutput.tif + ${TEMP}/bfTvPerBandVectorImageFilterWithSobelFilterOutput.tif otbPerBandVectorImageFilterWithSobelFilter ${INPUTDATA}/poupees.png - ${TEMP}/bfTvPerBandVectorImageFilterWithSobelFilterOutput.hdr + ${TEMP}/bfTvPerBandVectorImageFilterWithSobelFilterOutput.tif ) @@ -495,11 +495,11 @@ otb_add_test(NAME bfTvThresholdVectorImageFilterTest COMMAND otbImageManipulatio otb_add_test(NAME bfTvPerBandVectorImageFilterWithMeanFilter COMMAND otbImageManipulationTestDriver --compare-image ${EPSILON_7} - ${BASELINE}/bfTvPerBandVectorImageFilterWithMeanFilterOutput.hdr - ${TEMP}/bfTvPerBandVectorImageFilterWithMeanFilterOutput.hdr + ${BASELINE}/bfTvPerBandVectorImageFilterWithMeanFilterOutput.tif + ${TEMP}/bfTvPerBandVectorImageFilterWithMeanFilterOutput.tif otbPerBandVectorImageFilterWithMeanFilter ${INPUTDATA}/poupees.png - ${TEMP}/bfTvPerBandVectorImageFilterWithMeanFilterOutput.hdr + ${TEMP}/bfTvPerBandVectorImageFilterWithMeanFilterOutput.tif ) otb_add_test(NAME bfTvAmplitudeFunctorTest COMMAND otbImageManipulationTestDriver @@ -526,12 +526,12 @@ otb_add_test(NAME bfTvClampImageFilterConversionTest COMMAND otbImageManipulatio otb_add_test(NAME coTvConcatenateVectorImageFilter COMMAND otbImageManipulationTestDriver --compare-image ${NOTOL} - ${BASELINE}/coConcatenateVectorImageFilterOutput1.hdr - ${TEMP}/coConcatenateVectorImageFilterOutput1.hdr + ${BASELINE}/coConcatenateVectorImageFilterOutput1.tif + ${TEMP}/coConcatenateVectorImageFilterOutput1.tif otbConcatenateVectorImageFilter ${INPUTDATA}/poupees.png ${INPUTDATA}/poupees.png - ${TEMP}/coConcatenateVectorImageFilterOutput1.hdr + ${TEMP}/coConcatenateVectorImageFilterOutput1.tif ) otb_add_test(NAME bfTvBinaryImageToDensityImageFilter COMMAND otbImageManipulationTestDriver @@ -547,18 +547,18 @@ otb_add_test(NAME bfTvBinaryImageToDensityImageFilter COMMAND otbImageManipulati otb_add_test(NAME bfTvSpectralAngleDistanceImageFilter COMMAND otbImageManipulationTestDriver --compare-image ${EPSILON_7} - ${BASELINE}/bfTvSpectralAngleDistanceOutput.hdr - ${TEMP}/bfTvSpectralAngleDistanceOutput.hdr + ${BASELINE}/bfTvSpectralAngleDistanceOutput.tif + ${TEMP}/bfTvSpectralAngleDistanceOutput.tif otbSpectralAngleDistanceImageFilter ${INPUTDATA}/qb_RoadExtract.img.hdr - ${TEMP}/bfTvSpectralAngleDistanceOutput.hdr + ${TEMP}/bfTvSpectralAngleDistanceOutput.tif 337 557 432 859 ) otb_add_test(NAME bfTvSpectralAngleDistanceImageFilterOneChannel COMMAND otbImageManipulationTestDriver otbSpectralAngleDistanceImageFilter ${INPUTDATA}/DeuxCercles.hdr - ${TEMP}/bfTvSpectralAngleDistanceOneChannelOutput.hdr + ${TEMP}/bfTvSpectralAngleDistanceOneChannelOutput.tif 100 ) set_property(TEST bfTvSpectralAngleDistanceImageFilterOneChannel PROPERTY WILL_FAIL true) diff --git a/Modules/Filtering/MorphologicalPyramid/test/CMakeLists.txt b/Modules/Filtering/MorphologicalPyramid/test/CMakeLists.txt index 560cbb52e8..dbc5f7afb6 100644 --- a/Modules/Filtering/MorphologicalPyramid/test/CMakeLists.txt +++ b/Modules/Filtering/MorphologicalPyramid/test/CMakeLists.txt @@ -60,7 +60,7 @@ otb_add_test(NAME msTvMorphoPyrSegmentBright COMMAND otbMorphologicalPyramidTest ${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 + ${TEMP}/msPyrMRToMS_IKO_Halles_4_2_sf_full.tif ${INPUTDATA}/ROI_IKO_PAN_LesHalles.tif ${TEMP}/msPyrSegmenter_IKO_Halles_4_2_sf.tif 0 @@ -75,7 +75,7 @@ otb_add_test(NAME msTvMorphoPyrSegmentDark COMMAND otbMorphologicalPyramidTestDr ${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 + ${TEMP}/msPyrMRToMS_IKO_Halles_4_2_if_full.tif ${INPUTDATA}/ROI_IKO_PAN_LesHalles.tif ${TEMP}/msPyrSegmenter_IKO_Halles_4_2_if.tif 1 @@ -97,30 +97,30 @@ otb_add_test(NAME msTvMorphoPyrSynthesisFilter COMMAND otbMorphologicalPyramidTe otb_add_test(NAME msTvMorphoPyrMRToMSConverter COMMAND otbMorphologicalPyramidTestDriver --compare-n-images ${EPSILON_8} 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.tif + ${TEMP}/msPyrMRToMS_IKO_Halles_4_2_sf_full.tif + ${BASELINE}/msPyrMRToMS_IKO_Halles_4_2_if_full.tif + ${TEMP}/msPyrMRToMS_IKO_Halles_4_2_if_full.tif + ${BASELINE}/msPyrMRToMS_IKO_Halles_4_2_an_full.tif + ${TEMP}/msPyrMRToMS_IKO_Halles_4_2_an_full.tif 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 + ${TEMP}/msPyrMRToMS_IKO_Halles_4_2_sf_full.tif + ${TEMP}/msPyrMRToMS_IKO_Halles_4_2_if_full.tif + ${TEMP}/msPyrMRToMS_IKO_Halles_4_2_an_full.tif 4 2.0) otb_add_test(NAME msTvMorphoPyrResampler COMMAND otbMorphologicalPyramidTestDriver --compare-n-images ${EPSILON_8} 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.tif + ${TEMP}/msPyrResampler_IKO_LesHalles_256_2.tif + ${BASELINE}/msPyrResampler_IKO_LesHalles_full.tif + ${TEMP}/msPyrResampler_IKO_LesHalles_full.tif otbMorphologicalPyramidResampler ${INPUTDATA}/ROI_IKO_PAN_LesHalles.tif - ${TEMP}/msPyrResampler_IKO_LesHalles_256_2.hdr - ${TEMP}/msPyrResampler_IKO_LesHalles_full.hdr + ${TEMP}/msPyrResampler_IKO_LesHalles_256_2.tif + ${TEMP}/msPyrResampler_IKO_LesHalles_full.tif 256 256 ) diff --git a/Modules/Filtering/Projection/test/CMakeLists.txt b/Modules/Filtering/Projection/test/CMakeLists.txt index 76d7f0bb1f..0df148140b 100644 --- a/Modules/Filtering/Projection/test/CMakeLists.txt +++ b/Modules/Filtering/Projection/test/CMakeLists.txt @@ -412,10 +412,10 @@ otb_add_test(NAME prTvVectorDataTransformFilter COMMAND otbProjectionTestDriver ) otb_add_test(NAME prTvRationalTransformToDisplacementFieldSourceTest COMMAND otbProjectionTestDriver - --compare-image ${EPSILON_9} ${BASELINE}/prTvRationalTransformToDisplacementFieldSourceTest.hdr - ${TEMP}/prTvRationalTransformToDisplacementFieldSourceTest.hdr + --compare-image ${EPSILON_9} ${BASELINE}/prTvRationalTransformToDisplacementFieldSourceTest.tif + ${TEMP}/prTvRationalTransformToDisplacementFieldSourceTest.tif otbRationalTransformToDisplacementFieldSourceTest - ${TEMP}/prTvRationalTransformToDisplacementFieldSourceTest.hdr + ${TEMP}/prTvRationalTransformToDisplacementFieldSourceTest.tif ) otb_add_test(NAME prTvVectorDataProjectionFilterFromMapToSensor COMMAND otbProjectionTestDriver diff --git a/Modules/IO/ImageIO/test/CMakeLists.txt b/Modules/IO/ImageIO/test/CMakeLists.txt index f6cbe8fb68..dbde61e6c0 100644 --- a/Modules/IO/ImageIO/test/CMakeLists.txt +++ b/Modules/IO/ImageIO/test/CMakeLists.txt @@ -97,14 +97,14 @@ otb_add_test(NAME ioTvImageFileWriterExtendedFileName_Box COMMAND otbImageIOTest otb_add_test(NAME ioTvONERAImageFileReaderComplex COMMAND otbImageIOTestDriver --compare-n-images ${EPSILON_9} 2 - ${BASELINE}/ioImageFileReaderONERAComplexReal.hdr - ${TEMP}/ioImageFileReaderONERAComplexReal.hdr - ${BASELINE}/ioImageFileReaderONERAComplexImag.hdr - ${TEMP}/ioImageFileReaderONERAComplexImag.hdr + ${BASELINE}/ioImageFileReaderONERAComplexReal.tif + ${TEMP}/ioImageFileReaderONERAComplexReal.tif + ${BASELINE}/ioImageFileReaderONERAComplexImag.tif + ${TEMP}/ioImageFileReaderONERAComplexImag.tif otbImageFileReaderONERAComplex LARGEINPUT{ONERA/spa3_0215_rad.ent} - ${TEMP}/ioImageFileReaderONERAComplexReal.hdr - ${TEMP}/ioImageFileReaderONERAComplexImag.hdr ) + ${TEMP}/ioImageFileReaderONERAComplexReal.tif + ${TEMP}/ioImageFileReaderONERAComplexImag.tif ) otb_add_test(NAME ioTvImageFileReaderRADCR42TIF COMMAND otbImageIOTestDriver otbImageFileReaderRADComplexFloat @@ -489,7 +489,7 @@ otb_add_test(NAME ioTvStreamingImageFileWriterCalculateNumberOfDivisions_SetAuto otb_add_test(NAME ioTvImageFileReaderRADCI22ENVI COMMAND otbImageIOTestDriver --compare-image ${EPSILON_9} - ${BASELINE}/ioImageFileReaderRADCI22ENVI.hdr + ${BASELINE}/ioImageFileReaderRADCI22ENVI.tif ${TEMP}/ioImageFileReaderRADCI22ENVI.hdr otbImageFileReaderRADComplexFloatExtract LARGEINPUT{RAD_CI2/3017_HH.rad} @@ -737,7 +737,7 @@ set_property(TEST ioTvImageFileReaderIntHDR2BSQ PROPERTY DEPENDS ioTvImageFileRe otb_add_test(NAME ioTvONERAImageFileReader COMMAND otbImageIOTestDriver --compare-image ${EPSILON_9} - ${BASELINE}/ioImageFileReaderONERA.hdr + ${BASELINE}/ioImageFileReaderONERA.tif ${TEMP}/ioImageFileReaderONERA.hdr otbImageFileReaderONERATest LARGEINPUT{ONERA/spa3_0215_rad.ent} @@ -1289,7 +1289,7 @@ otb_add_test(NAME ioTvImageFileReaderIntHDR2LUM COMMAND otbImageIOTestDriver set_tests_properties(ioTvImageFileReaderIntHDR2LUM PROPERTIES DEPENDS ioTvImageFileReaderIntLUM2HDR) otb_add_test(NAME ioTvImageFileReaderPNG2ENVI COMMAND otbImageIOTestDriver - --compare-image ${EPSILON_9} ${BASELINE}/ioImageFileReaderPNG2ENVI.hdr + --compare-image ${EPSILON_9} ${BASELINE}/ioImageFileReaderPNG2ENVI.tif ${TEMP}/ioImageFileReaderPNG2ENVI.hdr otbImageFileReaderTest ${INPUTDATA}/cthead1.png diff --git a/Modules/Learning/LearningBase/test/CMakeLists.txt b/Modules/Learning/LearningBase/test/CMakeLists.txt index 9956d7dbae..ac3ebd8a94 100644 --- a/Modules/Learning/LearningBase/test/CMakeLists.txt +++ b/Modules/Learning/LearningBase/test/CMakeLists.txt @@ -45,11 +45,11 @@ otb_add_test(NAME leTvDecisionTreeWithRealValues COMMAND otbLearningBaseTestDriv otb_add_test(NAME leTvKMeansImageClassificationFilter COMMAND otbLearningBaseTestDriver --compare-image ${NOTOL} - ${BASELINE}/leKMeansImageClassificationFilterOutput.hdr - ${TEMP}/leKMeansImageClassificationFilterOutput.hdr + ${BASELINE}/leKMeansImageClassificationFilterOutput.tif + ${TEMP}/leKMeansImageClassificationFilterOutput.tif otbKMeansImageClassificationFilter ${INPUTDATA}/poupees_sub.png - ${TEMP}/leKMeansImageClassificationFilterOutput.hdr + ${TEMP}/leKMeansImageClassificationFilterOutput.tif 2 0 0 0 0 255 255 255 255 diff --git a/Modules/Learning/SOM/test/CMakeLists.txt b/Modules/Learning/SOM/test/CMakeLists.txt index 11a22c788e..16357a35bd 100644 --- a/Modules/Learning/SOM/test/CMakeLists.txt +++ b/Modules/Learning/SOM/test/CMakeLists.txt @@ -40,40 +40,40 @@ otb_module_target_label(otbSOMTestDriver) otb_add_test(NAME leTvSOM COMMAND otbSOMTestDriver --compare-image ${EPSILON_10} - ${BASELINE}/leSOMPoupeesSubOutputMap1.hdr - ${TEMP}/leSOMPoupeesSubOutputMap1.hdr + ${BASELINE}/leSOMPoupeesSubOutputMap1.tif + ${TEMP}/leSOMPoupeesSubOutputMap1.tif otbSOM ${INPUTDATA}/poupees_sub.png - ${TEMP}/leSOMPoupeesSubOutputMap1.hdr + ${TEMP}/leSOMPoupeesSubOutputMap1.tif 32 32 10 10 5 1.0 0.1 0) otb_add_test(NAME leTvSOMImageClassificationFilter COMMAND otbSOMTestDriver --compare-image ${NOTOL} - ${BASELINE}/leSOMPoupeesClassified.hdr - ${TEMP}/leSOMImageClassificationFilterOutput.hdr + ${BASELINE}/leSOMPoupeesClassified.tif + ${TEMP}/leSOMImageClassificationFilterOutput.tif otbSOMImageClassificationFilter ${INPUTDATA}/poupees_sub.png - ${BASELINE}/leSOMPoupeesSubOutputMap1.hdr - ${TEMP}/leSOMImageClassificationFilterOutput.hdr + ${BASELINE}/leSOMPoupeesSubOutputMap1.tif + ${TEMP}/leSOMImageClassificationFilterOutput.tif ) otb_add_test(NAME leTvSOMActivationBuilder COMMAND otbSOMTestDriver --compare-image ${NOTOL} - ${BASELINE}/leSOMPoupeesSubActivationMap1.hdr + ${BASELINE}/leSOMPoupeesSubActivationMap1.tif ${TEMP}/leSOMPoupeesSubActivationMap1.tif otbSOMActivationBuilder ${INPUTDATA}/poupees_sub.png - ${BASELINE}/leSOMPoupeesSubOutputMap1.hdr + ${BASELINE}/leSOMPoupeesSubOutputMap1.tif ${TEMP}/leSOMPoupeesSubActivationMap1.tif 32 32 10 10 5 1.0 0.1 128) otb_add_test(NAME leTvSOMWithMissingValue COMMAND otbSOMTestDriver --compare-image ${EPSILON_10} - ${BASELINE}/leSOMWithMissingValue.hdr - ${TEMP}/leSOMWithMissingValue.hdr + ${BASELINE}/leSOMWithMissingValue.tif + ${TEMP}/leSOMWithMissingValue.tif otbSOMWithMissingValueTest ${INPUTDATA}/poupees_sub.png - ${TEMP}/leSOMWithMissingValue.hdr + ${TEMP}/leSOMWithMissingValue.tif 32 32 10 10 5 1.0 0.1 0) otb_add_test(NAME leTvSOMMap COMMAND otbSOMTestDriver @@ -81,30 +81,30 @@ otb_add_test(NAME leTvSOMMap COMMAND otbSOMTestDriver otb_add_test(NAME leTvPeriodicSOM COMMAND otbSOMTestDriver --compare-image ${EPSILON_10} - ${BASELINE}/lePeriodicSOMPoupeesSubOutputMap1.hdr - ${TEMP}/lePeriodicSOMPoupeesSubOutputMap1.hdr + ${BASELINE}/lePeriodicSOMPoupeesSubOutputMap1.tif + ${TEMP}/lePeriodicSOMPoupeesSubOutputMap1.tif otbPeriodicSOMTest ${INPUTDATA}/poupees_sub.png - ${TEMP}/lePeriodicSOMPoupeesSubOutputMap1.hdr + ${TEMP}/lePeriodicSOMPoupeesSubOutputMap1.tif 32 32 10 10 5 1.0 0.1 0) otb_add_test(NAME leTvSOMClassifier COMMAND otbSOMTestDriver --compare-image ${NOTOL} - ${BASELINE}/leSOMPoupeesClassified.hdr - ${TEMP}/leSOMPoupeesClassified.hdr + ${BASELINE}/leSOMPoupeesClassified.tif + ${TEMP}/leSOMPoupeesClassified.tif otbSOMClassifier ${INPUTDATA}/poupees_sub.png - ${BASELINE}/leSOMPoupeesSubOutputMap1.hdr - ${TEMP}/leSOMPoupeesClassified.hdr + ${BASELINE}/leSOMPoupeesSubOutputMap1.tif + ${TEMP}/leSOMPoupeesClassified.tif ) otb_add_test(NAME leTvSOMbasedImageFilter COMMAND otbSOMTestDriver --compare-image ${NOTOL} - ${BASELINE}/leSOMbasedImageFilterOutput.hdr - ${TEMP}/leSOMbasedImageFilterOutput.hdr + ${BASELINE}/leSOMbasedImageFilterOutput.tif + ${TEMP}/leSOMbasedImageFilterOutput.tif otbSOMbasedImageFilterTest ${INPUTDATA}/poupees_sub.png - ${BASELINE}/leSOMPoupeesSubOutputMap1.hdr - ${TEMP}/leSOMbasedImageFilterOutput.hdr + ${BASELINE}/leSOMPoupeesSubOutputMap1.tif + ${TEMP}/leSOMbasedImageFilterOutput.tif ) diff --git a/Modules/Registration/DisplacementField/test/CMakeLists.txt b/Modules/Registration/DisplacementField/test/CMakeLists.txt index 284c22e557..8e2e73032b 100644 --- a/Modules/Registration/DisplacementField/test/CMakeLists.txt +++ b/Modules/Registration/DisplacementField/test/CMakeLists.txt @@ -38,51 +38,51 @@ otb_module_target_label(otbDisplacementFieldTestDriver) otb_add_test(NAME dmTvNNearestTransformsLinearInterpolateDisplacementFieldGenerator COMMAND otbDisplacementFieldTestDriver --compare-image ${EPSILON_10} - ${BASELINE}/dmTvNNearestTransformsLinearInterpolateDeformationField.hdr - ${TEMP}/dmTvNNearestTransformsLinearInterpolateDisplacementField.hdr + ${BASELINE}/dmTvNNearestTransformsLinearInterpolateDeformationField.tif + ${TEMP}/dmTvNNearestTransformsLinearInterpolateDisplacementField.tif otbNNearestTransformsLinearInterpolateDisplacementFieldGenerator - ${TEMP}/dmTvNNearestTransformsLinearInterpolateDisplacementField.hdr + ${TEMP}/dmTvNNearestTransformsLinearInterpolateDisplacementField.tif ) otb_add_test(NAME dmTvNNearestPointsLinearInterpolateDisplacementFieldGenerator COMMAND otbDisplacementFieldTestDriver --compare-image ${EPSILON_10} - ${BASELINE}/dmTvNNearestPointsLinearInterpolateDeformationField.hdr - ${TEMP}/dmTvNNearestPointsLinearInterpolateDisplacementField.hdr + ${BASELINE}/dmTvNNearestPointsLinearInterpolateDeformationField.tif + ${TEMP}/dmTvNNearestPointsLinearInterpolateDisplacementField.tif otbNNearestPointsLinearInterpolateDisplacementFieldGenerator - ${TEMP}/dmTvNNearestPointsLinearInterpolateDisplacementField.hdr + ${TEMP}/dmTvNNearestPointsLinearInterpolateDisplacementField.tif ) otb_add_test(NAME dmTvNearestTransformDisplacementFieldGenerator COMMAND otbDisplacementFieldTestDriver --compare-image ${EPSILON_10} - ${BASELINE}/dmTvNearestTransformDeformationField.hdr - ${TEMP}/dmTvNearestTransformDisplacementField.hdr + ${BASELINE}/dmTvNearestTransformDeformationField.tif + ${TEMP}/dmTvNearestTransformDisplacementField.tif otbNearestTransformDisplacementFieldGenerator - ${TEMP}/dmTvNearestTransformDisplacementField.hdr + ${TEMP}/dmTvNearestTransformDisplacementField.tif ) otb_add_test(NAME dmTvNearestPointDisplacementFieldGenerator COMMAND otbDisplacementFieldTestDriver --compare-image ${EPSILON_10} - ${BASELINE}/dmTvNearestPointDeformationField.hdr - ${TEMP}/dmTvNearestPointDisplacementField.hdr + ${BASELINE}/dmTvNearestPointDeformationField.tif + ${TEMP}/dmTvNearestPointDisplacementField.tif otbNearestPointDisplacementFieldGenerator - ${TEMP}/dmTvNearestPointDisplacementField.hdr + ${TEMP}/dmTvNearestPointDisplacementField.tif ) #otb_add_test(NAME dmTvBSplinesInterpolateTransformDisplacementFieldGenerator COMMAND otbDisplacementFieldTestDriver #--compare-image ${EPSILON_4} - #${BASELINE}/dmTvBSplinesInterpolateTransformDeformationFieldGenerator.hdr - #${TEMP}/dmTvBSplinesInterpolateTransformDisplacementFieldGenerator.hdr + #${BASELINE}/dmTvBSplinesInterpolateTransformDeformationFieldGenerator.tif + #${TEMP}/dmTvBSplinesInterpolateTransformDisplacementFieldGenerator.tif #otbBSplinesInterpolateTransformDisplacementFieldGenerator - #${TEMP}/dmTvBSplinesInterpolateTransformDisplacementFieldGenerator.hdr + #${TEMP}/dmTvBSplinesInterpolateTransformDisplacementFieldGenerator.tif #) otb_add_test(NAME dmTvBSplinesInterpolateDisplacementFieldGenerator COMMAND otbDisplacementFieldTestDriver --compare-image ${EPSILON_10} - ${BASELINE}/dmTvBSplinesInterpolateDeformationField.hdr - ${TEMP}/dmTvBSplinesInterpolateDisplacementField.hdr + ${BASELINE}/dmTvBSplinesInterpolateDeformationField.tif + ${TEMP}/dmTvBSplinesInterpolateDisplacementField.tif otbBSplinesInterpolateDisplacementFieldGenerator - ${TEMP}/dmTvBSplinesInterpolateDisplacementField.hdr + ${TEMP}/dmTvBSplinesInterpolateDisplacementField.tif ) -- GitLab