From 749845c75ea09261e21e264d7af7434d0883ed3c Mon Sep 17 00:00:00 2001
From: Gregoire Mercier <gregoire.mercier@telecom-bretagne.eu>
Date: Wed, 6 Apr 2011 11:52:44 +0200
Subject: [PATCH] COMP: Compilation issue resolved (link to the MultiScale lib)
---
Code/BasicFilters/otbAngularProjectionBinaryImageFilter.h | 2 +-
Code/Hyperspectral/otbSparseUnmixingImageFilter.txx | 2 ++
Testing/CMakeLists.txt | 2 +-
Testing/otbSparseUnmixingImageFilter.cxx | 2 +-
4 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/Code/BasicFilters/otbAngularProjectionBinaryImageFilter.h b/Code/BasicFilters/otbAngularProjectionBinaryImageFilter.h
index 8493fe59fb..9d8b695453 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 1d514e74dc..35f4a56924 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 352f494ff2..fb3cf61e64 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 9e99fe8aea..70188c90ba 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;
--
GitLab