Commit a8d56a26 authored by Emmanuel Christophe's avatar Emmanuel Christophe

Style: trailing spaces

parent 04c6e613
......@@ -36,7 +36,7 @@ namespace otb
* If called with a ContinuousIndex or Point, the calculation is performed
* at the nearest neighbor.
*
* This class is templated over the input image type and the
* This class is templated over the input image type and the
* coordinate representation type (e.g. float or double ).
*
* \ingroup ImageFunctions
......@@ -78,17 +78,17 @@ class ITK_EXPORT BinaryImageDensityFunction :
/** Evaluate the function at non-integer positions */
virtual RealType Evaluate( const PointType& point ) const
{
{
IndexType index;
this->ConvertPointToNearestIndex( point, index );
return this->EvaluateAtIndex( index );
return this->EvaluateAtIndex( index );
}
virtual RealType EvaluateAtContinuousIndex(
virtual RealType EvaluateAtContinuousIndex(
const ContinuousIndexType& cindex ) const
{
{
IndexType index;
this->ConvertContinuousIndexToNearestIndex( cindex, index );
return this->EvaluateAtIndex( index );
return this->EvaluateAtIndex( index );
}
/** Get/Set the radius of the neighborhood over which the
......
......@@ -135,7 +135,7 @@ BinaryImageToDensityImageFilter<TInputImage, TOutputImage, TCountFunction>
typename InputImageType::IndexType index;
for (fit=faceList.begin(); fit != faceList.end(); ++fit)
{
{
it = itk::ConstNeighborhoodIterator<TInputImage>(r, inputPtr, *fit);
itOut = itk::ImageRegionIterator<TOutputImage>(outputPtr, *fit);
......
......@@ -9,12 +9,12 @@ Version: $Revision$
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
See OTBCopyright.txt for details.
Copyright (c) Institut Telecom ; Telecom bretagne. All rights reserved.
Copyright (c) Institut Telecom ; Telecom bretagne. All rights reserved.
See ITCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
......@@ -29,8 +29,8 @@ namespace otb {
/** \class BoxAndWhiskerImageFilter
* \brief This class performs the detection of outlier with the Box and Whisker technique
*
* This is appropriated to perform simple outlier detection over vector data.
* The input image has to contain vector pixel through a VectorImage type.
* This is appropriated to perform simple outlier detection over vector data.
* The input image has to contain vector pixel through a VectorImage type.
* When an outlier is detected, it is treated to as an missing value through the function
* \code{otb::EuclideanDistanceWithMissingValue::SetToMissingValue()}.
*
......@@ -44,7 +44,7 @@ namespace otb {
*/
template < class TInputImage >
class ITK_EXPORT BoxAndWhiskerImageFilter
: public itk::InPlaceImageFilter< TInputImage >
: public itk::InPlaceImageFilter< TInputImage >
{
public :
/** Standard class typedefs. */
......
......@@ -9,12 +9,12 @@ Version: $Revision$
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
See OTBCopyright.txt for details.
Copyright (c) Institut Telecom ; Telecom bretagne. All rights reserved.
Copyright (c) Institut Telecom ; Telecom bretagne. All rights reserved.
See ITCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
......@@ -50,7 +50,7 @@ BoxAndWhiskerImageFilter < TInputImage >
template < class TInputImage >
void
BoxAndWhiskerImageFilter < TInputImage >
::ThreadedGenerateData(
::ThreadedGenerateData(
const OutputImageRegionType &outputRegionForThread,
int threadId )
{
......@@ -58,7 +58,7 @@ BoxAndWhiskerImageFilter < TInputImage >
OutputImageType * outputPtr = this->GetOutput();
// data-set boundary faces
typedef typename itk::NeighborhoodAlgorithm::ImageBoundaryFacesCalculator<InputImageType>
typedef typename itk::NeighborhoodAlgorithm::ImageBoundaryFacesCalculator<InputImageType>
ImageBoundaryFacesCalculatorType;
typename ImageBoundaryFacesCalculatorType::FaceListType faceList;
ImageBoundaryFacesCalculatorType boundaryCalculator;
......@@ -67,7 +67,7 @@ BoxAndWhiskerImageFilter < TInputImage >
// face iterator
typename ImageBoundaryFacesCalculatorType::FaceListType::iterator faceIterator;
// local iterators
// local iterators
itk::ImageRegionConstIterator<InputImageType> inputIter;
itk::ImageRegionIterator<OutputImageType> outputIter;
......@@ -75,11 +75,11 @@ BoxAndWhiskerImageFilter < TInputImage >
itk::ProgressReporter progress ( this, threadId, outputRegionForThread.GetNumberOfPixels() );
/**
* Process each of the boundary faces.
* Process each of the boundary faces.
* These are N-d regions which border the edge of the buffer.
*/
for ( faceIterator = faceList.begin();
faceIterator != faceList.end();
for ( faceIterator = faceList.begin();
faceIterator != faceList.end();
++faceIterator )
{
inputIter = itk::ImageRegionConstIterator<InputImageType> ( inputPtr, *faceIterator );
......@@ -101,11 +101,11 @@ BoxAndWhiskerImageFilter < TInputImage >
}
template < class TInputImage >
typename BoxAndWhiskerImageFilter < TInputImage >::PixelType
typename BoxAndWhiskerImageFilter < TInputImage >::PixelType
BoxAndWhiskerImageFilter < TInputImage >
::PerformBoxAndWhiskerDetection ( const PixelType & pixel )
{
typedef std::vector< ValueType > VectorType;
typedef std::vector< ValueType > VectorType;
typedef otb::Statistics::EuclideanDistanceWithMissingValue< PixelType > OutlierType;
unsigned int i;
......
......@@ -32,12 +32,12 @@ namespace otb
* \brief Change Sets of Labels
*
* Adapt the itkChangeLabelImageFilter for multichannel images.
*
*
*/
namespace Functor {
namespace Functor {
template< class TInput, class TOutput>
class VectorChangeLabel
......@@ -72,23 +72,23 @@ public:
return !(*this != other);
}
TOutput GetChange( const TInput & original )
{
return m_ChangeMap[original];
{
return m_ChangeMap[original];
}
void SetChange( const TInput & original, const TOutput & result )
{
m_ChangeMap[original] = result;
{
m_ChangeMap[original] = result;
}
void SetChangeMap( const ChangeMapType & changeMap )
{
m_ChangeMap = changeMap;
{
m_ChangeMap = changeMap;
}
void ClearChangeMap( )
{
m_ChangeMap.clear();
{
m_ChangeMap.clear();
}
inline TOutput operator()( const TInput & A )
......@@ -118,17 +118,17 @@ private:
template <class TInputImage, class TOutputImage>
class ITK_EXPORT ChangeLabelImageFilter :
public itk::UnaryFunctorImageFilter<TInputImage,TOutputImage,
Functor::VectorChangeLabel< typename TInputImage::PixelType,
public itk::UnaryFunctorImageFilter<TInputImage,TOutputImage,
Functor::VectorChangeLabel< typename TInputImage::PixelType,
typename TOutputImage::PixelType> >
{
public:
/** Standard class typedefs. */
typedef ChangeLabelImageFilter Self;
typedef itk::UnaryFunctorImageFilter<TInputImage,TOutputImage,
Functor::VectorChangeLabel<
typename TInputImage::PixelType,
typename TOutputImage::PixelType>
typedef itk::UnaryFunctorImageFilter<TInputImage,TOutputImage,
Functor::VectorChangeLabel<
typename TInputImage::PixelType,
typename TOutputImage::PixelType>
> Superclass;
typedef itk::SmartPointer<Self> Pointer;
typedef itk::SmartPointer<const Self> ConstPointer;
......@@ -221,7 +221,7 @@ private:
namespace otb
{
namespace Functor {
namespace Functor {
template< class TInput, class TOutput>
class VectorChangeLabel : public ChangeLabel
......
......@@ -40,12 +40,12 @@ void
ChangeLabelImageFilter<TInputImage, TOutputImage>
::SetChange( const InputPixelType & original, const OutputPixelType & result )
{
OutputPixelType current = this->GetFunctor().GetChange(original);
OutputPixelType current = this->GetFunctor().GetChange(original);
if ( current != result )
{
this->GetFunctor().SetChange(original, result);
this->Modified();
}
}
}
/**
......@@ -57,7 +57,7 @@ ChangeLabelImageFilter<TInputImage, TOutputImage>
::SetChangeMap( const ChangeMapType & changeMap )
{
//If the whole map is being set then we assume that a real change is made
this->GetFunctor().SetChangeMap(changeMap);
this->GetFunctor().SetChangeMap(changeMap);
this->Modified();
}
......@@ -70,7 +70,7 @@ ChangeLabelImageFilter<TInputImage, TOutputImage>
::ClearChangeMap( )
{
//If the whole map is being set then we assume that a real change is made
this->GetFunctor().ClearChangeMap();
this->GetFunctor().ClearChangeMap();
this->Modified();
}
......@@ -92,7 +92,7 @@ ChangeLabelImageFilter<TInputImage, TOutputImage>
*
*/
template <class TInputImage, class TOutputImage>
void
void
ChangeLabelImageFilter<TInputImage, TOutputImage>
::PrintSelf(std::ostream& os, itk::Indent indent) const
{
......
......@@ -57,7 +57,7 @@ public:
simplifyFunctor.SetTolerance(0.0);
/** Erase aligned points and close polygon*/
return closeFunctor ( simplifyFunctor(input) );
return closeFunctor ( simplifyFunctor(input) );
}
......
......@@ -9,11 +9,11 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
See OTBCopyright.txt for details.
Copyright (c) Institut Telecom / Telecom Bretagne. All rights reserved.
Copyright (c) Institut Telecom / Telecom Bretagne. All rights reserved.
See ITCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
......@@ -29,7 +29,7 @@ namespace otb {
/** \class DecimateImageFilter
* \brief Performs a down sampling of an image
*
* This class performs a basic down sampling of an image. On the contrary to
* This class performs a basic down sampling of an image. On the contrary to
* itk::ResampleImageFilter, it does not perform any interpolation.
*
* \sa ResampleImageFilter
......@@ -77,13 +77,13 @@ protected:
}
virtual ~DecimateImageFilter() {}
/** Since input and output image are very likely to be of different size.
/** Since input and output image are very likely to be of different size.
* Region estimation functions has to be reimplemented
*/
virtual void CallCopyOutputRegionToInputRegion
virtual void CallCopyOutputRegionToInputRegion
( InputImageRegionType & destRegion, const OutputImageRegionType & srcRegion );
virtual void CallCopyInputRegionToOutputRegion
( OutputImageRegionType & destRegion, const InputImageRegionType & srcRegion );
( OutputImageRegionType & destRegion, const InputImageRegionType & srcRegion );
/** Output image region size is not of the same dimension as the input.
* That is why GenerateOutputInformation has to be redefined.
......@@ -91,7 +91,7 @@ protected:
virtual void GenerateOutputInformation();
/** Allows multithreading */
virtual void ThreadedGenerateData
virtual void ThreadedGenerateData
( const OutputImageRegionType & outputRegionForThread, int threadId );
virtual void PrintSelf( std::ostream & os, itk::Indent indent ) const;
......@@ -101,7 +101,7 @@ private:
void operator= ( const Self & ); // purposely not implemented
unsigned int m_DecimationFactor;
}; // end of class
}; // end of class
} // end of namespace otb
......
......@@ -9,11 +9,11 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
See OTBCopyright.txt for details.
Copyright (c) Institut Telecom / Telecom Bretagne. All rights reserved.
Copyright (c) Institut Telecom / Telecom Bretagne. All rights reserved.
See ITCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
......@@ -63,9 +63,9 @@ DecimateImageFilter< TInputImage, TOutputImage >
}
template <class TInputImage, class TOutputImage>
void
void
DecimateImageFilter< TInputImage, TOutputImage >
::CallCopyOutputRegionToInputRegion
::CallCopyOutputRegionToInputRegion
( InputImageRegionType & destRegion, const OutputImageRegionType & srcRegion )
{
Superclass::CallCopyOutputRegionToInputRegion( destRegion, srcRegion );
......@@ -87,10 +87,10 @@ DecimateImageFilter< TInputImage, TOutputImage >
}
template <class TInputImage, class TOutputImage>
void
void
DecimateImageFilter< TInputImage, TOutputImage >
::CallCopyInputRegionToOutputRegion
( OutputImageRegionType & destRegion, const InputImageRegionType & srcRegion )
( OutputImageRegionType & destRegion, const InputImageRegionType & srcRegion )
{
Superclass::CallCopyInputRegionToOutputRegion( destRegion, srcRegion );
......@@ -119,12 +119,12 @@ DecimateImageFilter< TInputImage, TOutputImage >
InputImageRegionType inputRegionForThread;
this->CallCopyOutputRegionToInputRegion( inputRegionForThread, outputRegionForThread );
SubsampledImageRegionConstIterator< InputImageType > decimationIterator
SubsampledImageRegionConstIterator< InputImageType > decimationIterator
( this->GetInput(), inputRegionForThread );
decimationIterator.SetSubsampleFactor( GetDecimationFactor() );
decimationIterator.GoToBegin();
itk::ImageRegionIterator< InputImageType > outputIter
itk::ImageRegionIterator< InputImageType > outputIter
( this->GetOutput(), outputRegionForThread );
outputIter.GoToBegin();
......
......@@ -27,10 +27,10 @@ PURPOSE. See the above copyright notices for more information.
/** \class EdgeDensityImageFilter
* \brief This composite filter computes the density of the edges around a pixel.
*
*
*/
* \brief This composite filter computes the density of the edges around a pixel.
*
*
*/
namespace otb
{
......@@ -73,7 +73,7 @@ public:
typedef TDensityCount DensityCountFunctionType;
/** PointSetToDensityImageFilter support*/
typedef otb::BinaryImageToDensityImageFilter<InputImageType,
typedef otb::BinaryImageToDensityImageFilter<InputImageType,
OutputImageType,
DensityCountFunctionType> DensityImageType;
......
......@@ -29,7 +29,7 @@ namespace otb
template <class TInputImage , class TOutputImage, class TEdgeDetector, class TDensityCount>
EdgeDensityImageFilter<TInputImage, TOutputImage, TEdgeDetector, TDensityCount>
::EdgeDensityImageFilter()
{
{
this->SetNumberOfRequiredInputs( 1 );
m_NeighborhoodRadius.Fill( 1 );
......@@ -72,7 +72,7 @@ EdgeDensityImageFilter<TInputImage, TOutputImage, TEdgeDetector, TDensityCount>
-----------------------------------------------------------------*/
template <class TInputImage , class TOutputImage, class TEdgeDetector, class TDensityCount>
void
EdgeDensityImageFilter<TInputImage, TOutputImage, TEdgeDetector, TDensityCount>
EdgeDensityImageFilter<TInputImage, TOutputImage, TEdgeDetector, TDensityCount>
::PrintSelf(std::ostream& os, itk::Indent indent) const
{
Superclass::PrintSelf(os, indent);
......
......@@ -28,8 +28,8 @@ PURPOSE. See the above copyright notices for more information.
* \brief This composite filter binaries a edge detection image output.
* The used edge detection filter is given as template of the class.
* The class only supports Image.
*
*/
*
*/
namespace otb
{
......
......@@ -28,7 +28,7 @@ namespace otb
template <class TInputImage , class TOutputImage, class TEdgeDetection>
EdgeDetectorImageFilter<TInputImage, TOutputImage, TEdgeDetection>
::EdgeDetectorImageFilter()
{
{
this->SetNumberOfRequiredInputs( 1 );
m_Detector = DetectionType::New();
......@@ -72,7 +72,7 @@ m_Detector->Update();
-----------------------------------------------------------------*/
template <class TInputImage , class TOutputImage, class TEdgeDetection>
void
EdgeDetectorImageFilter<TInputImage, TOutputImage, TEdgeDetection>
EdgeDetectorImageFilter<TInputImage, TOutputImage, TEdgeDetection>
::PrintSelf(std::ostream& os, itk::Indent indent) const
{
Superclass::PrintSelf(os, indent);
......
......@@ -100,7 +100,7 @@ private:
/** Enable/Disable center data */
bool m_CenterData;
/** Inner Product Matrix pre computed */
/** Inner Product Matrix pre computed */
MatrixType m_InnerProduct;
/** Contains Eigen Vectors Of Inner Product Matrix computed */
......
......@@ -54,7 +54,7 @@ template<class TInputImage, class TOutputImage>
void
EstimateInnerProductPCAImageFilter<TInputImage,TOutputImage>
::GenerateOutputInformation(void)
{
{
Superclass::GenerateOutputInformation();
this->GetOutput()->SetNumberOfComponentsPerPixel(m_NumberOfPrincipalComponentsRequired);
}
......
......@@ -9,11 +9,11 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
See OTBCopyright.txt for details.
Copyright (c) Institut Telecom / Telecom Bretagne. All rights reserved.
Copyright (c) Institut Telecom / Telecom Bretagne. All rights reserved.
See ITCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
......@@ -32,9 +32,9 @@ namespace Statistics {
*
* This class is derived from EuclideanDistanceWithMissingValuePow2 class that handle the missing value
* functonnalities. Here, the square root is included in the evaluation...
*
*
* The class can be templated over any container that holds data elements, as
* for template of EuclideanDistance.
* for template of EuclideanDistance.
*
* The only restriction is that elemnts have to support '\code{NaN}'.
*
......@@ -48,12 +48,12 @@ class ITK_EXPORT EuclideanDistanceWithMissingValue :
public:
/** Standard "Self" typedef. */
typedef EuclideanDistanceWithMissingValue Self;
typedef otb::Statistics::EuclideanDistanceWithMissingValuePow2< TVector >
typedef otb::Statistics::EuclideanDistanceWithMissingValuePow2< TVector >
Superclass;
typedef itk::SmartPointer< Self > Pointer ;
typedef itk::SmartPointer< Self > Pointer ;
typedef itk::SmartPointer<const Self> ConstPointer;
typedef typename Superclass::MeasurementVectorSizeType
typedef typename Superclass::MeasurementVectorSizeType
MeasurementVectorSizeType;
/** Run-time type information (and related methods). */
......@@ -74,7 +74,7 @@ class ITK_EXPORT EuclideanDistanceWithMissingValue :
return ::vcl_sqrt( Superclass::Evaluate( x1, x2 ) ); }
/** Gets the cooridnate distance between a and b. NOTE: a and b
* should be type of component */
* should be type of component */
double Evaluate(const ValueType &a, const ValueType &b) const {
return ::vcl_sqrt( Superclass::Evaluate( a, b ) ); }
......@@ -85,7 +85,7 @@ class ITK_EXPORT EuclideanDistanceWithMissingValue :
protected:
EuclideanDistanceWithMissingValue() {}
virtual ~EuclideanDistanceWithMissingValue() {}
virtual ~EuclideanDistanceWithMissingValue() {}
} ; // end of class
} // end namespace statistics
......
......@@ -9,11 +9,11 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
See OTBCopyright.txt for details.
Copyright (c) Institut Telecom / Telecom Bretagne. All rights reserved.
Copyright (c) Institut Telecom / Telecom Bretagne. All rights reserved.
See ITCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
......@@ -30,18 +30,18 @@ namespace Statistics {
/** \class EuclideanDistanceWithMissingValuePow2
* \brief Euclidean comparison distance function facing missing value. The square root is not performed in this class.
*
* This class is derived from EuclideanDistance class. In addition
* This class is derived from EuclideanDistance class. In addition