From a966d678c0fa702fda28bbbcc41c7270e741a06b Mon Sep 17 00:00:00 2001
From: Stephane ALBERT <stephane.albert@c-s.fr>
Date: Wed, 20 Feb 2019 11:34:25 +0100
Subject: [PATCH] ENH: 1834: Renamed .hd(r) files into .raw.hd(r).
---
Modules/Core/ImageBase/test/CMakeLists.txt | 4 ++--
Modules/Core/PointSet/test/CMakeLists.txt | 9 ++++-----
Modules/Core/Transform/test/CMakeLists.txt | 2 +-
.../RoadExtraction/test/CMakeLists.txt | 20 +++++++++----------
Modules/Feature/Corner/test/CMakeLists.txt | 9 ++++-----
.../Feature/Descriptors/test/CMakeLists.txt | 2 +-
Modules/Feature/Edge/test/CMakeLists.txt | 2 +-
.../ImageManipulation/test/CMakeLists.txt | 2 +-
Modules/Filtering/Path/test/CMakeLists.txt | 9 ++++-----
Modules/IO/ImageIO/test/CMakeLists.txt | 4 ++--
.../ApplicationEngine/test/CMakeLists.txt | 2 +-
11 files changed, 31 insertions(+), 34 deletions(-)
diff --git a/Modules/Core/ImageBase/test/CMakeLists.txt b/Modules/Core/ImageBase/test/CMakeLists.txt
index e9f92a752c..9fac553ba0 100644
--- a/Modules/Core/ImageBase/test/CMakeLists.txt
+++ b/Modules/Core/ImageBase/test/CMakeLists.txt
@@ -135,7 +135,7 @@ otb_add_test(NAME coTvMultiChannelROI_5c_BSQ COMMAND otbImageBaseTestDriver
--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
+ ${INPUTDATA}/poupees.raw.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 )
@@ -443,7 +443,7 @@ otb_add_test(NAME ioTvMultiChannelROI_ENVI2PNG_2 COMMAND otbImageBaseTestDriver
# --compare-image ${EPSILON_9} ${BASELINE}/ioExtractROI_ENVI2PNG_poupees_100_100_77_300_channels_1_2_3.png
# ${TEMP}/ioExtractROI_ENVI2PNG_poupees_100_100_77_300_channels_1_2_3.png
otbMultiChannelExtractROI
- -uchar ${INPUTDATA}/poupees.hdr
+ -uchar ${INPUTDATA}/poupees.raw.hdr
-uchar ${TEMP}/ioExtractROI_ENVI2PNG_poupees_100_100_77_300_channels_1_2_3.png
-startX 100 -startY 100 -sizeX 77 -sizeY 300
-channels 1 2 3 )
diff --git a/Modules/Core/PointSet/test/CMakeLists.txt b/Modules/Core/PointSet/test/CMakeLists.txt
index a33d5ad76e..29dbbc9eda 100644
--- a/Modules/Core/PointSet/test/CMakeLists.txt
+++ b/Modules/Core/PointSet/test/CMakeLists.txt
@@ -60,7 +60,7 @@ otb_add_test(NAME feTvThresholdImageToPointSet1 COMMAND otbPointSetTestDriver
--compare-ascii ${EPSILON_3} ${BASELINE_FILES}/feThresholdImageToPointSet_Threshold_0To255.txt
${TEMP}/feThresholdImageToPointSet_Threshold_0To255.txt
otbThresholdImageToPointSetTest
- ${INPUTDATA}/small_points.hdr
+ ${INPUTDATA}/small_points.raw.hdr
${TEMP}/feThresholdImageToPointSet_Threshold_0To255.txt
0 255 )
@@ -68,7 +68,7 @@ otb_add_test(NAME feTvThresholdImageToPointSet2 COMMAND otbPointSetTestDriver
--compare-ascii ${EPSILON_3} ${BASELINE_FILES}/feThresholdImageToPointSet_Threshold_0To0.txt
${TEMP}/feThresholdImageToPointSet_Threshold_0To0.txt
otbThresholdImageToPointSetTest
- ${INPUTDATA}/small_points.hdr
+ ${INPUTDATA}/small_points.raw.hdr
${TEMP}/feThresholdImageToPointSet_Threshold_0To0.txt
0 0 )
@@ -76,7 +76,7 @@ otb_add_test(NAME feTvThresholdImageToPointSet3 COMMAND otbPointSetTestDriver
--compare-ascii ${EPSILON_3} ${BASELINE_FILES}/feThresholdImageToPointSet_Threshold_255To255.txt
${TEMP}/feThresholdImageToPointSet_Threshold_255To255.txt
otbThresholdImageToPointSetTest
- ${INPUTDATA}/small_points.hdr
+ ${INPUTDATA}/small_points.raw.hdr
${TEMP}/feThresholdImageToPointSet_Threshold_255To255.txt
255 255 )
@@ -84,7 +84,6 @@ otb_add_test(NAME feTvThresholdImageToPointSet4 COMMAND otbPointSetTestDriver
--compare-ascii ${EPSILON_3} ${BASELINE_FILES}/feThresholdImageToPointSet_Threshold_1To200.txt
${TEMP}/feThresholdImageToPointSet_Threshold_1To200.txt
otbThresholdImageToPointSetTest
- ${INPUTDATA}/small_points.hdr
+ ${INPUTDATA}/small_points.raw.hdr
${TEMP}/feThresholdImageToPointSet_Threshold_1To200.txt
1 200 )
-
diff --git a/Modules/Core/Transform/test/CMakeLists.txt b/Modules/Core/Transform/test/CMakeLists.txt
index 63830dc153..ac9dd0cbb7 100644
--- a/Modules/Core/Transform/test/CMakeLists.txt
+++ b/Modules/Core/Transform/test/CMakeLists.txt
@@ -95,7 +95,7 @@ otb_add_test(NAME bfTvLogPolarTransformResample COMMAND otbTransformTestDriver
--compare-image ${EPSILON_7} ${BASELINE}/bfLogPolarTransformResampleOutput.tif
${TEMP}/bfLogPolarTransformResampleOutput.tif
otbLogPolarTransformResample
- ${INPUTDATA}/circle.hdr
+ ${INPUTDATA}/circle.raw.hdr
${TEMP}/bfLogPolarTransformResampleOutput.tif
)
diff --git a/Modules/Detection/RoadExtraction/test/CMakeLists.txt b/Modules/Detection/RoadExtraction/test/CMakeLists.txt
index 9750b26f17..1b9707aa24 100644
--- a/Modules/Detection/RoadExtraction/test/CMakeLists.txt
+++ b/Modules/Detection/RoadExtraction/test/CMakeLists.txt
@@ -50,7 +50,7 @@ otb_add_test(NAME feTvLikelihoodPathListFilter COMMAND otbRoadExtractionTestDriv
${BASELINE_FILES}/feTvLikelihoodPathOutput.txt
${TEMP}/feTvLikelihoodPathOutput.txt
otbLikelihoodPathListFilter
- ${INPUTDATA}/InputForRoadDetection_NonMaxRem.hdr
+ ${INPUTDATA}/InputForRoadDetection_NonMaxRem.raw.hdr
${TEMP}/feTvLikelihoodPathOutput.txt
157 335 204 376 |
21 305 35 308 77 354 85 358 |
@@ -62,8 +62,8 @@ otb_add_test(NAME feTvRemoveWrongDirectionFilter COMMAND otbRoadExtractionTestDr
${BASELINE}/feTvRemoveWrongDirectionOutput.tif
${TEMP}/feTvRemoveWrongDirectionOutput.tif
otbRemoveWrongDirectionFilter
- ${INPUTDATA}/InputForRoadDetection_IsolatedRem.hdr
- ${INPUTDATA}/InputForRoadDetectionScalarProductDir.hdr
+ ${INPUTDATA}/InputForRoadDetection_IsolatedRem.raw.hdr
+ ${INPUTDATA}/InputForRoadDetectionScalarProductDir.raw.hdr
${TEMP}/feTvRemoveWrongDirectionOutput.tif
)
@@ -84,7 +84,7 @@ otb_add_test(NAME feTvAlignMV2ITK COMMAND otbRoadExtractionTestDriver
--compare-ascii ${EPSILON_3} ${BASELINE_FILES}/feAlign.txt
${TEMP}/feAlign.txt
otbAlignImageToPath
- ${INPUTDATA}/poupees.hdr
+ ${INPUTDATA}/poupees.raw.hdr
${TEMP}/feAlign.txt)
otb_add_test(NAME feTvNonMaxRemovalByDirectionFilter COMMAND otbRoadExtractionTestDriver
@@ -92,8 +92,8 @@ otb_add_test(NAME feTvNonMaxRemovalByDirectionFilter COMMAND otbRoadExtractionTe
${BASELINE}/feTvNonMaxRemovalByDirectionOutput.tif
${TEMP}/feTvNonMaxRemovalByDirectionOutput.tif
otbNonMaxRemovalByDirectionFilter
- ${INPUTDATA}/InputForRoadDetection_WrongRem.hdr
- ${INPUTDATA}/InputForRoadDetectionScalarProductDir.hdr
+ ${INPUTDATA}/InputForRoadDetection_WrongRem.raw.hdr
+ ${INPUTDATA}/InputForRoadDetectionScalarProductDir.raw.hdr
${TEMP}/feTvNonMaxRemovalByDirectionOutput.tif
)
@@ -102,7 +102,7 @@ otb_add_test(NAME feTvRoadExtractionFilter COMMAND otbRoadExtractionTestDriver
${BASELINE}/feTvOutputRoadDetection.tif
${TEMP}/feTvOutputRoadDetection.tif
otbRoadExtractionFilter
- ${INPUTDATA}/qb_RoadExtract.img.hdr
+ ${INPUTDATA}/qb_RoadExtract.img.raw.hdr
${TEMP}/feTvOutputRoadDetection.tif
337 557 432 859 # ReferencePixel
1.0 # Alpha
@@ -157,8 +157,8 @@ otb_add_test(NAME feTvRemoveIsolatedByDirectionFilter COMMAND otbRoadExtractionT
${BASELINE}/feTvRemoveIsolatedByDirectionOutput.tif
${TEMP}/feTvRemoveIsolatedByDirectionOutput.tif
otbRemoveIsolatedByDirectionFilter
- ${INPUTDATA}/InputForRoadDetectionScalarProductMod.hdr
- ${INPUTDATA}/InputForRoadDetectionScalarProductDir.hdr
+ ${INPUTDATA}/InputForRoadDetectionScalarProductMod.raw.hdr
+ ${INPUTDATA}/InputForRoadDetectionScalarProductDir.raw.hdr
${TEMP}/feTvRemoveIsolatedByDirectionOutput.tif
)
@@ -188,7 +188,7 @@ otb_add_test(NAME feTvNeighborhoodScalarProductFilter COMMAND otbRoadExtractionT
${BASELINE}/feTvNeighborhoodScalarProductDirectionOutput.tif
${TEMP}/feTvNeighborhoodScalarProductDirectionOutput.tif
otbNeighborhoodScalarProductFilter
- ${INPUTDATA}/InputForRoadDetection_SpectralAngle.hdr
+ ${INPUTDATA}/InputForRoadDetection_SpectralAngle.raw.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 2f51646674..3e203c0f81 100644
--- a/Modules/Feature/Corner/test/CMakeLists.txt
+++ b/Modules/Feature/Corner/test/CMakeLists.txt
@@ -80,7 +80,7 @@ otb_add_test(NAME feTvHarrisPoupee COMMAND otbCornerTestDriver
otb_add_test(NAME feTvHarrisProduceImageToValidHarrisToPointSet COMMAND otbCornerTestDriver
otbHarrisImage
- ${INPUTDATA}/small_points.hdr
+ ${INPUTDATA}/small_points.raw.hdr
${TEMP}/small_points_harris.tif
1.0 1.0 1.0)
@@ -96,7 +96,7 @@ otb_add_test(NAME feTvHarrisToPointSet2 COMMAND otbCornerTestDriver
--compare-ascii ${EPSILON_3} ${BASELINE_FILES}/feHarrisToPointSet_Threshold_20To90.txt
${TEMP}/feHarrisToPointSet_Threshold_20To90.txt
otbHarrisToPointSet
- ${INPUTDATA}/small_points.hdr
+ ${INPUTDATA}/small_points.raw.hdr
${TEMP}/feHarrisToPointSet_Threshold_20To90.txt
1.0 1.0 1.0 20 90)
@@ -104,7 +104,7 @@ otb_add_test(NAME feTvHarrisToPointSet3 COMMAND otbCornerTestDriver
--compare-ascii ${EPSILON_3} ${BASELINE_FILES}/feHarrisToPointSet_Threshold_100To160.txt
${TEMP}/feHarrisToPointSet_Threshold_100To160.txt
otbHarrisToPointSet
- ${INPUTDATA}/small_points.hdr
+ ${INPUTDATA}/small_points.raw.hdr
${TEMP}/feHarrisToPointSet_Threshold_100To160.txt
1.0 1.0 1.0 100 160)
@@ -112,7 +112,6 @@ otb_add_test(NAME feTvHarrisToPointSet1 COMMAND otbCornerTestDriver
--compare-ascii ${EPSILON_3} ${BASELINE_FILES}/feHarrisToPointSet_Threshold_2To255.txt
${TEMP}/feHarrisToPointSet_Threshold_2To255.txt
otbHarrisToPointSet
- ${INPUTDATA}/small_points.hdr
+ ${INPUTDATA}/small_points.raw.hdr
${TEMP}/feHarrisToPointSet_Threshold_2To255.txt
1.0 1.0 1.0 2.0 255.0)
-
diff --git a/Modules/Feature/Descriptors/test/CMakeLists.txt b/Modules/Feature/Descriptors/test/CMakeLists.txt
index 0fe85ecd94..3db89e4a42 100644
--- a/Modules/Feature/Descriptors/test/CMakeLists.txt
+++ b/Modules/Feature/Descriptors/test/CMakeLists.txt
@@ -54,7 +54,7 @@ otb_add_test(NAME feTvForwardFourierMellinImageFilter COMMAND otbDescriptorsTest
${BASELINE}/feForwardFourierMellinImageFilterImag.tif
${TEMP}/feForwardFourierMellinImageFilterImag.tif
otbFourierMellinImageFilter
- ${INPUTDATA}/circle.hdr
+ ${INPUTDATA}/circle.raw.hdr
${TEMP}/feForwardFourierMellinImageFilterReal.tif
${TEMP}/feForwardFourierMellinImageFilterImag.tif)
diff --git a/Modules/Feature/Edge/test/CMakeLists.txt b/Modules/Feature/Edge/test/CMakeLists.txt
index 8f7e5afcb0..687442cbfe 100644
--- a/Modules/Feature/Edge/test/CMakeLists.txt
+++ b/Modules/Feature/Edge/test/CMakeLists.txt
@@ -246,7 +246,7 @@ otb_add_test(NAME feTvLineRatioLinearAmsters1 COMMAND otbEdgeTestDriver
${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
+ ${INPUTDATA}/amst_ers1.ima.extrait.419_187_70_66.raw.hdr
${TEMP}/feFiltreLineRatioLinear_amst_ers1_ima_extrait.tif
${TEMP}/feFiltreLineRatioLinear_amst_dir_ers1_ima_extrait.tif
1 2)
diff --git a/Modules/Filtering/ImageManipulation/test/CMakeLists.txt b/Modules/Filtering/ImageManipulation/test/CMakeLists.txt
index b2d6fa66d7..e8317ea378 100644
--- a/Modules/Filtering/ImageManipulation/test/CMakeLists.txt
+++ b/Modules/Filtering/ImageManipulation/test/CMakeLists.txt
@@ -101,7 +101,7 @@ otb_add_test(NAME coTvImageToVectorImageCastFilter COMMAND otbImageManipulationT
${BASELINE}/coImageToVectorImageCastFilterOutput.tif
${TEMP}/coImageToVectorImageCastFilterOutput.tif
otbImageToVectorImageCastFilter
- ${INPUTDATA}/poupees.hdr
+ ${INPUTDATA}/poupees.raw.hdr
${TEMP}/coImageToVectorImageCastFilterOutput.tif
)
diff --git a/Modules/Filtering/Path/test/CMakeLists.txt b/Modules/Filtering/Path/test/CMakeLists.txt
index c3ed1dead7..699c24a3ca 100644
--- a/Modules/Filtering/Path/test/CMakeLists.txt
+++ b/Modules/Filtering/Path/test/CMakeLists.txt
@@ -170,8 +170,8 @@ otb_add_test(NAME feTvVectorizationPathListFilterImageOutput COMMAND otbPathTest
${BASELINE}/feTvVectorizationPathListOutput.png
${TEMP}/feTvVectorizationPathListOutput.png
otbVectorizationPathListFilter
- ${INPUTDATA}/InputForRoadDetection_NonMaxRem.hdr
- ${INPUTDATA}/InputForRoadDetectionScalarProductDir.hdr
+ ${INPUTDATA}/InputForRoadDetection_NonMaxRem.raw.hdr
+ ${INPUTDATA}/InputForRoadDetectionScalarProductDir.raw.hdr
${TEMP}/feTvVectorizationPathListOutputIgnored.txt
${TEMP}/feTvVectorizationPathListOutput.png
0.0001
@@ -182,8 +182,8 @@ otb_add_test(NAME feTvVectorizationPathListFilterAsciiOutput COMMAND otbPathTest
${BASELINE_FILES}/feTvVectorizationPathListOutput.txt
${TEMP}/feTvVectorizationPathListOutput.txt
otbVectorizationPathListFilter
- ${INPUTDATA}/InputForRoadDetection_NonMaxRem.hdr
- ${INPUTDATA}/InputForRoadDetectionScalarProductDir.hdr
+ ${INPUTDATA}/InputForRoadDetection_NonMaxRem.raw.hdr
+ ${INPUTDATA}/InputForRoadDetectionScalarProductDir.raw.hdr
${TEMP}/feTvVectorizationPathListOutput.txt
${TEMP}/feTvVectorizationPathListOutputIgnored.png
0.0005
@@ -207,4 +207,3 @@ otb_add_test(NAME coTvPolyLineImageIterator COMMAND otbPathTestDriver
512 512 20
${TEMP}/coTvPolyLineImageIterator.png
)
-
diff --git a/Modules/IO/ImageIO/test/CMakeLists.txt b/Modules/IO/ImageIO/test/CMakeLists.txt
index 2c8fae0a3a..c31024f53f 100644
--- a/Modules/IO/ImageIO/test/CMakeLists.txt
+++ b/Modules/IO/ImageIO/test/CMakeLists.txt
@@ -124,7 +124,7 @@ otb_add_test(NAME ioTvImageFileReaderShortRGB_BSQ2HDR COMMAND otbImageIOTestDriv
otb_add_test(NAME ioTvImageFileReaderShortHDR2BSQ COMMAND otbImageIOTestDriver
--compare-image ${EPSILON_9} ${INPUTDATA}/poupees_I2.hd
- ${TEMP}/ioImageFileReaderI2_HDR2BSQ.hd
+ ${TEMP}/ioImageFileReaderI2_HDR2BSQ.raw.hd
otbShortRGBImageIOTest
${TEMP}/ioImageFileReaderI2_BSQ2HDR.hdr
${TEMP}/ioImageFileReaderI2_HDR2BSQ.hd )
@@ -582,7 +582,7 @@ otb_add_test(NAME ioTvVectorImageComplexFloatTest COMMAND otbImageIOTestDriver
otb_add_test(NAME ioTvVectorImageComplexIntoRealFloatTest COMMAND otbImageIOTestDriver
otbVectorImageComplexIntoRealFloatTest
- ${INPUTDATA}/multibandComplexFloat_2bands.hdr
+ ${INPUTDATA}/multibandComplexFloat_2bands.raw.hdr
)
otb_add_test(NAME ioTvImageComplexFloatTest COMMAND otbImageIOTestDriver
diff --git a/Modules/Wrappers/ApplicationEngine/test/CMakeLists.txt b/Modules/Wrappers/ApplicationEngine/test/CMakeLists.txt
index f1095d6722..c3782838b0 100644
--- a/Modules/Wrappers/ApplicationEngine/test/CMakeLists.txt
+++ b/Modules/Wrappers/ApplicationEngine/test/CMakeLists.txt
@@ -87,7 +87,7 @@ otb_add_test(NAME owTvParameterKey COMMAND otbApplicationEngineTestDriver
otb_add_test(NAME owTvInputImageListParameter COMMAND otbApplicationEngineTestDriver
otbWrapperInputImageListParameterTest1
- ${INPUTDATA}/poupees_c1.hdr
+ ${INPUTDATA}/poupees_c1.raw.hdr
${INPUTDATA}/poupees.tif
"mykey"
"my description"
--
GitLab