diff --git a/Data/Baseline/OTB/Images/feImageToEdgePathFilterOutput.tif b/Data/Baseline/OTB/Images/feImageToEdgePathFilterOutput.tif new file mode 100644 index 0000000000000000000000000000000000000000..fb2de39373f31b7c8967de82fd695a972d0c84dc --- /dev/null +++ b/Data/Baseline/OTB/Images/feImageToEdgePathFilterOutput.tif @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c006246fea917e0870d9fcbac03c8ee7f80e65d3faffd1e76b731192dbef5978 +size 546 diff --git a/Examples/OBIA/LabelMapToVectorData.cxx b/Examples/OBIA/LabelMapToVectorData.cxx index 001d38ecf9d139292dbcf9ffda681be03a85e87c..2f2a1423404845c1fd60146b0e0ae5524472ee87 100644 --- a/Examples/OBIA/LabelMapToVectorData.cxx +++ b/Examples/OBIA/LabelMapToVectorData.cxx @@ -20,7 +20,7 @@ /* Example usage: -./LabelMapToVectorData Input/rcc8_mire1.png Output/rcc8_mire2_vectorizer.shp +./LabelMapToVectorData Input/labelImage_UnsignedChar.tif Output/LabelMapToVectorData.shp */ diff --git a/Examples/OBIA/test/CMakeLists.txt b/Examples/OBIA/test/CMakeLists.txt index 49cb2f872e107f61111f8f8de573c974f6c1badb..563fdaf61883ef675fe38633608791d02554e5d8 100644 --- a/Examples/OBIA/test/CMakeLists.txt +++ b/Examples/OBIA/test/CMakeLists.txt @@ -42,6 +42,6 @@ set(INPUTDATA ${OTB_DATA_ROOT}/Input) otb_add_test(NAME trTeLabelMapToVectorData COMMAND ${OTB_TEST_DRIVER} Execute $<TARGET_FILE:LabelMapToVectorData> - ${INPUTDATA}/rcc8_mire1.png - ${TEMP}/rcc8_mire2_vectorizer.shp + ${INPUTDATA}/labelImage_UnsignedChar.tif + ${TEMP}/trTeLabelMapToVectorDataOutput.shp ) diff --git a/Modules/Core/LabelMap/test/CMakeLists.txt b/Modules/Core/LabelMap/test/CMakeLists.txt index 068325e08e42cce455f0d61cd27a8d1764ede388..be4639ecdd26f58a333f08f6164bb8c54c8b4992 100644 --- a/Modules/Core/LabelMap/test/CMakeLists.txt +++ b/Modules/Core/LabelMap/test/CMakeLists.txt @@ -41,8 +41,8 @@ otb_module_target_label(otbLabelMapTestDriver) otb_add_test(NAME obTvLabelObjectMapVectorizer COMMAND otbLabelMapTestDriver otbLabelObjectMapVectorizer - ${INPUTDATA}/rcc8_mire1.png - rcc8_mire1_label_vectorizer.gml) + ${INPUTDATA}/labelImage_UnsignedChar.tif + otbLabelObjectMapVectorizerOutput.gml) otb_add_test(NAME obTvLabelImageToLabelMapWithAdjacencyFilter COMMAND otbLabelMapTestDriver --compare-ascii ${NOTOL} @@ -64,13 +64,13 @@ otb_add_test(NAME obTvKMeansAttributesLabelMapFilter COMMAND otbLabelMapTestDriv ${TEMP}/obTvKMeansAttributesLabelMapFilter.txt) otb_add_test(NAME obTvLabelMapToSampleListFilter COMMAND otbLabelMapTestDriver otbLabelMapToSampleListFilter - ${OTB_DATA_ROOT}/Input/rcc8_mire1.png + ${OTB_DATA_ROOT}/Input/labelImage_UnsignedChar.tif SHAPE::Flusser01 SHAPE::Flusser02 SHAPE::Flusser03 SHAPE::Flusser04 SHAPE::Flusser05 SHAPE::Flusser06 SHAPE::Flusser07 SHAPE::Flusser08 SHAPE::Flusser09 SHAPE::Flusser10 SHAPE::Flusser11) otb_add_test(NAME obTvLabelMapWithClassLabelToLabeledSampleListFilter COMMAND otbLabelMapTestDriver otbLabelMapWithClassLabelToLabeledSampleListFilter - ${OTB_DATA_ROOT}/Input/rcc8_mire1.png + ${OTB_DATA_ROOT}/Input/labelImage_UnsignedChar.tif SHAPE::Flusser01 SHAPE::Flusser02 SHAPE::Flusser03 SHAPE::Flusser04 SHAPE::Flusser05 SHAPE::Flusser06 SHAPE::Flusser07 SHAPE::Flusser08 SHAPE::Flusser09 SHAPE::Flusser10 SHAPE::Flusser11) diff --git a/Modules/Core/LabelMap/test/otbLabelMapWithClassLabelToLabeledSampleListFilter.cxx b/Modules/Core/LabelMap/test/otbLabelMapWithClassLabelToLabeledSampleListFilter.cxx index 695a24f06d7db8c3dc9d71871ab38b78d4d9f525..31d6b9a066c0e57d9f111e7173699d4d0bd146b6 100644 --- a/Modules/Core/LabelMap/test/otbLabelMapWithClassLabelToLabeledSampleListFilter.cxx +++ b/Modules/Core/LabelMap/test/otbLabelMapWithClassLabelToLabeledSampleListFilter.cxx @@ -62,7 +62,7 @@ int otbLabelMapWithClassLabelToLabeledSampleListFilter(int argc, char* argv[]) LabelMapFilterType::Pointer labelMapFilter = LabelMapFilterType::New(); labelMapFilter->SetInput(lreader->GetOutput()); - labelMapFilter->SetInputForegroundValue(255); + labelMapFilter->SetInputForegroundValue(1); ShapeLabelMapFilterType::Pointer shapeLabelMapFilter = ShapeLabelMapFilterType::New(); shapeLabelMapFilter->SetInput(labelMapFilter->GetOutput()); diff --git a/Modules/Filtering/Path/test/CMakeLists.txt b/Modules/Filtering/Path/test/CMakeLists.txt index 699c24a3ca0a9e7761c463280b97dc4e468282da..c8b832d8d9dfbb09abbb71265081b26dd3d3f5d2 100644 --- a/Modules/Filtering/Path/test/CMakeLists.txt +++ b/Modules/Filtering/Path/test/CMakeLists.txt @@ -62,12 +62,12 @@ otb_add_test(NAME feTvImageToEdgePathFilterBis COMMAND otbPathTestDriver otb_add_test(NAME feTvImageToEdgePathFilter COMMAND otbPathTestDriver --compare-image ${EPSILON_8} - ${BASELINE}/feImageToEdgePathFilter_rcc8_mire4.png - ${TEMP}/feImageToEdgePathFilter_rcc8_mire4.png + ${BASELINE}/feImageToEdgePathFilterOutput.tif + ${TEMP}/feImageToEdgePathFilterOutput.tif otbImageToEdgePathFilter - ${INPUTDATA}/rcc8_mire4.png - ${TEMP}/feImageToEdgePathFilter_rcc8_mire4.png - 255 + ${INPUTDATA}/labelImage_UnsignedChar.tif + ${TEMP}/feImageToEdgePathFilterOutput.tif + 3 ) otb_add_test(NAME feTuCompacityPathCircle COMMAND otbPathTestDriver diff --git a/Modules/Segmentation/Conversion/test/CMakeLists.txt b/Modules/Segmentation/Conversion/test/CMakeLists.txt index 363687e5c3cd789d24cdeaa9b26b594e2f56513d..b704bd6275d83837200861e7448c820f89dda0ac 100644 --- a/Modules/Segmentation/Conversion/test/CMakeLists.txt +++ b/Modules/Segmentation/Conversion/test/CMakeLists.txt @@ -195,19 +195,11 @@ otb_add_test(NAME bfTvVectorDataRasterizeFilterSHP COMMAND otbConversionTestDriv #4 25 0.1 100 #) -otb_add_test(NAME obTvLabelMapToVectorDataFilter2 COMMAND otbConversionTestDriver - --compare-ogr ${NOTOL} - ${BASELINE_FILES}/obTvLabelMapToVectorDataFilter.shp - ${TEMP}/obTvLabelMapToVectorDataFilter2.shp - otbLabelMapToVectorDataFilter - ${INPUTDATA}/rcc8_mire5.png - ${TEMP}/obTvLabelMapToVectorDataFilter2.shp) - otb_add_test(NAME obTvLabelMapToVectorDataFilter COMMAND otbConversionTestDriver --compare-ogr ${NOTOL} ${BASELINE_FILES}/obTvLabelMapToVectorDataFilter.shp ${TEMP}/obTvLabelMapToVectorDataFilter.shp otbLabelMapToVectorDataFilter - ${INPUTDATA}/rcc8_mire1.png + ${INPUTDATA}/labelImage_UnsignedChar.tif ${TEMP}/obTvLabelMapToVectorDataFilter.shp)