BUG: Modification of type returned in accessors of the otbDSFusionOfClassifiersImageFilter

Code/Fuzzy/otbDSFusionOfClassifiersImageFilter.h

@@ -133,8 +133,8 @@ public:
    */
   void SetInputMask(const MaskImageType * mask);
 
-  void SetInputMapsOfIndices(const VectorOfMapOfIndicesType vectorOfMapOfIndices);
-  void SetInputConfusionMatrices(const VectorOfConfusionMatricesType vectorOfConfusionMatrices);
+  void SetInputMapsOfIndices(const VectorOfMapOfIndicesType * vectorOfMapOfIndices);
+  void SetInputConfusionMatrices(const VectorOfConfusionMatricesType * vectorOfConfusionMatrices);
 
   /**
    * Get the input mask.
@@ -142,8 +142,8 @@ public:
    */
   const MaskImageType * GetInputMask(void);
 
-  const VectorOfMapOfIndicesType GetInputMapsOfIndices(void);
-  const VectorOfConfusionMatricesType GetInputConfusionMatrices(void);
+  const VectorOfMapOfIndicesType * GetInputMapsOfIndices(void);
+  const VectorOfConfusionMatricesType * GetInputConfusionMatrices(void);
 
   const LabelType OptimizedDSMassCombination(PixelType vectorPixelValue);
 

Code/Fuzzy/otbDSFusionOfClassifiersImageFilter.txx

@@ -71,14 +71,14 @@ DSFusionOfClassifiersImageFilter<TInputImage, TOutputImage, TMaskImage>
 template <class TInputImage, class TOutputImage, class TMaskImage>
 void
 DSFusionOfClassifiersImageFilter<TInputImage, TOutputImage, TMaskImage>
-::SetInputMapsOfIndices(const VectorOfMapOfIndicesType vectorOfMapOfIndices)
+::SetInputMapsOfIndices(const VectorOfMapOfIndicesType * pointerToVectorOfMapOfIndices)
 {
-  this->m_VectorOfMapOfIndices = vectorOfMapOfIndices;
+  this->m_VectorOfMapOfIndices = *pointerToVectorOfMapOfIndices;
 }
 
 template <class TInputImage, class TOutputImage, class TMaskImage>
 const typename DSFusionOfClassifiersImageFilter<TInputImage, TOutputImage, TMaskImage>
-::VectorOfMapOfIndicesType
+::VectorOfMapOfIndicesType *
 DSFusionOfClassifiersImageFilter<TInputImage, TOutputImage, TMaskImage>
 ::GetInputMapsOfIndices()
 {
@@ -86,21 +86,21 @@ DSFusionOfClassifiersImageFilter<TInputImage, TOutputImage, TMaskImage>
     {
     return 0;
     }
-  return this->m_VectorOfMapOfIndices;
+  return &this->m_VectorOfMapOfIndices;
 }
 /* ************************************************************************************************************** */
 
 template <class TInputImage, class TOutputImage, class TMaskImage>
 void
 DSFusionOfClassifiersImageFilter<TInputImage, TOutputImage, TMaskImage>
-::SetInputConfusionMatrices(const VectorOfConfusionMatricesType vectorOfConfusionMatrices)
+::SetInputConfusionMatrices(const VectorOfConfusionMatricesType * pointerToVectorOfConfusionMatrices)
 {
-  this->m_VectorOfConfusionMatrices = vectorOfConfusionMatrices;
+  this->m_VectorOfConfusionMatrices = *pointerToVectorOfConfusionMatrices;
 }
 
 template <class TInputImage, class TOutputImage, class TMaskImage>
 const typename DSFusionOfClassifiersImageFilter<TInputImage, TOutputImage, TMaskImage>
-::VectorOfConfusionMatricesType
+::VectorOfConfusionMatricesType *
 DSFusionOfClassifiersImageFilter<TInputImage, TOutputImage, TMaskImage>
 ::GetInputConfusionMatrices()
 {
@@ -108,7 +108,7 @@ DSFusionOfClassifiersImageFilter<TInputImage, TOutputImage, TMaskImage>
     {
     return 0;
     }
-  return m_VectorOfConfusionMatrices;
+  return &this->m_VectorOfConfusionMatrices;
 }
 /* ************************************************************************************************************** */
 

Testing/Code/Fuzzy/otbDSFusionOfClassifiersImageFilterTest.cxx

@@ -198,8 +198,8 @@ int otbDSFusionOfClassifiersImageFilterTest(int argc, char* argv[])
 
   // Filter Inputs
   dsFusionOfClassifiersImageFilter->SetInput(imageListToVectorImageFilter->GetOutput());
-  dsFusionOfClassifiersImageFilter->SetInputMapsOfIndices(vectorOfMapOfIndices);
-  dsFusionOfClassifiersImageFilter->SetInputConfusionMatrices(vectorOfConfMatrices);
+  dsFusionOfClassifiersImageFilter->SetInputMapsOfIndices(&vectorOfMapOfIndices);
+  dsFusionOfClassifiersImageFilter->SetInputConfusionMatrices(&vectorOfConfMatrices);
   dsFusionOfClassifiersImageFilter->SetDefinitionMethod(massOfBeliefDefMethod);
   dsFusionOfClassifiersImageFilter->SetLabelForNoDataPixels(atoi(argv[argc - 3]));
   dsFusionOfClassifiersImageFilter->SetLabelForUndecidedPixels(atoi(argv[argc - 2]));