diff --git a/Testing/Code/FeatureExtraction/CMakeLists.txt b/Testing/Code/FeatureExtraction/CMakeLists.txt index 35ab7e92b4aa94457dc770d807da43d0ee711a23..defa4592c0de886cc43abe44ca6841bb668b4eed 100755 --- a/Testing/Code/FeatureExtraction/CMakeLists.txt +++ b/Testing/Code/FeatureExtraction/CMakeLists.txt @@ -62,7 +62,10 @@ ADD_TEST(feTuHuImage ${FEATUREEXTRACTION_TESTS} ADD_TEST(feTuFlusserImage ${FEATUREEXTRACTION_TESTS} otbFlusserImage ${INPUTDATA}/TeteAToto.png) - + +ADD_TEST(feTuTouziNew ${FEATUREEXTRACTION_TESTS} + otbTouziEdgeDetectorNew) + ADD_TEST(feTvTouzi ${FEATUREEXTRACTION_TESTS} --compare-image ${TOL} ${BASELINE}/feFiltreTouzi_poupees_3.hd ${TEMP}/feFiltreTouzi_poupees_3.hd @@ -78,7 +81,10 @@ ADD_TEST(feTvTouziDir ${FEATUREEXTRACTION_TESTS} ${INPUTDATA}/poupees_1canal.c1 ${TEMP}/feFiltreTouzi_poupees_dir_3.hd 3) - + +ADD_TEST(feTuTupinNew ${FEATUREEXTRACTION_TESTS} + otbTupinEdgeDetectorNew) + ADD_TEST(feTuTupin ${FEATUREEXTRACTION_TESTS} otbTupinEdgeDetector ${INPUTDATA}/cthead1.png @@ -104,8 +110,10 @@ otbDrawPathAlign.cxx otbComplexMomentImage.cxx otbHuImage.cxx otbFlusserImage.cxx +otbTouziEdgeDetectorNew.cxx otbTouziEdgeDetector.cxx otbTouziEdgeDetectorDirection.cxx +otbTupinEdgeDetectorNew.cxx otbTupinEdgeDetector.cxx ) diff --git a/Testing/Code/FeatureExtraction/otbFeatureExtractionTests.cxx b/Testing/Code/FeatureExtraction/otbFeatureExtractionTests.cxx index b8440cb92e8814043e3260e642e73b66a32b3c0e..0b2216a0b2ca7e72beab550441bd064a4205994a 100755 --- a/Testing/Code/FeatureExtraction/otbFeatureExtractionTests.cxx +++ b/Testing/Code/FeatureExtraction/otbFeatureExtractionTests.cxx @@ -18,7 +18,9 @@ REGISTER_TEST(otbDrawPathAlign); REGISTER_TEST(otbComplexMomentImage); REGISTER_TEST(otbHuImage); REGISTER_TEST(otbFlusserImage); +REGISTER_TEST(otbTouziEdgeDetectorNew); REGISTER_TEST(otbTouziEdgeDetector); REGISTER_TEST(otbTouziEdgeDetectorDirection); +REGISTER_TEST(otbTupinEdgeDetectorNew); REGISTER_TEST(otbTupinEdgeDetector); } diff --git a/Testing/Code/FeatureExtraction/otbTupinEdgeDetectorNew.cxx b/Testing/Code/FeatureExtraction/otbTupinEdgeDetectorNew.cxx new file mode 100755 index 0000000000000000000000000000000000000000..1a76fb6441c40058c8ff4bc4c4aa74f6b1db40d7 --- /dev/null +++ b/Testing/Code/FeatureExtraction/otbTupinEdgeDetectorNew.cxx @@ -0,0 +1,60 @@ +/*========================================================================= + + Programme : OTB (ORFEO ToolBox) + Auteurs : CS - C.Ruffel + Language : C++ + Date : 14 mars 2006 + Version : + Role : Test du filtre de detection de lignes (instanciation) + $Id$ + +=========================================================================*/ +#if defined(_MSC_VER) +#pragma warning ( disable : 4786 ) +#endif + +#define MAIN + + +#include "itkExceptionObject.h" +#include "itkImage.h" +#include <iostream> + +#include "otbTupinEdgeDetector.h" + + +int otbTupinEdgeDetectorNew( int argc, char* argv[] ) +{ + try + { + typedef unsigned char InputPixelType; + typedef double OutputPixelType; + const unsigned int Dimension = 2; + + typedef itk::Image< InputPixelType, Dimension > InputImageType; + typedef itk::Image< OutputPixelType, Dimension > OutputImageType; + + typedef otb::TupinEdgeDetector< InputImageType, OutputImageType> FilterType; + + FilterType::Pointer filtreTupin = FilterType::New(); + + + } + catch( itk::ExceptionObject & err ) + { + std::cout << "Exception itk::ExceptionObject levee !" << std::endl; + std::cout << err << std::endl; + return EXIT_FAILURE; + } + catch( ... ) + { + std::cout << "Exception levee inconnue !" << std::endl; + return EXIT_FAILURE; + } + // Software Guide : EndCodeSnippet + +//#endif + return EXIT_SUCCESS; +} + +