Commit d5cde7f0 authored by Jonathan Guinet's avatar Jonathan Guinet
Browse files

ENH: ImageListToVectorImageFilter has been moved to Code/Common.

parent bb4ccf63
......@@ -331,32 +331,6 @@ ADD_TEST(bfTvVectorImageToImageListFilter ${BASICFILTERS_TESTS3}
)
# ------- otb::ImageListToVectorImageFilter ----------------------------
ADD_TEST(bfTuImageListToVectorImageFilterNew ${BASICFILTERS_TESTS3}
otbImageListToVectorImageFilterNew)
ADD_TEST(bfTvImageListToVectorImageFilter ${BASICFILTERS_TESTS3}
--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
)
ADD_TEST(bfTvImageListToVectorImageFilter2 ${BASICFILTERS_TESTS3}
otbImageListToVectorImageFilter2
${INPUTDATA}/poupees_c1.hdr
${INPUTDATA}/poupees_c2.hdr
${INPUTDATA}/poupees_c3.hdr
)
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ otbBasicFiltersTests4 ~~~~~~~~~~~~~~~~~~~~~~~~~~
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
......@@ -2848,9 +2822,6 @@ otbVectorRescaleIntensityImageFilterNew.cxx
otbVectorRescaleIntensityImageFilter.cxx
otbVectorImageToImageListFilterNew.cxx
otbVectorImageToImageListFilter.cxx
otbImageListToVectorImageFilterNew.cxx
otbImageListToVectorImageFilter.cxx
otbImageListToVectorImageFilter2.cxx
otbShiftScaleVectorImageFilterNew.cxx
otbShiftScaleVectorImageFilterTest.cxx
)
......
......@@ -33,9 +33,6 @@ void RegisterTests()
REGISTER_TEST(otbVectorRescaleIntensityImageFilter);
REGISTER_TEST(otbVectorImageToImageListFilterNew);
REGISTER_TEST(otbVectorImageToImageListFilter);
REGISTER_TEST(otbImageListToVectorImageFilterNew);
REGISTER_TEST(otbImageListToVectorImageFilter);
REGISTER_TEST(otbImageListToVectorImageFilter2);
REGISTER_TEST(otbShiftScaleVectorImageFilterNew);
REGISTER_TEST(otbShiftScaleVectorImageFilterTest);
}
......@@ -1241,6 +1241,35 @@ ADD_TEST(bfTvPolygonizationRasterization_Index ${COMMON_TESTS14}
${INPUTDATA}/QB_Toulouse_labelImage_Index.tif
)
# ------- otb::ImageListToVectorImageFilter ----------------------------
ADD_TEST(coTuImageListToVectorImageFilterNew ${COMMON_TESTS14}
otbImageListToVectorImageFilterNew)
ADD_TEST(coTvImageListToVectorImageFilter ${COMMON_TESTS14}
--compare-image ${EPSILON_7}
${BASELINE}/bfTvImageListToVectorImageFilter.png
${TEMP}/coTvImageListToVectorImageFilter.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}/coTvImageListToVectorImageFilter.png
)
ADD_TEST(coTvImageListToVectorImageFilter2 ${COMMON_TESTS14}
otbImageListToVectorImageFilter2
${INPUTDATA}/poupees_c1.hdr
${INPUTDATA}/poupees_c2.hdr
${INPUTDATA}/poupees_c3.hdr
)
# ------- Fichiers sources CXX -----------------------------------
SET(BasicCommon_SRCS1
otbCommonTests1.cxx
......@@ -1414,6 +1443,9 @@ otbVectorDataRasterizeFilter.cxx
otbVectorDataToLabelImageFilter.cxx
otbOGRDataSourceToLabelImageFilter.cxx
otbPolygonizationRasterizationTest.cxx
otbImageListToVectorImageFilterNew.cxx
otbImageListToVectorImageFilter.cxx
otbImageListToVectorImageFilter2.cxx
)
OTB_ADD_EXECUTABLE(otbCommonTests1 "${BasicCommon_SRCS1}" "OTBIO;OTBTesting")
......
......@@ -35,4 +35,7 @@ void RegisterTests()
REGISTER_TEST(otbOGRDataSourceToLabelImageFilterNew);
REGISTER_TEST(otbOGRDataSourceToLabelImageFilter);
REGISTER_TEST(otbPolygonizationRasterizationTest);
REGISTER_TEST(otbImageListToVectorImageFilterNew);
REGISTER_TEST(otbImageListToVectorImageFilter);
REGISTER_TEST(otbImageListToVectorImageFilter2);
}
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment