diff --git a/Testing/Code/BasicFilters/CMakeLists.txt b/Testing/Code/BasicFilters/CMakeLists.txt index f1352573504056b14adc61a8150728ab0fd697cb..adc484f5288d50081a5d4428af0e63cbb5155568 100644 --- a/Testing/Code/BasicFilters/CMakeLists.txt +++ b/Testing/Code/BasicFilters/CMakeLists.txt @@ -1166,7 +1166,7 @@ ADD_TEST(bfTuMeanShiftImageFilterROIQBMul4 ${BASICFILTERS_TESTS9} ${TEMP}/bfMeanShift2ImageFilterLabelOutput_ROIQBMul4.tif 4 50 0.1 100 ) - + ADD_TEST(bfTuMeanShiftVectorImageFilterQBRoad ${BASICFILTERS_TESTS9} otbMeanShiftVectorImageFilter ${INPUTDATA}/qb_RoadExtract.img @@ -1188,9 +1188,9 @@ ADD_TEST(bfTuMeanShiftImageFilterQBRoad ${BASICFILTERS_TESTS9} ${TEMP}/bfMeanShift2ImageFilterLabelOutput_QBRoad.tif 4 30 0.1 100 ) - - - + + + ADD_TEST(bfTvMeanShiftVectorImageFilterQBPAN ${BASICFILTERS_TESTS9} otbMeanShiftVectorImageFilter ${INPUTDATA}/QB_Toulouse_Ortho_PAN.tif @@ -1199,7 +1199,7 @@ ADD_TEST(bfTvMeanShiftVectorImageFilterQBPAN ${BASICFILTERS_TESTS9} ${TEMP}/bfMeanShiftImageFilterLabeledClusteredOutputValid_PAN.tif ${TEMP}/bfMeanShiftImageFilterClusterBoundariesOutputValid_PAN.tif 5 15 100 1.0 - ) + ) ADD_TEST(bfTvMeanShiftImageFilterQBPAN ${BASICFILTERS_TESTS9} @@ -1211,8 +1211,8 @@ ADD_TEST(bfTvMeanShiftImageFilterQBPAN ${BASICFILTERS_TESTS9} ${TEMP}/bfMeanShift2ImageFilterIterationOutput_PAN.tif ${TEMP}/bfMeanShift2ImageFilterLabelOutput_PAN.tif 5 15 1.0 100 - ) - + ) + ADD_TEST(bfTuMeanShiftVectorImageFilterSPOT5 ${BASICFILTERS_TESTS9} otbMeanShiftVectorImageFilter ${INPUTDATA}/SPOT5_EXTRACTS/Arcachon/Arcachon_extrait_3852_3319_546_542.tif @@ -1233,7 +1233,16 @@ ADD_TEST(bfTuMeanShiftImageFilterSPOT5 ${BASICFILTERS_TESTS9} ${TEMP}/bfMeanShift2ImageFilterIterationOutput_SPOT5.tif ${TEMP}/bfMeanShift2ImageFilterLabelOutput_SPOT5.tif 4 10 0.1 100 - ) + ) + +ADD_TEST(bfTuLabelImageRegionMergingFilterSPOT5 ${BASICFILTERS_TESTS9} + otbLabelImageRegionMergingFilter + ${INPUTDATA}/SPOT5_EXTRACTS/Arcachon/Arcachon_extrait_3852_3319_546_542.tif + ${TEMP}/bfLabelImageRegionMergingFilterSpectralOutput_SPOT5.tif + ${TEMP}/bfLabelImageRegionMergingFilterLabelOutput_SPOT5.tif + ${TEMP}/bfLabelImageRegionMergingFilterMergeOutput_SPOT5.tif + 4 10 0.1 100 + ) IF(OTB_DATA_USE_LARGEINPUT) # @@ -2889,6 +2898,7 @@ otbMeanShiftImageFilterNew2.cxx otbMeanShiftImageFilter2.cxx otbMeanShiftVectorImageFilterNew.cxx otbMeanShiftVectorImageFilter.cxx +otbLabelImageRegionMergingFilter.cxx otbFunctionToImageFilterNew.cxx otbFunctionToImageFilter.cxx otbBinaryImageDensityFunctionNew.cxx diff --git a/Testing/Code/BasicFilters/otbBasicFiltersTests9.cxx b/Testing/Code/BasicFilters/otbBasicFiltersTests9.cxx index f068c483aaf76f350908adc50d121cb7c62bb277..122fcb4de94a4f18d456dcd62601724831b94212 100644 --- a/Testing/Code/BasicFilters/otbBasicFiltersTests9.cxx +++ b/Testing/Code/BasicFilters/otbBasicFiltersTests9.cxx @@ -32,6 +32,7 @@ void RegisterTests() REGISTER_TEST(otbMeanShiftImageFilter2); REGISTER_TEST(otbMeanShiftVectorImageFilterNew); REGISTER_TEST(otbMeanShiftVectorImageFilter); + REGISTER_TEST(otbLabelImageRegionMergingFilter); REGISTER_TEST(otbFunctionToImageFilterNew); REGISTER_TEST(otbFunctionToImageFilter); REGISTER_TEST(otbBinaryImageDensityFunctionNew);