Commit 62801dd6 authored by Jonathan Guinet's avatar Jonathan Guinet

COMP: #if change

parent f272e00a
......@@ -25,7 +25,7 @@
#include "itkImageRegionConstIteratorWithIndex.h"
#include <vcl_algorithm.h>
#define USEBUCKET 0 // don't use bucket optimization
namespace otb
{
namespace Meanshift
......@@ -177,7 +177,7 @@ private:
unsigned int m_NumberOfComponentsPerPixel;
};
#ifdef USEBUCKET //disable bucket mode
#if 0 //disable bucket mode
/** \class BucketImage
*
* This class indexes pixels in a N-dimensional image into a N+1-dimensional
......@@ -529,7 +529,7 @@ public:
;itkGetConstReferenceMacro(ModeSearch, bool)
;
#ifdef USEBUCKET
#if 0
/** Toggle bucket optimization, which is disabled by default.
*/
itkSetMacro(BucketOptimization, bool)
......@@ -596,7 +596,7 @@ protected:
virtual void CalculateMeanShiftVector(const typename RealVectorImageType::Pointer inputImagePtr,
const RealVector& jointPixel, const OutputRegionType& outputRegion,
RealVector& meanShiftVector);
#ifdef USEBUCKET
#if 0
virtual void CalculateMeanShiftVectorBucket(const RealVector& jointPixel, RealVector& meanShiftVector);
#endif
......@@ -640,7 +640,7 @@ private:
/** Boolean to enable mode search */
bool m_ModeSearch;
#ifdef USEBUCKET
#if 0
/** Boolean to enable bucket optimization */
bool m_BucketOptimization;
#endif
......@@ -651,7 +651,7 @@ private:
of labels */
unsigned int m_ThreadIdNumberOfBits;
#ifdef USEBUCKET
#if 0
typedef Meanshift::BucketImage<RealVectorImageType> BucketImageType;
BucketImageType m_BucketImage;
#endif
......
......@@ -40,7 +40,7 @@ MeanShiftSmoothingImageFilter<TInputImage, TOutputImage, TKernel, TOutputIterati
// , m_JointImage(0)
// , m_ModeTable(0)
, m_ModeSearch(true)
#ifdef USEBUCKET
#if 0
, m_BucketOptimization(false)
#endif
{
......@@ -246,7 +246,7 @@ void MeanShiftSmoothingImageFilter<TInputImage, TOutputImage, TKernel, TOutputIt
jointImageFunctor->Update();
m_JointImage = jointImageFunctor->GetOutput();
#ifdef USEBUCKET
#if 0
if (m_BucketOptimization)
{
// Create bucket image
......@@ -442,7 +442,7 @@ void MeanShiftSmoothingImageFilter<TInputImage, TOutputImage, TKernel, TOutputIt
}
}
#ifdef USEBUCKET
#if 0
// Calculates the mean shift vector at the position given by jointPixel
template<class TInputImage, class TOutputImage, class TKernel, class TOutputIterationImage>
void MeanShiftSmoothingImageFilter<TInputImage, TOutputImage, TKernel, TOutputIterationImage>::CalculateMeanShiftVectorBucket(
......@@ -674,7 +674,7 @@ void MeanShiftSmoothingImageFilter<TInputImage, TOutputImage, TKernel, TOutputIt
} // end if (m_ModeSearch)
//Calculate meanShiftVector
#ifdef USEBUCKET
#if 0
if (m_BucketOptimization)
{
this->CalculateMeanShiftVectorBucket(jointPixel, meanShiftVector);
......@@ -684,7 +684,7 @@ void MeanShiftSmoothingImageFilter<TInputImage, TOutputImage, TKernel, TOutputIt
#endif
this->CalculateMeanShiftVector(m_JointImage, jointPixel, requestedRegion, meanShiftVector);
#ifdef USEBUCKET
#if 0
}
#endif
......
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