diff --git a/Code/BasicFilters/otbAngularProjectionBinaryImageFilter.h b/Code/BasicFilters/otbAngularProjectionBinaryImageFilter.h index 8493fe59fbeeddfd03a73cf04ba1c0334787fb2c..9d8b695453b82076a6ef7dd505dc6ec3af2e2bc9 100644 --- a/Code/BasicFilters/otbAngularProjectionBinaryImageFilter.h +++ b/Code/BasicFilters/otbAngularProjectionBinaryImageFilter.h @@ -84,7 +84,7 @@ public: protected: AngularProjectionBinaryImageFilter(); - virtual ~AngularProjectionBinaryImageFilter(); + virtual ~AngularProjectionBinaryImageFilter() { } virtual void GenerateOutputInformation(); virtual void ThreadedGenerateData( const OutputImageRegionType & outputRegionForThread, int threadID ); diff --git a/Code/Hyperspectral/otbSparseUnmixingImageFilter.txx b/Code/Hyperspectral/otbSparseUnmixingImageFilter.txx index 1d514e74dc4743907e5f0d4f9cb52243c3cb9831..35f4a569245b25b75e9034868f8cfde0ea33fa51 100644 --- a/Code/Hyperspectral/otbSparseUnmixingImageFilter.txx +++ b/Code/Hyperspectral/otbSparseUnmixingImageFilter.txx @@ -35,9 +35,11 @@ SparseUnmixingImageFilter< TInputImage, TOutputImage, TPrecision, TMotherWavelet m_WvltFilter1 = WvltFilterType::New(); m_WvltFilter1->SetNumberOfDecompositions(2); + m_WvltFilter1->SetSubsampleImageFactor( 1 ); m_WvltFilter2 = WvltFilterType::New(); m_WvltFilter2->SetNumberOfDecompositions( m_WvltFilter1->GetNumberOfDecompositions() ); + m_WvltFilter2->SetSubsampleImageFactor( m_WvltFilter1->GetSubsampleImageFactor() ); m_ListFilter = ListFilterType::New(); m_ListFilter->GetFunctor().SetLowerThreshold(10.); diff --git a/Testing/CMakeLists.txt b/Testing/CMakeLists.txt index 352f494ff22497672aba2ac27808d10b466f815b..fb3cf61e64c75f9c77d1f1cfa90f5a4e25f2d6e8 100644 --- a/Testing/CMakeLists.txt +++ b/Testing/CMakeLists.txt @@ -35,7 +35,7 @@ SET( otbHyperTests1_SRC ) ADD_EXECUTABLE(otbHyperTests1 ${otbHyperTests1_SRC} otbHyperTests1.cxx) -TARGET_LINK_LIBRARIES(otbHyperTests1 OTBCommon OTBIO OTBBasicFilters OTBTesting) +TARGET_LINK_LIBRARIES(otbHyperTests1 OTBCommon OTBIO OTBBasicFilters OTBMultiScale OTBTesting) ADD_TEST(vahineVCA1 ${TESTEXE_DIR}/otbHyperTests1 diff --git a/Testing/otbSparseUnmixingImageFilter.cxx b/Testing/otbSparseUnmixingImageFilter.cxx index 9e99fe8aea9a0e072b89f434d9798ea8eb063dda..70188c90ba4b34fb8d504f021d46e934a54ee812 100644 --- a/Testing/otbSparseUnmixingImageFilter.cxx +++ b/Testing/otbSparseUnmixingImageFilter.cxx @@ -29,7 +29,7 @@ int otbSparseUnmixingImageFilterNewTest ( int argc, char * argv[] ) { const unsigned int Dimension = 2; - typedef float PixelType; + typedef double PixelType; typedef otb::Image< PixelType, Dimension > ImageType; typedef double PrecisionType;