Commit f2056f4e authored by Guillaume Pasero's avatar Guillaume Pasero

ENH: Jira-805: reduce coupling with SiftFast

parent 47fbcf8e
......@@ -30,6 +30,10 @@ if(NOT OTB_USE_LIBSVM)
SET(BANNED_HEADERS "${BANNED_HEADERS} otbLibSVMMachineLearningModel.h otbLibSVMMachineLearningModelFactory.h")
endif()
if(NOT OTB_USE_SIFTFAST)
SET(BANNED_HEADERS "${BANNED_HEADERS} otbSiftFastImageFilter.h")
endif()
# ************ ADD YOUR BANNED HEADERS HERE ************
#if(CONDITION)
# SET(BANNED_HEADERS "${BANNED_HEADERS} BANNED-HEADER1.h BANNED-HEADER2.h")
......
......@@ -10,9 +10,11 @@ otb_module(OTBDescriptors
OTBImageBase
OTBObjectList
OTBPointSet
OTBSiftFast
OTBTransform
OPTIONAL_DEPENDS
OTBSiftFast
TEST_DEPENDS
OTBImageIO
OTBImageManipulation
......
......@@ -3,9 +3,7 @@ otb_module_test()
set(OTBDescriptorsTests
otbDescriptorsTestDriver.cxx
otbImageToSURFKeyPointSetFilterOutputDescriptorAscii.cxx
otbImageToFastSIFTKeyPointSetFilterOutputInterestPointAscii.cxx
otbKeyPointSetsMatchingFilterNew.cxx
otbImageToFastSIFTKeyPointSetFilterOutputDescriptorAscii.cxx
otbImageToSIFTKeyPointSetFilterOutputInterestPointAscii.cxx
otbHistogramOfOrientedGradientCovariantImageFunction.cxx
otbImageToSURFKeyPointSetFilterOutputInterestPointAscii.cxx
......@@ -17,7 +15,6 @@ otbImageToSIFTKeyPointSetFilterOutputDescriptorAscii.cxx
otbImageToSIFTKeyPointSetFilterOutputAscii.cxx
otbFourierMellinImageFilter.cxx
otbImageToHessianDeterminantImageFilter.cxx
otbImageToFastSIFTKeyPointSetFilterNew.cxx
otbImageToSIFTKeyPointSetFilterOutputImage.cxx
otbFourierMellinDescriptors.cxx
otbImageToSIFTKeyPointSetFilterDistanceMap.cxx
......@@ -25,6 +22,14 @@ otbImageToHessianDeterminantImageFilterNew.cxx
otbFourierMellinImageFilterNew.cxx
)
if(OTB_USE_SIFTFAST)
list(APPEND OTBDescriptorsTests
otbImageToFastSIFTKeyPointSetFilterNew.cxx
otbImageToFastSIFTKeyPointSetFilterOutputInterestPointAscii.cxx
otbImageToFastSIFTKeyPointSetFilterOutputDescriptorAscii.cxx
)
endif()
add_executable(otbDescriptorsTestDriver ${OTBDescriptorsTests})
target_link_libraries(otbDescriptorsTestDriver ${OTBDescriptors-Test_LIBRARIES})
otb_module_target_label(otbDescriptorsTestDriver)
......@@ -41,29 +46,10 @@ otb_add_test(NAME feTvImageToSURFKeyPointSetFilterSceneOutputDescriptorAscii COM
3 3
)
otb_add_test(NAME feTvImageToFastSIFTKeyPointSetFilterSceneOutputInterestPointAscii COMMAND otbDescriptorsTestDriver
--ignore-order --compare-ascii ${EPSILON_3}
${BASELINE_FILES}/feTvImageToFastSIFTKeyPointSetFilterSceneKeysOutputInterestPoint.txt
${TEMP}/feTvImageToFastSIFTKeyPointSetFilterSceneKeysOutputInterestPoint.txt
otbImageToFastSIFTKeyPointSetFilterOutputInterestPointAscii
${INPUTDATA}/ROI_IKO_PAN_LesHalles_sub.tif
${TEMP}/feTvImageToFastSIFTKeyPointSetFilterSceneKeysOutputInterestPoint.txt
6
)
otb_add_test(NAME feTuKeyPointSetsMatchingFilterNew COMMAND otbDescriptorsTestDriver
otbKeyPointSetsMatchingFilterNew)
otb_add_test(NAME feTvImageToFastSIFTKeyPointSetFilterSceneOutputDescriptorAscii COMMAND otbDescriptorsTestDriver
--ignore-order --epsilon-boundary 0.01 --compare-ascii ${EPSILON_2}
${BASELINE_FILES}/feTvImageToFastSIFTKeyPointSetFilterSceneKeysOutputDescriptor.txt
${TEMP}/feTvImageToFastSIFTKeyPointSetFilterSceneKeysOutputDescriptor.txt
otbImageToFastSIFTKeyPointSetFilterOutputDescriptorAscii
${INPUTDATA}/ROI_IKO_PAN_LesHalles_sub.tif
${TEMP}/feTvImageToFastSIFTKeyPointSetFilterSceneKeysOutputDescriptor.txt
6
)
otb_add_test(NAME feTvImageToSIFTKeyPointSetFilterSceneOutputInterestPointAscii COMMAND otbDescriptorsTestDriver
--ignore-order --compare-ascii ${EPSILON_3}
${BASELINE_FILES}/feTvImageToSIFTKeyPointSetFilterSceneKeysOutputInterestPoint.txt
......@@ -206,9 +192,6 @@ otb_add_test(NAME feTvImageToHessianDeterminantImageFilter COMMAND otbDescriptor
1.5
)
otb_add_test(NAME feTuImageToFastSIFTKeyPointSetFilterNew COMMAND otbDescriptorsTestDriver
otbImageToFastSIFTKeyPointSetFilterNew)
otb_add_test(NAME feTvImageToSIFTKeyPointSetFilterSquareOutputImage COMMAND otbDescriptorsTestDriver
--compare-image ${EPSILON_8}
${BASELINE}/feTvImageToSIFTKeyPointSetFilterSquareImageOutput.png
......@@ -278,3 +261,27 @@ otb_add_test(NAME feTuImageToHessianDeterminantImageFilterNew COMMAND otbDescrip
otb_add_test(NAME feTuForwardFourierMellinImageFilterNew COMMAND otbDescriptorsTestDriver
otbFourierMellinImageFilterNew)
if(OTB_USE_SIFTFAST)
otb_add_test(NAME feTuImageToFastSIFTKeyPointSetFilterNew COMMAND otbDescriptorsTestDriver
otbImageToFastSIFTKeyPointSetFilterNew)
otb_add_test(NAME feTvImageToFastSIFTKeyPointSetFilterSceneOutputInterestPointAscii COMMAND otbDescriptorsTestDriver
--ignore-order --compare-ascii ${EPSILON_3}
${BASELINE_FILES}/feTvImageToFastSIFTKeyPointSetFilterSceneKeysOutputInterestPoint.txt
${TEMP}/feTvImageToFastSIFTKeyPointSetFilterSceneKeysOutputInterestPoint.txt
otbImageToFastSIFTKeyPointSetFilterOutputInterestPointAscii
${INPUTDATA}/ROI_IKO_PAN_LesHalles_sub.tif
${TEMP}/feTvImageToFastSIFTKeyPointSetFilterSceneKeysOutputInterestPoint.txt
6
)
otb_add_test(NAME feTvImageToFastSIFTKeyPointSetFilterSceneOutputDescriptorAscii COMMAND otbDescriptorsTestDriver
--ignore-order --epsilon-boundary 0.01 --compare-ascii ${EPSILON_2}
${BASELINE_FILES}/feTvImageToFastSIFTKeyPointSetFilterSceneKeysOutputDescriptor.txt
${TEMP}/feTvImageToFastSIFTKeyPointSetFilterSceneKeysOutputDescriptor.txt
otbImageToFastSIFTKeyPointSetFilterOutputDescriptorAscii
${INPUTDATA}/ROI_IKO_PAN_LesHalles_sub.tif
${TEMP}/feTvImageToFastSIFTKeyPointSetFilterSceneKeysOutputDescriptor.txt
6
)
endif()
......@@ -2,9 +2,7 @@
void RegisterTests()
{
REGISTER_TEST(otbImageToSURFKeyPointSetFilterOutputDescriptorAscii);
REGISTER_TEST(otbImageToFastSIFTKeyPointSetFilterOutputInterestPointAscii);
REGISTER_TEST(otbKeyPointSetsMatchingFilterNew);
REGISTER_TEST(otbImageToFastSIFTKeyPointSetFilterOutputDescriptorAscii);
REGISTER_TEST(otbImageToSIFTKeyPointSetFilterOutputInterestPointAscii);
REGISTER_TEST(otbHistogramOfOrientedGradientCovariantImageFunctionNew);
REGISTER_TEST(otbHistogramOfOrientedGradientCovariantImageFunction);
......@@ -17,7 +15,6 @@ void RegisterTests()
REGISTER_TEST(otbImageToSIFTKeyPointSetFilterOutputAscii);
REGISTER_TEST(otbFourierMellinImageFilter);
REGISTER_TEST(otbImageToHessianDeterminantImageFilter);
REGISTER_TEST(otbImageToFastSIFTKeyPointSetFilterNew);
REGISTER_TEST(otbImageToSIFTKeyPointSetFilterOutputImage);
REGISTER_TEST(otbFourierMellinDescriptorsNew);
REGISTER_TEST(otbFourierMellinDescriptors);
......@@ -26,4 +23,9 @@ void RegisterTests()
REGISTER_TEST(otbImageToSIFTKeyPointSetFilterDistanceMap);
REGISTER_TEST(otbImageToHessianDeterminantImageFilterNew);
REGISTER_TEST(otbFourierMellinImageFilterNew);
#ifdef OTB_USE_SIFTFAST
REGISTER_TEST(otbImageToFastSIFTKeyPointSetFilterNew);
REGISTER_TEST(otbImageToFastSIFTKeyPointSetFilterOutputInterestPointAscii);
REGISTER_TEST(otbImageToFastSIFTKeyPointSetFilterOutputDescriptorAscii);
#endif
}
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