Commit 90c54919 authored by Manuel Grizonnet's avatar Manuel Grizonnet

Automated merge with http://hg.orfeo-toolbox.org/OTB

parents 1b1c62fa c0c1dadf
......@@ -13,6 +13,9 @@ ADD_EXECUTABLE(SIFTDisparityMapEstimation SIFTDisparityMapEstimation.cxx )
TARGET_LINK_LIBRARIES(SIFTDisparityMapEstimation OTBFeatureExtraction OTBCommon OTBIO
ITKIO)
ADD_EXECUTABLE(EstimateAffineTransformationExample EstimateAffineTransformationExample.cxx )
TARGET_LINK_LIBRARIES(EstimateAffineTransformationExample OTBFeatureExtraction OTBCommon OTBIO OTBProjections
ITKIO)
IF( NOT OTB_DISABLE_CXX_TESTING AND BUILD_TESTING )
......@@ -42,6 +45,16 @@ ADD_TEST(dmTeSimpleDisparityMapEstimationExampleTest ${EXE_TESTS}
100 10 15 10 10 250 0.9
)
ADD_TEST(dmTeEstimateAffineTransformationExampleTest ${EXE_TESTS}
--compare-image ${TOL}
${BASELINE}/ROI_IKO_PAN_LesHalles.tif
${TEMP}/otbEstimateAffineTransformationOutput.tif
EstimateAffineTransformationExampleTest
${INPUTDATA}/ROI_IKO_PAN_LesHalles_pos_spacing.tif
${INPUTDATA}/ROI_IKO_PAN_LesHalles_warped_pos_spacing.tif
${TEMP}/otbEstimateAffineTransformationOutput.tif
)
INCLUDE_DIRECTORIES(${OTB_SOURCE_DIR}/Testing/Code)
ADD_EXECUTABLE(otbDisparityMapExamplesTests otbDisparityMapExamplesTests.cxx)
TARGET_LINK_LIBRARIES(otbDisparityMapExamplesTests ITKAlgorithms ITKStatistics OTBBasicFilters OTBCommon OTBDisparityMap OTBIO OTBSpatialReasoning OTBChangeDetection OTBFeatureExtraction OTBLearning OTBMultiScale OTBTesting)
......
This diff is collapsed.
......@@ -226,6 +226,9 @@ int main (int argc, char* argv[])
filter2->SetInput(0, movingReader->GetOutput() );
filter2->SetScalesNumber(3);
filter1->SetNumberOfThreads(1);
filter2->SetNumberOfThreads(1);
euclideanMatcher->SetInput1(filter1->GetOutput());
euclideanMatcher->SetInput2(filter2->GetOutput());
euclideanMatcher->SetDistanceThreshold(secondOrderThreshold);
......
......@@ -26,10 +26,13 @@
void RegisterTests()
{
REGISTER_TEST(SimpleDisparityMapEstimationExampleTest);
REGISTER_TEST(EstimateAffineTransformationExampleTest);
}
#undef main
#define main SimpleDisparityMapEstimationExampleTest
#include "SimpleDisparityMapEstimationExample.cxx"
#undef main
#define main EstimateAffineTransformationExampleTest
#include "EstimateAffineTransformationExample.cxx"
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