diff --git a/Code/BasicFilters/otbBinaryImageDensityFunction.h b/Code/BasicFilters/otbBinaryImageDensityFunction.h
index f111db714e7a36eefe4084d85f6364aa08f83cba..cf28c03fb17a47f8ec3b950b8b71e1e9a9c7c946 100644
--- a/Code/BasicFilters/otbBinaryImageDensityFunction.h
+++ b/Code/BasicFilters/otbBinaryImageDensityFunction.h
@@ -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
diff --git a/Code/BasicFilters/otbBinaryImageToDensityImageFilter.txx b/Code/BasicFilters/otbBinaryImageToDensityImageFilter.txx
index 2201cc6e2ac1c7ec3c876a32f0725d49bb4a9618..21ebf02ab184d74fa6bcfc178f85fc4b0c5ac66a 100644
--- a/Code/BasicFilters/otbBinaryImageToDensityImageFilter.txx
+++ b/Code/BasicFilters/otbBinaryImageToDensityImageFilter.txx
@@ -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);
diff --git a/Code/BasicFilters/otbBoxAndWhiskerImageFilter.h b/Code/BasicFilters/otbBoxAndWhiskerImageFilter.h
index 51bacfea74b601a70912762a2367d4f8b13bf817..7f79abdaa2e714719e8d3d82a885c90d814f2ee6 100644
--- a/Code/BasicFilters/otbBoxAndWhiskerImageFilter.h
+++ b/Code/BasicFilters/otbBoxAndWhiskerImageFilter.h
@@ -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. */
diff --git a/Code/BasicFilters/otbBoxAndWhiskerImageFilter.txx b/Code/BasicFilters/otbBoxAndWhiskerImageFilter.txx
index d1507c396fc780fe4771f618e4f7b7a3df2d18d9..000bdb00f2db7d9de339321812ddb209f56d525a 100644
--- a/Code/BasicFilters/otbBoxAndWhiskerImageFilter.txx
+++ b/Code/BasicFilters/otbBoxAndWhiskerImageFilter.txx
@@ -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;
diff --git a/Code/BasicFilters/otbChangeLabelImageFilter.h b/Code/BasicFilters/otbChangeLabelImageFilter.h
index f3009f2611cc8e35f23f5f0aa7d1a047daa7308a..c0bf1a1ae813cd1bc40a0e1a55cefa646e176d81 100644
--- a/Code/BasicFilters/otbChangeLabelImageFilter.h
+++ b/Code/BasicFilters/otbChangeLabelImageFilter.h
@@ -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
diff --git a/Code/BasicFilters/otbChangeLabelImageFilter.txx b/Code/BasicFilters/otbChangeLabelImageFilter.txx
index ffd0c96c69ddafb7f304670fafd8f0c74ade472d..33ac9cfb86a0d22ea07583ddb304411812cabc95 100644
--- a/Code/BasicFilters/otbChangeLabelImageFilter.txx
+++ b/Code/BasicFilters/otbChangeLabelImageFilter.txx
@@ -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
{
diff --git a/Code/BasicFilters/otbCorrectPolygonFunctor.h b/Code/BasicFilters/otbCorrectPolygonFunctor.h
index 137b9ba321ad59c29084ac6c9dbd5adcbdc34153..015993977424b34164111e871bd998c636944e10 100644
--- a/Code/BasicFilters/otbCorrectPolygonFunctor.h
+++ b/Code/BasicFilters/otbCorrectPolygonFunctor.h
@@ -57,7 +57,7 @@ public:
simplifyFunctor.SetTolerance(0.0);
/** Erase aligned points and close polygon*/
- return closeFunctor ( simplifyFunctor(input) );
+ return closeFunctor ( simplifyFunctor(input) );
}
diff --git a/Code/BasicFilters/otbDecimateImageFilter.h b/Code/BasicFilters/otbDecimateImageFilter.h
index 20b5dce1da7644c567b4e35fc24b4c755c86d808..f5f024cb2b7a628abbb2142978e932f84a3d629c 100644
--- a/Code/BasicFilters/otbDecimateImageFilter.h
+++ b/Code/BasicFilters/otbDecimateImageFilter.h
@@ -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
diff --git a/Code/BasicFilters/otbDecimateImageFilter.txx b/Code/BasicFilters/otbDecimateImageFilter.txx
index ddb743a840ebe0f32731f939c1be6b13176dc30f..552379e84282d2f10fb4621017207b2ef39893e2 100644
--- a/Code/BasicFilters/otbDecimateImageFilter.txx
+++ b/Code/BasicFilters/otbDecimateImageFilter.txx
@@ -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();
diff --git a/Code/BasicFilters/otbEdgeDensityImageFilter.h b/Code/BasicFilters/otbEdgeDensityImageFilter.h
index c30148ff8dab57af0c3eca0784bff93448c4e33d..5717569b321bdb6fe381000ef26b4d90fc867900 100644
--- a/Code/BasicFilters/otbEdgeDensityImageFilter.h
+++ b/Code/BasicFilters/otbEdgeDensityImageFilter.h
@@ -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;
diff --git a/Code/BasicFilters/otbEdgeDensityImageFilter.txx b/Code/BasicFilters/otbEdgeDensityImageFilter.txx
index f2fb3cdfbc3c2664d47df4abb85dc5aa139dd875..0e4015de44477828acdac29b79b85c18434b0981 100644
--- a/Code/BasicFilters/otbEdgeDensityImageFilter.txx
+++ b/Code/BasicFilters/otbEdgeDensityImageFilter.txx
@@ -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);
diff --git a/Code/BasicFilters/otbEdgeDetectorImageFilter.h b/Code/BasicFilters/otbEdgeDetectorImageFilter.h
index 4cfb221879df5373d691743f6831c1f4889e8c7b..41a7cb7af90b8ba314c9bdbf67d817e5180a6b8e 100644
--- a/Code/BasicFilters/otbEdgeDetectorImageFilter.h
+++ b/Code/BasicFilters/otbEdgeDetectorImageFilter.h
@@ -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
{
diff --git a/Code/BasicFilters/otbEdgeDetectorImageFilter.txx b/Code/BasicFilters/otbEdgeDetectorImageFilter.txx
index 1d566a798d31b724033e39ee721bd5a9c0f27054..fa491091fd85165a97d0aa56ce0d3d246110a047 100644
--- a/Code/BasicFilters/otbEdgeDetectorImageFilter.txx
+++ b/Code/BasicFilters/otbEdgeDetectorImageFilter.txx
@@ -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);
diff --git a/Code/BasicFilters/otbEstimateInnerProductPCAImageFilter.h b/Code/BasicFilters/otbEstimateInnerProductPCAImageFilter.h
index cacda9292bbcc187e93793b97df970a9f9994328..b9f3f60f68c70079f3b3e407c71482bc4dd96700 100644
--- a/Code/BasicFilters/otbEstimateInnerProductPCAImageFilter.h
+++ b/Code/BasicFilters/otbEstimateInnerProductPCAImageFilter.h
@@ -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 */
diff --git a/Code/BasicFilters/otbEstimateInnerProductPCAImageFilter.txx b/Code/BasicFilters/otbEstimateInnerProductPCAImageFilter.txx
index 94fc2a47831d1d1869a5c2498b2a49d5b540534b..37841f796df235d46d484cc946a425e9264b74cc 100644
--- a/Code/BasicFilters/otbEstimateInnerProductPCAImageFilter.txx
+++ b/Code/BasicFilters/otbEstimateInnerProductPCAImageFilter.txx
@@ -54,7 +54,7 @@ template<class TInputImage, class TOutputImage>
void
EstimateInnerProductPCAImageFilter<TInputImage,TOutputImage>
::GenerateOutputInformation(void)
-{
+{
Superclass::GenerateOutputInformation();
this->GetOutput()->SetNumberOfComponentsPerPixel(m_NumberOfPrincipalComponentsRequired);
}
diff --git a/Code/BasicFilters/otbEuclideanDistanceWithMissingValue.h b/Code/BasicFilters/otbEuclideanDistanceWithMissingValue.h
index b3eeabe5eb1d6ae8ee46dd3c48e7b31afd92d34c..d1746c8cbab68efdde7b413be3a954cecdc23e63 100644
--- a/Code/BasicFilters/otbEuclideanDistanceWithMissingValue.h
+++ b/Code/BasicFilters/otbEuclideanDistanceWithMissingValue.h
@@ -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
diff --git a/Code/BasicFilters/otbEuclideanDistanceWithMissingValuePow2.h b/Code/BasicFilters/otbEuclideanDistanceWithMissingValuePow2.h
index 6bcd6a241b4d8015453445dad204fb0f87bdd2cd..5e79e3885854c9814f7273ba1f0fe810789d1ce2 100644
--- a/Code/BasicFilters/otbEuclideanDistanceWithMissingValuePow2.h
+++ b/Code/BasicFilters/otbEuclideanDistanceWithMissingValuePow2.h
@@ -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
* to the initial Evaluate method, the class does not perform calculation
* when a component does not contain any data. The 'no data' case is perform through the \code{SetToMissingValue()}
* which performs a \code{Nan} affectation.
- *
+ *
* 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}'.
*
* \sa EuclideanDistance
- * \sa EuclideanDistanceWithMissingValue
+ * \sa EuclideanDistanceWithMissingValue
*/
template< class TVector >
class ITK_EXPORT EuclideanDistanceWithMissingValuePow2 :
@@ -51,7 +51,7 @@ class ITK_EXPORT EuclideanDistanceWithMissingValuePow2 :
/** Standard "Self" typedef. */
typedef EuclideanDistanceWithMissingValuePow2 Self;
typedef itk::Statistics::EuclideanDistance< TVector > Superclass;
- typedef itk::SmartPointer< Self > Pointer ;
+ typedef itk::SmartPointer< Self > Pointer ;
typedef itk::SmartPointer<const Self> ConstPointer;
typedef typename Superclass::MeasurementVectorSizeType MeasurementVectorSizeType;
@@ -71,7 +71,7 @@ class ITK_EXPORT EuclideanDistanceWithMissingValuePow2 :
double Evaluate(const TVector &x1, const TVector &x2) const ;
/** 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 ;
/** Returns true if the distance between x and the origin is less
@@ -87,7 +87,7 @@ class ITK_EXPORT EuclideanDistanceWithMissingValuePow2 :
protected:
EuclideanDistanceWithMissingValuePow2() {}
- virtual ~EuclideanDistanceWithMissingValuePow2() {}
+ virtual ~EuclideanDistanceWithMissingValuePow2() {}
} ; // end of class
} // end namespace statistics
diff --git a/Code/BasicFilters/otbEuclideanDistanceWithMissingValuePow2.txx b/Code/BasicFilters/otbEuclideanDistanceWithMissingValuePow2.txx
index 38fb206feab179df3a888efacdb5412058127918..dc9c3f0ad64f3a304979c4ab1e1b54ae7046ac9c 100644
--- a/Code/BasicFilters/otbEuclideanDistanceWithMissingValuePow2.txx
+++ b/Code/BasicFilters/otbEuclideanDistanceWithMissingValuePow2.txx
@@ -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,7 +32,7 @@ inline double
EuclideanDistanceWithMissingValuePow2< TVector >
::Evaluate(const TVector &x1, const TVector &x2) const
{
- if( itk::MeasurementVectorTraits::GetLength( x1 ) !=
+ if( itk::MeasurementVectorTraits::GetLength( x1 ) !=
itk::MeasurementVectorTraits::GetLength( x2 ) )
{
itkExceptionMacro( << "Vector lengths must be equal." );
@@ -57,13 +57,13 @@ inline double
EuclideanDistanceWithMissingValuePow2< TVector >
::Evaluate(const TVector &x) const
{
- MeasurementVectorSizeType
+ MeasurementVectorSizeType
measurementVectorSize = this->GetMeasurementVectorSize();
- if(measurementVectorSize == 0)
+ if(measurementVectorSize == 0)
{
itkExceptionMacro( << "Please set the MeasurementVectorSize first" );
}
- itk::MeasurementVectorTraits::Assert( this->m_Origin, measurementVectorSize,
+ itk::MeasurementVectorTraits::Assert( this->m_Origin, measurementVectorSize,
"EuclideanDistance::Evaluate Origin and input vector have different lengths");
double temp, distance = itk::NumericTraits< double >::Zero ;
@@ -97,9 +97,9 @@ template< class TVector >
/*static */
bool
EuclideanDistanceWithMissingValuePow2< TVector >
-::IsMissingValue ( const ValueType & v)
+::IsMissingValue ( const ValueType & v)
{
- return static_cast<bool>( vnl_math_isnan( static_cast<double>( v ) ) );
+ return static_cast<bool>( vnl_math_isnan( static_cast<double>( v ) ) );
}
template< class TVector >
@@ -108,7 +108,7 @@ void
EuclideanDistanceWithMissingValuePow2< TVector >
::SetToMissingValue ( ValueType & v )
{
- v = std::numeric_limits<ValueType>::signaling_NaN();
+ v = std::numeric_limits<ValueType>::signaling_NaN();
}
diff --git a/Code/BasicFilters/otbFunctionWithNeighborhoodToImageFilter.txx b/Code/BasicFilters/otbFunctionWithNeighborhoodToImageFilter.txx
index 6ba0cabd45f32d7035b709cc98af0667294d54bc..26aeba2e758e566d3e7085d5cbba8442be5b5025 100644
--- a/Code/BasicFilters/otbFunctionWithNeighborhoodToImageFilter.txx
+++ b/Code/BasicFilters/otbFunctionWithNeighborhoodToImageFilter.txx
@@ -48,7 +48,7 @@ template <class TInputImage, class TOutputImage, class TFunction >
void
FunctionWithNeighborhoodToImageFilter<TInputImage,TOutputImage,TFunction>
::BeforeThreadedGenerateData()
-{
+{
Superclass::BeforeThreadedGenerateData();
InputImageConstPointer inputPtr = dynamic_cast<const TInputImage*>((itk::ProcessObject::GetInput(0)));
diff --git a/Code/BasicFilters/otbImageAndVectorImageOperationFilter.h b/Code/BasicFilters/otbImageAndVectorImageOperationFilter.h
index c4514290d4e3a2294cae0d815cc9dfb89e1497ed..0398efce26cd829afb3973873a83c28417e06944 100644
--- a/Code/BasicFilters/otbImageAndVectorImageOperationFilter.h
+++ b/Code/BasicFilters/otbImageAndVectorImageOperationFilter.h
@@ -64,37 +64,37 @@ public:
{
case MULTIPLICATION:
{
- vInTmp *= static_cast<InternalInputPixelType>(inPix);
- break;
+ vInTmp *= static_cast<InternalInputPixelType>(inPix);
+ break;
}
case ADDITION:
- {
- vInTmp += static_cast<InternalInputPixelType>(inPix);
- break;
- }
+ {
+ vInTmp += static_cast<InternalInputPixelType>(inPix);
+ break;
+ }
case DIVISON:
- {
- if(inPix!=0)
- vInTmp /= static_cast<InternalInputPixelType>(inPix);
- else
- {
- vInTmp.Fill(0);
- }
- break;
- }
+ {
+ if(inPix!=0)
+ vInTmp /= static_cast<InternalInputPixelType>(inPix);
+ else
+ {
+ vInTmp.Fill(0);
+ }
+ break;
+ }
case SUBSTRACTION:
- {
- vInTmp -= static_cast<InternalInputPixelType>(inPix);
- break;
- }
+ {
+ vInTmp -= static_cast<InternalInputPixelType>(inPix);
+ break;
+ }
default:
- {
- }
+ {
+ }
}
for(unsigned int i=0; i<vInTmp.Size(); i++)
{
- out[i] = static_cast<InternalInputPixelType>(vInTmp[i]);
+ out[i] = static_cast<InternalInputPixelType>(vInTmp[i]);
}
return out;
}
@@ -107,7 +107,7 @@ public:
/** \class ImageAndVectorImageOperationFilter
* \brief Provides simple pixel to pixel operation between Image and VectorImage.
*
- * Apply an operation (multiplication, division, addition or substraction) between
+ * Apply an operation (multiplication, division, addition or substraction) between
* the input image and each channel of the vector input image.
* Use SetOperation( MULTIPLICATION, ADDITION, DIVISON or SUBSTRACTION ) to select the wanted operation.
* Default is an addition.
@@ -120,12 +120,12 @@ public:
template <class TInputImage, class TVectorInputImage, class TOutputImage>
class ITK_EXPORT ImageAndVectorImageOperationFilter:
-public itk::BinaryFunctorImageFilter<TInputImage,
- TVectorInputImage,
- TOutputImage,
- Functor::ImageAndVectorImageOperationFunctor<ITK_TYPENAME TInputImage::PixelType,
- ITK_TYPENAME TVectorInputImage::PixelType,
- ITK_TYPENAME TOutputImage::PixelType > >
+public itk::BinaryFunctorImageFilter<TInputImage,
+ TVectorInputImage,
+ TOutputImage,
+ Functor::ImageAndVectorImageOperationFunctor<ITK_TYPENAME TInputImage::PixelType,
+ ITK_TYPENAME TVectorInputImage::PixelType,
+ ITK_TYPENAME TOutputImage::PixelType > >
//ImageToImageFilter< TVectorInputImage, TOutputImage >
{
public:
@@ -133,9 +133,9 @@ public:
/** Standard class typedefs. */
typedef ImageAndVectorImageOperationFilter Self;
//typedef itk::ImageToImageFilter<TVectorInputImage, TOutputImage> Superclass;
- typedef Functor::ImageAndVectorImageOperationFunctor<ITK_TYPENAME TInputImage::PixelType,
- ITK_TYPENAME TVectorInputImage::PixelType,
- ITK_TYPENAME TOutputImage::PixelType > FunctorType;
+ typedef Functor::ImageAndVectorImageOperationFunctor<ITK_TYPENAME TInputImage::PixelType,
+ ITK_TYPENAME TVectorInputImage::PixelType,
+ ITK_TYPENAME TOutputImage::PixelType > FunctorType;
typedef itk::BinaryFunctorImageFilter<TInputImage, TVectorInputImage, TOutputImage, FunctorType> Superclass;
typedef itk::SmartPointer<Self> Pointer;
typedef itk::SmartPointer<const Self> ConstPointer;
@@ -150,7 +150,7 @@ public:
/** Typedef for the images. */
typedef TInputImage InputImageType;
typedef typename InputImageType::PixelType InputPixelType;
- typedef TVectorInputImage VectorInputImageType;
+ typedef TVectorInputImage VectorInputImageType;
typedef typename VectorInputImageType::PixelType VectorInputPixelType;
typedef TOutputImage OutputImageType;
typedef typename OutputImageType::PixelType OutputPixelType;
@@ -232,7 +232,7 @@ private:
bool m_UseAddition;
bool m_UseMultiplication;
bool m_UseDivision;
- bool m_UseSubstraction;
+ bool m_UseSubstraction;
};
} // end namespace otb
diff --git a/Code/BasicFilters/otbInnerProductPCAImageFilter.h b/Code/BasicFilters/otbInnerProductPCAImageFilter.h
index fdd10f5efb05daee78c01b9b5ac452128dab9c23..df56b3d0c870458fa82d5605719d78af7c87b73d 100644
--- a/Code/BasicFilters/otbInnerProductPCAImageFilter.h
+++ b/Code/BasicFilters/otbInnerProductPCAImageFilter.h
@@ -37,23 +37,23 @@ namespace otb
* itk::ImagePCAShapeModelEstimator) (PCA) on a vector image in streaming capabilities.
* Alls channels of the input vector image are used for training images
* and also the number of desired largest principal components needed.
- * The number of channels of the output image are the user specified number of desired
+ * The number of channels of the output image are the user specified number of desired
* largest principal components.
*
* The algorithm uses the VNL library to perform the eigen analysis. To speed
- * the computation of the instead of performing the eigen analysis of the
+ * the computation of the instead of performing the eigen analysis of the
* covariance vector A*A' where A is a matrix with p x t, p = number of
* pixels or voxels in each images and t = number of training images, we
* calculate the eigen vectors of the inner product matrix A'*A. The resulting
- * eigen vectors (E) are then multiplied with the the matrix A to get the
- * principal compoenets. The covariance matrix has a dimension of p x p. Since
- * number of pixels in any image being typically very high the eigen
- * decomposition becomes computationally expensive. The inner product on the
- * other hand has the dimension of t x t, where t is typically much smaller
+ * eigen vectors (E) are then multiplied with the the matrix A to get the
+ * principal compoenets. The covariance matrix has a dimension of p x p. Since
+ * number of pixels in any image being typically very high the eigen
+ * decomposition becomes computationally expensive. The inner product on the
+ * other hand has the dimension of t x t, where t is typically much smaller
* that p. Hence the eigen decomposition (most compute intensive part) is an
* orders of magnitude faster.
- *
- * The Update() function enables the calculation of the various models, creates
+ *
+ * The Update() function enables the calculation of the various models, creates
* the membership function objects and populates them.
*
* \sa itk::ImagePCAShapeModelEstimator
@@ -86,7 +86,7 @@ public:
/** Template parameters typedefs for mean component generation */
typedef Image< typename InputImageType::InternalPixelType,::itk::GetImageDimension<InputImageType>::ImageDimension > InternalImageType;
- typedef Functor::MeanFunctor<typename InputImageType::PixelType, typename InternalImageType::PixelType >
+ typedef Functor::MeanFunctor<typename InputImageType::PixelType, typename InternalImageType::PixelType >
MeanFunctorType;
typedef itk::UnaryFunctorImageFilter<InputImageType, InternalImageType, MeanFunctorType> MeanFilterType;
typedef typename MeanFilterType::Pointer MeanFilterPointer;
@@ -150,7 +150,7 @@ private:
/** Flag to specify the generation or not of the mean component output */
bool m_GenerateMeanComponent;
- /** Internals filters use to generate mean component output */
+ /** Internals filters use to generate mean component output */
MeanFilterPointer m_MeanFilter;
CastFilterPointer m_CastFilter;
ConcatenateFilterPointer m_ConcatenateFilter;
diff --git a/Code/BasicFilters/otbInnerProductPCAImageFilter.txx b/Code/BasicFilters/otbInnerProductPCAImageFilter.txx
index d581066059a6f55c7ed5f7e024d14134427b5fc1..e664c54fa118de0c1a69db3bcb8e2d9297d081bb 100644
--- a/Code/BasicFilters/otbInnerProductPCAImageFilter.txx
+++ b/Code/BasicFilters/otbInnerProductPCAImageFilter.txx
@@ -46,7 +46,7 @@ template<class TInputImage, class TOutputImage>
void
InnerProductPCAImageFilter<TInputImage,TOutputImage>
::GenerateOutputInformation(void)
-{
+{
Superclass::GenerateOutputInformation();
if( m_GenerateMeanComponent == false )
this->GetOutput()->SetNumberOfComponentsPerPixel(m_NumberOfPrincipalComponentsRequired);
diff --git a/Code/BasicFilters/otbListSampleToVariableDimensionHistogramGenerator.h b/Code/BasicFilters/otbListSampleToVariableDimensionHistogramGenerator.h
index 0cf64e29e1e3a2d193b989f0f3b39a0d5c19baf2..8b81b254795d088b38e216f3c694e5af9e752863 100755
--- a/Code/BasicFilters/otbListSampleToVariableDimensionHistogramGenerator.h
+++ b/Code/BasicFilters/otbListSampleToVariableDimensionHistogramGenerator.h
@@ -13,8 +13,8 @@
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.
=========================================================================*/
@@ -36,17 +36,17 @@ namespace otb{
* This class is a fork from itk::ListSampleToHistogramGenerator
* adapted to produce VariableDimensionHistogram, whose dimension can
* be chosen at runtime.
- *
+ *
* Since the MeasurementVectorSize template parameter is no longer
* needed, it has been removed.
- *
+ *
* For more information, please refer to the
* ListSampleToHistogramGenerator class documentation.
*
* \sa VariableDimensionHistogram, ListSample, ListSampleToHistogramGenerator
*/
-template< class TListSample,
- class THistogramMeasurement,
+template< class TListSample,
+ class THistogramMeasurement,
class TFrequencyContainer = itk::Statistics::DenseFrequencyContainer>
class ITK_EXPORT ListSampleToVariableDimensionHistogramGenerator :
public itk::Object
@@ -65,7 +65,7 @@ public:
itkNewMacro(Self);
/** Type needed for defining the limits of the histogram bins */
- typedef typename itk::NumericTraits< THistogramMeasurement >::RealType
+ typedef typename itk::NumericTraits< THistogramMeasurement >::RealType
HistogramMeasurementRealType;
typedef itk::Statistics::VariableDimensionHistogram< HistogramMeasurementRealType,
@@ -76,8 +76,8 @@ public:
/** plug in the ListSample object */
void SetListSample(const TListSample* list)
- {
- m_List = list;
+ {
+ m_List = list;
}
void SetMarginalScale(float scale)
@@ -89,7 +89,7 @@ public:
HistogramType* GetOutput() const
{ return m_Histogram; }
- void Update()
+ void Update()
{ this->GenerateData(); }
itkSetMacro(AutoMinMax,bool);
@@ -125,7 +125,7 @@ private:
}; // end of class
-} // end of namespace itk
+} // end of namespace itk
#ifndef OTB_MANUAL_INSTANTIATION
#include "otbListSampleToVariableDimensionHistogramGenerator.txx"
diff --git a/Code/BasicFilters/otbListSampleToVariableDimensionHistogramGenerator.txx b/Code/BasicFilters/otbListSampleToVariableDimensionHistogramGenerator.txx
index bb686fb04a8d7c582a9d7a74e1da645c25d6556c..abc41724c030b77792aa68606ac3f6fe2873be6f 100755
--- a/Code/BasicFilters/otbListSampleToVariableDimensionHistogramGenerator.txx
+++ b/Code/BasicFilters/otbListSampleToVariableDimensionHistogramGenerator.txx
@@ -13,8 +13,8 @@
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.
=========================================================================*/
@@ -27,26 +27,26 @@
namespace otb
{
-template< class TListSample,
- class THistogramMeasurement,
+template< class TListSample,
+ class THistogramMeasurement,
class TFrequencyContainer>
-ListSampleToVariableDimensionHistogramGenerator< TListSample,
- THistogramMeasurement,
+ListSampleToVariableDimensionHistogramGenerator< TListSample,
+ THistogramMeasurement,
TFrequencyContainer >
::ListSampleToVariableDimensionHistogramGenerator()
{
m_Histogram = HistogramType::New();
m_MarginalScale = 100;
m_AutoMinMax = true;
-}
+}
-template< class TListSample,
- class THistogramMeasurement,
+template< class TListSample,
+ class THistogramMeasurement,
class TFrequencyContainer >
void
-ListSampleToVariableDimensionHistogramGenerator< TListSample,
- THistogramMeasurement,
+ListSampleToVariableDimensionHistogramGenerator< TListSample,
+ THistogramMeasurement,
TFrequencyContainer >
::GenerateData()
{
@@ -88,34 +88,34 @@ ListSampleToVariableDimensionHistogramGenerator< TListSample,
{
if ( !itk::NumericTraits< THistogramMeasurement >::is_integer )
{
- margin =
- ( (THistogramMeasurement)(upper[i] - lower[i]) /
- (THistogramMeasurement) m_Sizes[i] ) /
+ margin =
+ ( (THistogramMeasurement)(upper[i] - lower[i]) /
+ (THistogramMeasurement) m_Sizes[i] ) /
(THistogramMeasurement) m_MarginalScale;
h_upper[i] = (THistogramMeasurement) (upper[i] + margin);
if(h_upper[i] <= upper[i])
- {
+ {
// an overflow has occurred therefore set upper to upper
h_upper[i] = upper[i];
// Histogram measurement type would force the clipping the max value.
// Therefore we must call the following to include the max value:
m_Histogram->SetClipBinsAtEnds(false);
- // The above function is okay since here we are within the autoMinMax
+ // The above function is okay since here we are within the autoMinMax
// computation and clearly the user intended to include min and max.
}
}
else
{
- h_upper[i] = ((THistogramMeasurement) upper[i]) +
+ h_upper[i] = ((THistogramMeasurement) upper[i]) +
itk::NumericTraits< THistogramMeasurement >::One;
if(h_upper[i] <= upper[i])
- {
+ {
// an overflow has occurred therefore set upper to upper
h_upper[i] = upper[i];
// Histogram measurement type would force the clipping the max value.
// Therefore we must call the following to include the max value:
m_Histogram->SetClipBinsAtEnds(false);
- // The above function is okay since here we are within the autoMinMax
+ // The above function is okay since here we are within the autoMinMax
// computation and clearly the user intended to include min and max.
}
}
@@ -167,12 +167,12 @@ ListSampleToVariableDimensionHistogramGenerator< TListSample,
otbMsgDebugMacro(<<"ListSampleToVariableDimensionHistogramGenerator::GenerateData(): Leaving");
}
-template< class TListSample,
- class THistogramMeasurement,
+template< class TListSample,
+ class THistogramMeasurement,
class TFrequencyContainer >
void
-ListSampleToVariableDimensionHistogramGenerator< TListSample,
- THistogramMeasurement,
+ListSampleToVariableDimensionHistogramGenerator< TListSample,
+ THistogramMeasurement,
TFrequencyContainer >
::PrintSelf(std::ostream& os, itk::Indent indent) const
{
@@ -184,7 +184,7 @@ ListSampleToVariableDimensionHistogramGenerator< TListSample,
os << indent << "HistogramMax: "<< m_HistogramMax << std::endl;
}
-} // end of namespace itk
+} // end of namespace itk
#endif
diff --git a/Code/BasicFilters/otbNormalizeInnerProductPCAImageFilter.txx b/Code/BasicFilters/otbNormalizeInnerProductPCAImageFilter.txx
index 382a7f43854a5bc7b64d3ec1153c8d2c419e76cf..5d115a9f632b19fe99a6adb9d37c67ce2d4556a3 100644
--- a/Code/BasicFilters/otbNormalizeInnerProductPCAImageFilter.txx
+++ b/Code/BasicFilters/otbNormalizeInnerProductPCAImageFilter.txx
@@ -46,7 +46,7 @@ template<class TInputImage, class TOutputImage>
void
NormalizeInnerProductPCAImageFilter<TInputImage,TOutputImage>
::GenerateOutputInformation(void)
-{
+{
Superclass::GenerateOutputInformation();
}
diff --git a/Code/BasicFilters/otbPrintableImageFilter.h b/Code/BasicFilters/otbPrintableImageFilter.h
index aa579524c8b0f6b994faaef3c124af042d9e48d8..d92fa61f2d0ab4a54149b1c34ff4002841f3cdce 100644
--- a/Code/BasicFilters/otbPrintableImageFilter.h
+++ b/Code/BasicFilters/otbPrintableImageFilter.h
@@ -76,17 +76,17 @@ class ITK_EXPORT MaskFunctor
{
OutputPixelType outPix;
if( maskPix==m_BackgroundValue )
- {
- outPix.SetSize( inPix.Size() );
- for(unsigned int i=0; i<outPix.Size(); i++)
- {
- outPix[i] = static_cast<OutputInternalPixelType>(inPix[i]);
- }
- }
+ {
+ outPix.SetSize( inPix.Size() );
+ for(unsigned int i=0; i<outPix.Size(); i++)
+ {
+ outPix[i] = static_cast<OutputInternalPixelType>(inPix[i]);
+ }
+ }
else
- {
- outPix = m_ObjectColor;
- }
+ {
+ outPix = m_ObjectColor;
+ }
return outPix;
}
@@ -195,7 +195,7 @@ public itk::ImageToImageFilter<TInputImage, otb::VectorImage<unsigned char, 2> >
{
if(chList.size() != 3)
{
- itkExceptionMacro(<<"Invalid channel list, size is "<<chList.size()<<" instead of 3");
+ itkExceptionMacro(<<"Invalid channel list, size is "<<chList.size()<<" instead of 3");
}
m_ChannelList = chList;
this->Modified();
diff --git a/Code/BasicFilters/otbPrintableImageFilter.txx b/Code/BasicFilters/otbPrintableImageFilter.txx
index 9a6b88df629114a311f63ab28050e641a1383f09..4332e6237ed4aa9244dc2bab3a17a6fa7331f043 100644
--- a/Code/BasicFilters/otbPrintableImageFilter.txx
+++ b/Code/BasicFilters/otbPrintableImageFilter.txx
@@ -111,13 +111,13 @@ PrintableImageFilter<TInputImage, TMaskImage>
typename InputImageType::ConstPointer inputPtr = this->GetInput();
if( !inputMaskPtr )
- {
- itkExceptionMacro(<<"No mask detected");
- }
+ {
+ itkExceptionMacro(<<"No mask detected");
+ }
if( inputMaskPtr->GetLargestPossibleRegion().GetSize() != inputPtr->GetLargestPossibleRegion().GetSize())
- {
- itkExceptionMacro(<<"Input size ("<<inputPtr->GetLargestPossibleRegion().GetSize()<<") and Mask size ("<<inputMaskPtr->GetLargestPossibleRegion().GetSize()<<") must be the same");
- }
+ {
+ itkExceptionMacro(<<"Input size ("<<inputPtr->GetLargestPossibleRegion().GetSize()<<") and Mask size ("<<inputMaskPtr->GetLargestPossibleRegion().GetSize()<<") must be the same");
+ }
}
}
@@ -133,7 +133,7 @@ PrintableImageFilter<TInputImage, TMaskImage>
{
this->BeforeGenerateData();
- // let this loop to be compliant with previous version of the class where m_ChannelList didn't exist...
+ // let this loop to be compliant with previous version of the class where m_ChannelList didn't exist...
if(m_Extractor->GetNbChannels() == 0)
{
for(unsigned int i=0; i<m_ChannelList.size(); i++)
diff --git a/Code/BasicFilters/otbSpatialObjectToImageDrawingFilter.txx b/Code/BasicFilters/otbSpatialObjectToImageDrawingFilter.txx
index 31cc174bcf6c624c32af5e93faa7f272db16f5c6..a7f86156e1e61c3c6d343d76ff45d0f9bbaad204 100644
--- a/Code/BasicFilters/otbSpatialObjectToImageDrawingFilter.txx
+++ b/Code/BasicFilters/otbSpatialObjectToImageDrawingFilter.txx
@@ -279,7 +279,7 @@ SpatialObjectToImageDrawingFilter<TInputSpatialObject,TOutputImage>
InputObject->ComputeBoundingBox();
bool originspecified = false;
if (!strcmp(InputObject->GetNameOfClass(),"GroupSpatialObject"))
- {
+ {
ChildrenType children;
children=InputObject->GetChildren(0);
IteratorType iter = children->begin();
@@ -288,29 +288,29 @@ SpatialObjectToImageDrawingFilter<TInputSpatialObject,TOutputImage>
(*iter)->ComputeBoundingBox();
for (i=0;i<ObjectDimension;++i)
- {
- minimum[i]=(*iter)->GetBoundingBox()->GetMinimum()[i];
- }
+ {
+ minimum[i]=(*iter)->GetBoundingBox()->GetMinimum()[i];
+ }
while (iter != end)
- {
- (*iter)->ComputeBoundingBox();
- for (i=0;i<ObjectDimension;++i)
- {
- if ((*iter)->GetBoundingBox()->GetMinimum()[i] < minimum[i])
- {
- minimum[i]=(*iter)->GetBoundingBox()->GetMinimum()[i];
- }
- }
- ++iter;
- }
+ {
+ (*iter)->ComputeBoundingBox();
+ for (i=0;i<ObjectDimension;++i)
+ {
+ if ((*iter)->GetBoundingBox()->GetMinimum()[i] < minimum[i])
+ {
+ minimum[i]=(*iter)->GetBoundingBox()->GetMinimum()[i];
+ }
+ }
+ ++iter;
+ }
for (i=0;i<ObjectDimension;++i)
- {
- size[i] = (long unsigned int) (InputObject->GetBoundingBox()->GetMaximum()[i] - minimum[i])+1;
- origine[i]=(long int) minimum[i];
- originspecified = true;
- }
+ {
+ size[i] = (long unsigned int) (InputObject->GetBoundingBox()->GetMaximum()[i] - minimum[i])+1;
+ origine[i]=(long int) minimum[i];
+ originspecified = true;
+ }
itkDebugMacro(<<"minx= "<<minimum[0]<<", miny= "<<minimum[0]<<", maxx= "<<InputObject->GetBoundingBox()->GetMaximum()[0]<<", maxy= "<<InputObject->GetBoundingBox()->GetMaximum()[1]);
}
@@ -318,10 +318,10 @@ SpatialObjectToImageDrawingFilter<TInputSpatialObject,TOutputImage>
{
for (i=0;i<ObjectDimension;++i)
- {
- size[i] = (long int)(InputObject->GetBoundingBox()->GetMaximum()[i]
- - InputObject->GetBoundingBox()->GetMinimum()[i]);
- }
+ {
+ size[i] = (long int)(InputObject->GetBoundingBox()->GetMaximum()[i]
+ - InputObject->GetBoundingBox()->GetMinimum()[i]);
+ }
}
typename OutputImageType::IndexType index;
@@ -337,8 +337,8 @@ SpatialObjectToImageDrawingFilter<TInputSpatialObject,TOutputImage>
{
if (m_Size[i] != 0)
{
- specified = true;
- break;
+ specified = true;
+ break;
}
}
@@ -358,10 +358,10 @@ SpatialObjectToImageDrawingFilter<TInputSpatialObject,TOutputImage>
for (i = 0; i < OutputImageDimension; ++i)
{
if (m_Spacing[i] != 0)
- {
- specified = true;
- break;
- }
+ {
+ specified = true;
+ break;
+ }
}
if (specified)
@@ -425,24 +425,24 @@ SpatialObjectToImageDrawingFilter<TInputSpatialObject,TOutputImage>
if ( m_InsideValue != 0 || m_OutsideValue != 0 )
{
if ( val)
- {
- if (m_UseObjectValue)
- {
- it.Set(static_cast<ValueType>(val));
- }
- else
- {
- it.Set(m_InsideValue);
- }
- }
+ {
+ if (m_UseObjectValue)
+ {
+ it.Set(static_cast<ValueType>(val));
+ }
+ else
+ {
+ it.Set(m_InsideValue);
+ }
+ }
else
- {
- it.Set(m_OutsideValue);
- }
+ {
+ it.Set(m_OutsideValue);
+ }
}
else
{
- it.Set(static_cast<ValueType>(val));
+ it.Set(static_cast<ValueType>(val));
}
++it;
}
diff --git a/Code/BasicFilters/otbStreamingInnerProductVectorImageFilter.txx b/Code/BasicFilters/otbStreamingInnerProductVectorImageFilter.txx
index fb86a600b76768dda63ca47002724770e82dd9f5..cec39d4f51a8da21f889cd71f8cab6d0965542c4 100644
--- a/Code/BasicFilters/otbStreamingInnerProductVectorImageFilter.txx
+++ b/Code/BasicFilters/otbStreamingInnerProductVectorImageFilter.txx
@@ -159,20 +159,20 @@ PersistentInnerProductVectorImageFilter<TInputImage>
innerProduct.set_size( numberOfTrainingImages, numberOfTrainingImages );
innerProduct.fill( 0 );
- // Concatenate threaded matrix
+ // Concatenate threaded matrix
for ( unsigned int thread = 0; thread < numberOfThreads; thread++)
{
innerProduct += m_ThreadInnerProduct[thread];
}
- //---------------------------------------------------------------------
+ //---------------------------------------------------------------------
// Fill the rest of the inner product matrix and make it symmetric
//---------------------------------------------------------------------
for(unsigned int band_x = 0; band_x < (numberOfTrainingImages - 1); ++band_x)
{
for(unsigned int band_y = band_x+1; band_y < numberOfTrainingImages; ++band_y)
- {
- innerProduct[band_x][band_y] = innerProduct[band_y][band_x];
+ {
+ innerProduct[band_x][band_y] = innerProduct[band_y][band_x];
}// end band_y loop
}// end band_x loop
@@ -217,12 +217,12 @@ PersistentInnerProductVectorImageFilter<TInputImage>
}
mean /= static_cast<double>(vectorValue.GetSize());
- // Matrix iteration
+ // Matrix iteration
for(unsigned int band_x = 0; band_x < numberOfTrainingImages; ++band_x)
{
for(unsigned int band_y = 0; band_y <= band_x; ++band_y )
{
- m_ThreadInnerProduct[threadId][band_x][band_y] +=
+ m_ThreadInnerProduct[threadId][band_x][band_y] +=
(static_cast<double>(vectorValue[band_x]) - mean) * (static_cast<double>(vectorValue[band_y]) - mean);
} // end: band_y loop
} // end: band_x loop
@@ -237,12 +237,12 @@ PersistentInnerProductVectorImageFilter<TInputImage>
while (!it.IsAtEnd())
{
PixelType vectorValue = it.Get();
- // Matrix iteration
+ // Matrix iteration
for(unsigned int band_x = 0; band_x < numberOfTrainingImages; ++band_x)
{
for(unsigned int band_y = 0; band_y <= band_x; ++band_y )
{
- m_ThreadInnerProduct[threadId][band_x][band_y] +=
+ m_ThreadInnerProduct[threadId][band_x][band_y] +=
(static_cast<double>(vectorValue[band_x]) ) * (static_cast<double>(vectorValue[band_y]) );
} // end: band_y loop
} // end: band_x loop
diff --git a/Code/BasicFilters/otbSubsampleImageFilter.h b/Code/BasicFilters/otbSubsampleImageFilter.h
index cddab350c63b808fc5e8ff3874d6e77e391d532f..ee8ef7c3b2073322bd301ec68dc1103ad7860ba9 100644
--- a/Code/BasicFilters/otbSubsampleImageFilter.h
+++ b/Code/BasicFilters/otbSubsampleImageFilter.h
@@ -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,10 +32,10 @@ namespace otb {
/** \class SubsampleImageFilter
* \brief Performs a down sampling of an image
*
- * This class performs a simple resampling image filtering.
+ * This class performs a simple resampling image filtering.
*
- * The third template is a FORWARD/INVERSE InverseOrForwardTransformationEnum
- * enumeration type. With FORWARD, the output image is of the same size of the one of
+ * The third template is a FORWARD/INVERSE InverseOrForwardTransformationEnum
+ * enumeration type. With FORWARD, the output image is of the same size of the one of
* the input image. But the output image contains only co-located subsample, the reset being 0.
* When INVERSE is used, the input image is considered to as the sub-sampled. then, the output
* image is larger. Inital pixel values are preserved but the output image is interleaved with
@@ -45,7 +45,7 @@ namespace otb {
* \sa SubsampleImageRegionConstIterator
* \sa DecimateImageFilter
*/
-template < class TInputImage, class TOutputImage,
+template < class TInputImage, class TOutputImage,
InverseOrForwardTransformationEnum TDirectionOfTransformation >
class ITK_EXPORT SubsampleImageFilter :
public itk::ImageToImageFilter< TInputImage, TOutputImage >
@@ -107,13 +107,13 @@ protected:
/** Internal test function to check if there is any direction to subsample */
bool IsSubsampleFactorOne () const;
- /** 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.
@@ -124,7 +124,7 @@ protected:
virtual void BeforeThreadedGenerateData ();
/** Allows multithreading */
- virtual void ThreadedGenerateData
+ virtual void ThreadedGenerateData
( const OutputImageRegionType & outputRegionForThread, int threadId );
virtual void PrintSelf( std::ostream & os, itk::Indent indent ) const;
@@ -134,7 +134,7 @@ private:
void operator= ( const Self & ); // purposely not implemented
InputImageIndexType m_SubsampleFactor;
-}; // end of class
+}; // end of class
} // end of namespace otb
diff --git a/Code/BasicFilters/otbSubsampleImageFilter.txx b/Code/BasicFilters/otbSubsampleImageFilter.txx
index 4624776ad6f256af90a3c946c79e6af754d432e2..62f0066d085bc4762bdb7feccce5e1c3c6947a07 100644
--- a/Code/BasicFilters/otbSubsampleImageFilter.txx
+++ b/Code/BasicFilters/otbSubsampleImageFilter.txx
@@ -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.
=========================================================================*/
@@ -80,9 +80,9 @@ SubsampleImageFilter< TInputImage, TOutputImage, TDirectionOfTransformation >
template <class TInputImage, class TOutputImage,
InverseOrForwardTransformationEnum TDirectionOfTransformation >
-void
+void
SubsampleImageFilter< TInputImage, TOutputImage, TDirectionOfTransformation >
-::CallCopyOutputRegionToInputRegion
+::CallCopyOutputRegionToInputRegion
( InputImageRegionType & destRegion, const OutputImageRegionType & srcRegion )
{
Superclass::CallCopyOutputRegionToInputRegion( destRegion, srcRegion );
@@ -108,10 +108,10 @@ SubsampleImageFilter< TInputImage, TOutputImage, TDirectionOfTransformation >
template <class TInputImage, class TOutputImage,
InverseOrForwardTransformationEnum TDirectionOfTransformation >
-void
+void
SubsampleImageFilter< TInputImage, TOutputImage, TDirectionOfTransformation >
::CallCopyInputRegionToOutputRegion
-( OutputImageRegionType & destRegion, const InputImageRegionType & srcRegion )
+( OutputImageRegionType & destRegion, const InputImageRegionType & srcRegion )
{
Superclass::CallCopyInputRegionToOutputRegion( destRegion, srcRegion );
@@ -161,7 +161,7 @@ SubsampleImageFilter< TInputImage, TOutputImage, TDirectionOfTransformation >
InputImageRegionType inputRegionForThread;
this->CallCopyOutputRegionToInputRegion( inputRegionForThread, outputRegionForThread );
- SubsampledImageRegionConstIterator< InputImageType > inputIter
+ SubsampledImageRegionConstIterator< InputImageType > inputIter
( this->GetInput(), inputRegionForThread );
switch ( DirectionOfTransformation )
@@ -173,7 +173,7 @@ SubsampleImageFilter< TInputImage, TOutputImage, TDirectionOfTransformation >
while ( !inputIter.IsAtEnd() )
{
- outputIter.SetOffset(
+ outputIter.SetOffset(
static_cast< typename SubsampledImageRegionIterator< OutputImageType >::OffsetType >
( inputIter.GetOffset() ) );
outputIter.Set( static_cast< OutputPixelType >( inputIter.Get() ) );
diff --git a/Code/BasicFilters/otbVectorRescaleIntensityImageFilter.txx b/Code/BasicFilters/otbVectorRescaleIntensityImageFilter.txx
index b4cc883fad05b84ecd113299f57c640a1e029f09..8b7ea4bb52fe9df30dc10883f0c3855d65ebd44c 100644
--- a/Code/BasicFilters/otbVectorRescaleIntensityImageFilter.txx
+++ b/Code/BasicFilters/otbVectorRescaleIntensityImageFilter.txx
@@ -78,7 +78,7 @@ VectorRescaleIntensityImageFilter<TInputImage, TOutputImage>
{
if(m_ClampThreshold==0.)
{
- itkExceptionMacro(<<"Invalid Clamp Threshold must be greater than 0.0");
+ itkExceptionMacro(<<"Invalid Clamp Threshold must be greater than 0.0");
}
if (m_AutomaticInputMinMaxComputation)
diff --git a/Code/Common/otbAttributesMapLabelObject.h b/Code/Common/otbAttributesMapLabelObject.h
index 5b184c5006d2d8a2498b183cb306040a21f88543..836519ffe69a792c0b92e27d2401d71049c5c6f3 100644
--- a/Code/Common/otbAttributesMapLabelObject.h
+++ b/Code/Common/otbAttributesMapLabelObject.h
@@ -10,8 +10,8 @@ Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
See OTBCopyright.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,10 +30,10 @@ namespace Functor
/** \class AttributesMapLabelObjectAccessor
* \brief Allows to acces a given field of an AttributesMapLabelObject
- *
+ *
* The name of the attribute to retrieve can be set by using the
* SetAttributeName method.
- *
+ *
* \sa AttributesMapLabelObject
*/
template< class TLabelObject >
@@ -44,7 +44,7 @@ public:
typedef TLabelObject LabelObjectType;
typedef typename LabelObjectType::AttributesValueType AttributeValueType;
- /**
+ /**
* Please note that no exception catching is done here.
* \param labelObject The pointer to the label object
* \return The attribute value.
@@ -89,10 +89,10 @@ private:
*
*\sa LabelObject, ShapeLabelObject, StatisticsLabelObject
*
- * \ingroup DataRepresentation
+ * \ingroup DataRepresentation
*/
template < class TLabel, unsigned int VImageDimension, class TAttributesValue >
-class ITK_EXPORT AttributesMapLabelObject
+class ITK_EXPORT AttributesMapLabelObject
: public itk::LabelObject< TLabel, VImageDimension >
{
public:
@@ -162,7 +162,7 @@ public:
return m_Attributes.size();
}
- /**
+ /**
* Returns the list of available attributes
*/
std::vector<std::string> GetAvailableAttributes() const
@@ -201,7 +201,7 @@ protected:
Superclass::PrintSelf( os, indent );
os << indent << "Attributes: "<< std::endl;
for(AttributesMapConstIteratorType it = m_Attributes.begin();
- it!=m_Attributes.end();++it)
+ it!=m_Attributes.end();++it)
{
os<<indent<<indent<<it->first<<" = "<<it->second<<std::endl;
}
diff --git a/Code/Common/otbAttributesMapOpeningLabelMapFilter.h b/Code/Common/otbAttributesMapOpeningLabelMapFilter.h
index 0ecee3a86c5aabd8dfe586dc9f09d045fb49dd02..b0a11c609b6f82a5b17e0084012a5044675e1ce9 100644
--- a/Code/Common/otbAttributesMapOpeningLabelMapFilter.h
+++ b/Code/Common/otbAttributesMapOpeningLabelMapFilter.h
@@ -10,8 +10,8 @@ Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
See OTBCopyright.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.
=========================================================================*/
@@ -21,7 +21,7 @@ PURPOSE. See the above copyright notices for more information.
#include "otbAttributesMapLabelObject.h"
#include "itkAttributeOpeningLabelMapFilter.h"
-namespace otb
+namespace otb
{
/** \class AttributesMapOpeningLabelMapFilter
@@ -30,15 +30,15 @@ namespace otb
* This class extends the itk::AttributeOpeningLabelMapFilter to
* handle AttributesMapLabelObject. Thus it allows to perform openings
* for any kind of attributes in the attributes map.
- *
+ *
* \sa AttributeLabelObject, AttributeOpeningLabelMapFilter
*
* \ingroup ImageEnhancement MathematicalMorphologyImageFilters
*/
template<class TImage>
-class ITK_EXPORT AttributesMapOpeningLabelMapFilter
+class ITK_EXPORT AttributesMapOpeningLabelMapFilter
: public itk::AttributeOpeningLabelMapFilter<TImage,
- Functor::AttributesMapLabelObjectAccessor<typename TImage::LabelObjectType> >
+ Functor::AttributesMapLabelObjectAccessor<typename TImage::LabelObjectType> >
{
public:
/** Standard class typedefs. */
diff --git a/Code/Common/otbConfigurationFile.h b/Code/Common/otbConfigurationFile.h
index a102c5583da62bfee87add9c829969f63ad06957..ae5cf7c50f141e91c78b50d99d935608ff9296cb 100644
--- a/Code/Common/otbConfigurationFile.h
+++ b/Code/Common/otbConfigurationFile.h
@@ -31,7 +31,7 @@ namespace otb
* \brief Manage OTB ConfigurationFile file
*/
- class ConfigurationFile
+ class ConfigurationFile
: public itk::Object
{
public:
@@ -50,7 +50,7 @@ namespace otb
/** Get the unique instanc1e of the model */
// static Pointer GetInstance()
-// {
+// {
// if (!Instance)
// {
// Instance = Self::New();
@@ -67,14 +67,14 @@ namespace otb
{
return m_OTBConfig->read<std::string>( "LANG" );
};
-// std::string lib(OTB_CONFIG);
+// std::string lib(OTB_CONFIG);
protected:
/** Constructor */
ConfigurationFile(){
std::string OTBBinDir(OTB_CONFIG);
- m_OTBConfig = new ConfigFile(OTBBinDir + "/otb_config.inp");
+ m_OTBConfig = new ConfigFile(OTBBinDir + "/otb_config.inp");
}
;
/** Destructor */
diff --git a/Code/Common/otbDrawLineSpatialObjectListFilter.h b/Code/Common/otbDrawLineSpatialObjectListFilter.h
index 2f834ff67c0ef79e876f2139f12d8b4437177ac2..82c9e4db6ef1433328597dad0725b335cd3a4d2d 100644
--- a/Code/Common/otbDrawLineSpatialObjectListFilter.h
+++ b/Code/Common/otbDrawLineSpatialObjectListFilter.h
@@ -28,8 +28,8 @@ namespace otb
* \brief Composite filter which draw lines in an image.
*
* This class implements a composite filter that draws a list of lines in
- * an input Image. This class
- *
+ * an input Image. This class
+ *
*
*
*/
diff --git a/Code/Common/otbDrawLineSpatialObjectListFilter.txx b/Code/Common/otbDrawLineSpatialObjectListFilter.txx
index b6f89d8d39f763eb2f5cf7d0b4c6942e1be0a0fb..29fa838a2d735dfbad587da9e5a8eef7a50c8a6c 100644
--- a/Code/Common/otbDrawLineSpatialObjectListFilter.txx
+++ b/Code/Common/otbDrawLineSpatialObjectListFilter.txx
@@ -122,9 +122,9 @@ DrawLineSpatialObjectListFilter<TInputImage, TOutputImage>
this->CropRightSegment(&indexBeginLine,&indexEndLine, &outputRegionForThread);
}
- /**
- * If an extremity is under the region
- * Technically, the X component of the index is inside the image
+ /**
+ * If an extremity is under the region
+ * Technically, the X component of the index is inside the image
*/
if(this->IsDownsideTheImage(&indexBeginLine) && input->GetLargestPossibleRegion().IsInside(indexEndLine))
this->CropSegment(&indexBeginLine,&indexEndLine, &outputRegionForThread);
@@ -136,7 +136,7 @@ DrawLineSpatialObjectListFilter<TInputImage, TOutputImage>
/** If the segments are not in the region (upside or downside the region)*/
if(!(this->IsUpsideTheRegion(&indexBeginLine,&outputRegionForThread) && this->IsUpsideTheRegion(&indexEndLine,&outputRegionForThread)) &&
!(this->IsDownsideTheRegion(&indexBeginLine,&outputRegionForThread) && this->IsDownsideTheRegion(&indexEndLine,&outputRegionForThread)) &&
- !(this->IsColumnOutsideOfTheRegion(&indexBeginLine,&indexEndLine, &outputRegionForThread) && this->IsColumnOutsideOfTheRegion(&indexEndLine,&indexBeginLine,&outputRegionForThread))
+ !(this->IsColumnOutsideOfTheRegion(&indexBeginLine,&indexEndLine, &outputRegionForThread) && this->IsColumnOutsideOfTheRegion(&indexEndLine,&indexBeginLine,&outputRegionForThread))
)
{
@@ -231,7 +231,7 @@ DrawLineSpatialObjectListFilter<TInputImage, TOutput>
/**
- *
+ *
*
*/
template <class TInputImage, class TOutput>
@@ -246,7 +246,7 @@ DrawLineSpatialObjectListFilter<TInputImage, TOutput>
if ( ((*indexToCheck)[0]>=static_cast<OutputIndexValueType>(size[0])) && ((*otherToCheck)[0]>=static_cast<OutputIndexValueType>(size[0]) ))
res = true;
- if((*indexToCheck)[0]>=static_cast<OutputIndexValueType>(size[0]) && this->IsUpsideTheRegion(otherToCheck,outputRegionForThread))
+ if((*indexToCheck)[0]>=static_cast<OutputIndexValueType>(size[0]) && this->IsUpsideTheRegion(otherToCheck,outputRegionForThread))
res1 = true;
if((*indexToCheck)[0]>=static_cast<OutputIndexValueType>(size[0]) && this->IsDownsideTheRegion(otherToCheck,outputRegionForThread) )
@@ -292,7 +292,7 @@ DrawLineSpatialObjectListFilter<TInputImage, TOutput>
if( (*indexToCrop)[0] < (*otherIndex)[0])
lengthSegment = (*otherIndex)[1] -(*indexToCrop)[1];
- else
+ else
lengthSegment = (*indexToCrop)[1] -(*otherIndex)[1];
slope = lengthSegment/( tempOtherIndexX - static_cast<double>((*indexToCrop)[0]));
@@ -311,7 +311,7 @@ DrawLineSpatialObjectListFilter<TInputImage, TOutput>
double Y = static_cast<double>(m_Length-1)/*tstart[1]+size[1]-1*/;
tempIndex[1] = static_cast<OutputIndexValueType>(Y);
tempIndex[0] = static_cast<OutputIndexValueType>((Y-origin) / slope); // X = (Y-B)/A
- }
+ }
(*indexToCrop)[0] = tempIndex[0];
(*indexToCrop)[1] = tempIndex[1];
diff --git a/Code/Common/otbGISTable.h b/Code/Common/otbGISTable.h
index 62d9c96f2e833a20bbc0ba77ec442077e8ce1672..042ed41f00eef3033c06fa48069daffa4bcaf55d 100644
--- a/Code/Common/otbGISTable.h
+++ b/Code/Common/otbGISTable.h
@@ -30,7 +30,7 @@ namespace otb
/** \class GISTable
* \brief this class represents a table of a geospatial database (ie. PostGIS).
*
- *
+ *
* \sa GISTableFileReader
* \sa GISTableFileWriter
*
@@ -65,14 +65,14 @@ public:
typedef itk::Point<TPrecision , SpatialDimension > PointType;
typedef PolyLineParametricPathWithValue < TPrecision , SpatialDimension > LineType;
- typedef typename LineType::Pointer LinePointerType;
-
- typedef Polygon < TPrecision > PolygonType;
- typedef typename PolygonType::Pointer PolygonPointerType;
- typedef typename PolygonType::ConstPointer PolygonConstPointerType;
- typedef ObjectList< PolygonType > PolygonListType;
- typedef typename PolygonListType::Pointer PolygonListPointerType;
- typedef typename PolygonListType::ConstPointer PolygonListConstPointerType;
+ typedef typename LineType::Pointer LinePointerType;
+
+ typedef Polygon < TPrecision > PolygonType;
+ typedef typename PolygonType::Pointer PolygonPointerType;
+ typedef typename PolygonType::ConstPointer PolygonConstPointerType;
+ typedef ObjectList< PolygonType > PolygonListType;
+ typedef typename PolygonListType::Pointer PolygonListPointerType;
+ typedef typename PolygonListType::ConstPointer PolygonListConstPointerType;
/** Acessors */
//itkStaticConstMacro(GISDimension, unsigned int, SpatialDimension);
@@ -92,8 +92,8 @@ public:
/** Get attributes of the Table*/ //TODO implement
- /** Get srid of the geometric column*/ //TODO implement
- //virtual
+ /** Get srid of the geometric column*/ //TODO implement
+ //virtual
/** Add Point content to the GIS Table*/ //TODO implement
virtual void InsertPoint( const PointType &pt, const std::string & attribute = 0 ){};
virtual void InsertMultiPoint(){};
diff --git a/Code/Common/otbGISTableToLabelMapFilter.txx b/Code/Common/otbGISTableToLabelMapFilter.txx
index 72a239fbe5d96dc3895b30e754f8abe407b03fd4..39af4d905c5cf77f12f814cea2cb74ca6142bfe9 100644
--- a/Code/Common/otbGISTableToLabelMapFilter.txx
+++ b/Code/Common/otbGISTableToLabelMapFilter.txx
@@ -9,8 +9,8 @@
Copyright (c) Insight Software Consortium. All rights reserved.
See ITKCopyright.txt or http://www.itk.org/HTML/Copyright.htm 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.
=========================================================================*/
@@ -81,7 +81,7 @@ GISTableToLabelMapFilter<TGISTable, TLabelMap>
}
template<class TGISTable, class TLabelMap >
-void
+void
GISTableToLabelMapFilter<TGISTable, TLabelMap>
::GenerateInputRequestedRegion()
{/*
@@ -106,7 +106,7 @@ GISTableToLabelMapFilter<TGISTable, TLabelMap>
}
*/
-/**
+/**
* overloaded because pb during copyinformation
*/
template <class TGISTable, class TLabelMap >
diff --git a/Code/Common/otbGISTableToVectorDataFilter.txx b/Code/Common/otbGISTableToVectorDataFilter.txx
index 42a649325fedffbbd748c9155070175244d1b3d0..29dfd8715ca3c132ebe34a5ff0fb869b7159ff51 100644
--- a/Code/Common/otbGISTableToVectorDataFilter.txx
+++ b/Code/Common/otbGISTableToVectorDataFilter.txx
@@ -9,8 +9,8 @@
Copyright (c) Insight Software Consortium. All rights reserved.
See ITKCopyright.txt or http://www.itk.org/HTML/Copyright.htm 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.
=========================================================================*/
@@ -78,7 +78,7 @@ GISTableToVectorDataFilter<TGISTable, TVectorData>
}
template<class TGISTable, class TVectorData >
-void
+void
GISTableToVectorDataFilter<TGISTable, TVectorData>
::GenerateInputRequestedRegion()
{/*
@@ -118,12 +118,12 @@ GISTableToVectorDataFilter<TGISTable, TVectorData>
/**Create usual root elements of the output vectordata*/
// DataNodePointerType document = DataNodeType::New();
// DataNodePointerType folder1 = DataNodeType::New();
-//
+//
// document->SetNodeType(DOCUMENT);
// folder1->SetNodeType(FOLDER);
-//
+//
// DataNodePointerType root = output->GetDataTree()->GetRoot()->Get();
-//
+//
// output->GetDataTree()->Add(document,root);
// output->GetDataTree()->Add(folder1,document);
@@ -133,8 +133,8 @@ GISTableToVectorDataFilter<TGISTable, TVectorData>
const std::string inputOGRConnStr=input->GetOGRStrConnection();
//Try if the Db is readable
// std::cout << "ogr connection: " << inputOGRConnStr[0] << std::endl;
- if ( gisReader->CanReadFile( inputOGRConnStr.data() ) )
- {
+ if ( gisReader->CanReadFile( inputOGRConnStr.data() ) )
+ {
//Read GISTable data and copy in the output VectorData
gisReader->SetFileName(inputOGRConnStr);
diff --git a/Code/Common/otbLabelMapToGISTableFilter.txx b/Code/Common/otbLabelMapToGISTableFilter.txx
index 145cf62d5849fcc56106cc6af227748517477b86..f7f04cb2e6666066bf7fc4394ad3fefbd8a1fc93 100644
--- a/Code/Common/otbLabelMapToGISTableFilter.txx
+++ b/Code/Common/otbLabelMapToGISTableFilter.txx
@@ -9,8 +9,8 @@
Copyright (c) Insight Software Consortium. All rights reserved.
See ITKCopyright.txt or http://www.itk.org/HTML/Copyright.htm 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.
=========================================================================*/
@@ -34,7 +34,7 @@ LabelMapToGISTableFilter< TLabelMap, TGISTable >
m_DropExistingGISTable = false;
//default value of the gis table name
m_GISTableName = "labelmap_to_gis_table";
-}
+}
@@ -82,7 +82,7 @@ LabelMapToGISTableFilter< TLabelMap, TGISTable >
}
template<class TLabelMap , class TGISTable>
-void
+void
LabelMapToGISTableFilter< TLabelMap, TGISTable >
::GenerateInputRequestedRegion()
{/*
@@ -99,7 +99,7 @@ LabelMapToGISTableFilter< TLabelMap, TGISTable >
/*Distance: 5.19615
-> Test EXIT SUCCESS.
template<class TInputImage, class TLabelMap >
-void
+void
LabelMapToLabelMapFilter<TInputImage, TLabelMap>
::EnlargeOutputRequestedRegion(DataObject *)
{
@@ -136,7 +136,7 @@ LabelMapToGISTableFilter< TLabelMap, TGISTable >
FunctorType functor;
// SimplifyFunctorType simplifyFunctor;
// simplifyFunctor.SetTolerance (0.0);
-//
+//
// CloseFunctorType closeFunctor;
CorrectFunctorType correctFunctor;
@@ -159,12 +159,12 @@ LabelMapToGISTableFilter< TLabelMap, TGISTable >
//std::cout << "polygon : " << polygon << std::endl;
//Simply polygon (erase aligned points)
-// PolygonPointerType simplifyPolygon = simplifyFunctor(polygon);
+// PolygonPointerType simplifyPolygon = simplifyFunctor(polygon);
//std::cout << "simplify polygon : " << simplifyPolygon << std::endl;
//Close polygon if necessary
-// PolygonPointerType closePolygon = closeFunctor(simplifyPolygon);
- PolygonPointerType correctPolygon = correctFunctor(polygon);
+// PolygonPointerType closePolygon = closeFunctor(simplifyPolygon);
+ PolygonPointerType correctPolygon = correctFunctor(polygon);
//std::cout << "simplify polygon : " << closePolygon << std::endl;
this->GetOutput()->InsertPolygons( static_cast<typename TGISTable::PolygonConstPointerType> (correctPolygon), static_cast<typename TGISTable::PolygonListConstPointerType> (0), oss.str());
diff --git a/Code/Common/otbLabelMapToVectorDataFilter.txx b/Code/Common/otbLabelMapToVectorDataFilter.txx
index 13ae9df7a67ec1a5ed91190e34ea08c170bc41de..10ed8e1484ed6dbc4015d4c1746ac6bdb3897282 100644
--- a/Code/Common/otbLabelMapToVectorDataFilter.txx
+++ b/Code/Common/otbLabelMapToVectorDataFilter.txx
@@ -9,8 +9,8 @@
Copyright (c) Insight Software Consortium. All rights reserved.
See ITKCopyright.txt or http://www.itk.org/HTML/Copyright.htm 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.
=========================================================================*/
@@ -74,7 +74,7 @@ LabelMapToVectorDataFilter<TLabelMap, TVectorData>
}
template<class TLabelMap, class TVectorData >
-void
+void
LabelMapToVectorDataFilter<TLabelMap, TVectorData>
::GenerateInputRequestedRegion()
{/*
@@ -90,7 +90,7 @@ LabelMapToVectorDataFilter<TLabelMap, TVectorData>
/*
template<class TInputImage, class TVectorData >
-void
+void
LabelMapToVectorDataFilter<TInputImage, TVectorData>
::EnlargeOutputRequestedRegion(DataObject *)
{
@@ -141,7 +141,7 @@ void
typename PolygonType::Pointer polygon = functor(labelObject);
/** Erase aligned points*/
-// PolygonPointerType simplifyPolygon = simplifyFunctor(polygon);
+// PolygonPointerType simplifyPolygon = simplifyFunctor(polygon);
/**Close polygon if necessary*/
diff --git a/Code/Common/otbLabelObjectToPolygonFunctor.h b/Code/Common/otbLabelObjectToPolygonFunctor.h
index a1c650341e2831ff6aa7ecf015160c688592fd86..67e0f175d21cbf2421537d7ed3fa765ab28a6ace 100644
--- a/Code/Common/otbLabelObjectToPolygonFunctor.h
+++ b/Code/Common/otbLabelObjectToPolygonFunctor.h
@@ -10,8 +10,8 @@ Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
See OTBCopyright.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.
=========================================================================*/
@@ -20,16 +20,16 @@ PURPOSE. See the above copyright notices for more information.
#include <vector>
-//TODO change this include have to define from what inherate this class
+//TODO change this include have to define from what inherate this class
#include "otbPolyLineParametricPathWithValue.h" //for vcl_abs
-namespace otb
+namespace otb
{
namespace Functor
{
-/** \class LabelObjectToPolygonFunctor
+/** \class LabelObjectToPolygonFunctor
* \brief This class vectorizes a LabelObject to a Polygon.
*
* The algorithm follows a finite states machine described in the
@@ -43,13 +43,13 @@ namespace Functor
* ensure ordered RLE), and the finite states machine tracks the edge
* following 8 canonical states given by the configuration of two
* consecutive raws of lines.
- *
+ *
* Iterations are done until convergence which is guaranteed to
* happen.
*
* Please be aware that this functor is not thread-safe.
*
- */
+ */
template <class TLabelObject, class TPolygon >
class LabelObjectToPolygonFunctor
{
@@ -81,7 +81,7 @@ private:
/// Compare two line in the lexicographical order
static bool LexicographicalLineCompare(const LineType & l1, const LineType & l2);
- /// Check if the given run index (index in line,line) is valid
+ /// Check if the given run index (index in line,line) is valid
inline bool IsRunIndexValid(const IndexType & index) const;
/// Check if the point lies within the range of the line
diff --git a/Code/Common/otbLabelObjectToPolygonFunctor.txx b/Code/Common/otbLabelObjectToPolygonFunctor.txx
index da2dde0572f941c5e4dac689b8e3d46a1215994e..e2b3d2df803ae6feeee421efe8aef59bae56bddd 100644
--- a/Code/Common/otbLabelObjectToPolygonFunctor.txx
+++ b/Code/Common/otbLabelObjectToPolygonFunctor.txx
@@ -37,7 +37,7 @@ LabelObjectToPolygonFunctor<TLabelObject,TPolygon>
bool resp = l2.GetIndex()[1]> l1.GetIndex()[1];
resp = resp
|| (l2.GetIndex()[1] == l1.GetIndex()[1]
- && (l1.GetIndex()[0]+ static_cast<long>(l1.GetLength())) < l2.GetIndex()[0]);
+ && (l1.GetIndex()[0]+ static_cast<long>(l1.GetLength())) < l2.GetIndex()[0]);
return resp;
}
@@ -103,217 +103,217 @@ LabelObjectToPolygonFunctor<TLabelObject,TPolygon>
while(goesOn)
{
switch(m_CurrentState)
- {
- case UP_RIGHT:
- {
- // First candidate run
- IndexType firstCandidateRun = Within(m_CurrentPoint,m_CurrentLine-1);
- if(IsRunIndexValid(firstCandidateRun))
- {
- // Second candidate run
- IndexType secondCandidateRun = RightMostLeftEndInside(m_CurrentLine,RightEnd(m_CurrentRun),firstCandidateRun);
- if(IsRunIndexValid(secondCandidateRun))
- {
- // Down-Right case
- m_CurrentRun = secondCandidateRun;
- m_CurrentState = DOWN_RIGHT;
- m_PositionFlag = LEFT_END;
- WalkRight(m_CurrentLine-1,m_CurrentPoint,LeftEnd(m_CurrentRun),polygon, m_CurrentState);
-
- }
- else
- {
- // Up-Right case
- m_CurrentLine--;
- m_CurrentRun = firstCandidateRun;
- m_CurrentState = UP_RIGHT;
- m_PositionFlag = RIGHT_END;
- WalkRight(m_CurrentLine,m_CurrentPoint,RightEnd(m_CurrentRun),polygon, m_CurrentState);
-
- }
- }
- else
- {
- IndexType secondCandidateRun = LeftMostRightEndInside(m_CurrentLine-1,RightEnd(m_CurrentRun),m_CurrentRun);
-
- if(IsRunIndexValid(secondCandidateRun))
- {
- // Up-Left Case
- m_CurrentState = UP_LEFT;
- m_PositionFlag = RIGHT_END;
- WalkLeft(m_CurrentLine,m_CurrentPoint,RightEnd(secondCandidateRun),polygon, m_CurrentState);
- m_CurrentLine--;
- m_CurrentRun = secondCandidateRun;
- }
- else
- {
- // Down-Left case
- m_CurrentState = DOWN_LEFT;
- m_PositionFlag = LEFT_END;
- WalkLeft(m_CurrentLine,m_CurrentPoint,LeftEnd(m_CurrentRun),polygon, m_CurrentState);
- }
- }
- break;
- }
- case DOWN_LEFT:
- {
- // First candidate run
- IndexType firstCandidateRun = Within(m_CurrentPoint,m_CurrentLine+1);
-
- if(IsRunIndexValid(firstCandidateRun))
- {
- // Second candidate run
- IndexType secondCandidateRun = LeftMostRightEndInside(m_CurrentLine,LeftEnd(m_CurrentRun),firstCandidateRun);
-
- if(IsRunIndexValid(secondCandidateRun))
- {
- // Up-Left case
- m_CurrentRun = secondCandidateRun;
- m_CurrentState = UP_LEFT;
- m_PositionFlag = RIGHT_END;
- WalkLeft(m_CurrentLine+1,m_CurrentPoint,RightEnd(m_CurrentRun),polygon, m_CurrentState);
- }
- else
- {
- // Down-Left case
- m_CurrentLine++;
- m_CurrentRun = firstCandidateRun;
- m_CurrentState = DOWN_LEFT;
- m_PositionFlag = LEFT_END;
- WalkLeft(m_CurrentLine,m_CurrentPoint,LeftEnd(m_CurrentRun),polygon, m_CurrentState);
-
- }
- }
- else
- {
- IndexType secondCandidateRun = RightMostLeftEndInside(m_CurrentLine+1,LeftEnd(m_CurrentRun),m_CurrentRun);
-
- if(IsRunIndexValid(secondCandidateRun))
- {
- // Down-Right case
- m_CurrentRun = secondCandidateRun;
- m_CurrentLine++;
- m_CurrentState = DOWN_RIGHT;
- m_PositionFlag = LEFT_END;
- WalkRight(m_CurrentLine,m_CurrentPoint,LeftEnd(m_CurrentRun),polygon, m_CurrentState);
-
- }
- else
- {
- // Up-Right case
- m_CurrentState = UP_RIGHT;
- m_PositionFlag = RIGHT_END;
- WalkRight(m_CurrentLine,m_CurrentPoint,RightEnd(m_CurrentRun),polygon, m_CurrentState);
-
- }
- }
- break;
- }
- case DOWN_RIGHT:
- {
- IndexType firstCandidateRun = Within(m_CurrentPoint,m_CurrentLine+1);
-
- if(IsRunIndexValid(firstCandidateRun))
- {
- IndexType secondCandidateRun = LeftMostRightEndInside(m_CurrentLine,RightEnd(m_CurrentRun),firstCandidateRun);
-
- if(IsRunIndexValid(secondCandidateRun))
- {
- // Up-Left case
- m_CurrentState = UP_LEFT;
- m_PositionFlag = RIGHT_END;
- m_CurrentRun = secondCandidateRun;
- WalkLeft(m_CurrentLine+1,m_CurrentPoint,RightEnd(m_CurrentRun),polygon, m_CurrentState);
-
- }
- else
- {
- // Down-Left case
- m_CurrentLine++;
- m_CurrentRun = firstCandidateRun;
- m_CurrentState = DOWN_LEFT;
- m_PositionFlag = LEFT_END;
- WalkLeft(m_CurrentLine,m_CurrentPoint,LeftEnd(m_CurrentRun),polygon, m_CurrentState);
-
- }
- }
- else
- {
- IndexType secondCandidateRun = RightMostLeftEndInside(m_CurrentLine+1,LeftEnd(m_CurrentRun),m_CurrentRun);
-
- if(IsRunIndexValid(secondCandidateRun))
- {
- // Down-Right case
- m_CurrentLine++;
- m_CurrentRun = secondCandidateRun;
- m_CurrentState = DOWN_RIGHT;
- m_PositionFlag = LEFT_END;
- WalkRight(m_CurrentLine,m_CurrentPoint,LeftEnd(m_CurrentRun),polygon, m_CurrentState);
- }
- else
- {
- // Up-Right case
- m_CurrentState = UP_RIGHT;
- m_PositionFlag = RIGHT_END;
- WalkRight(m_CurrentLine,m_CurrentPoint,RightEnd(m_CurrentRun),polygon, m_CurrentState);
-
- }
- }
- break;
- }
- case UP_LEFT:
- {
- IndexType firstCandidateRun = Within(m_CurrentPoint,m_CurrentLine-1);
-
- if(IsRunIndexValid(firstCandidateRun))
- {
- IndexType secondCandidateRun = RightMostLeftEndInside(m_CurrentLine,LeftEnd(m_CurrentRun),firstCandidateRun);
-
- if(IsRunIndexValid(secondCandidateRun))
- {
- // Down-Right case
- m_CurrentRun = secondCandidateRun;
- m_CurrentState = DOWN_RIGHT;
- m_PositionFlag = LEFT_END;
- WalkRight(m_CurrentLine-1,m_CurrentPoint,LeftEnd(m_CurrentRun),polygon, m_CurrentState);
-
- }
- else
- {
- // Up-Right case
- m_CurrentLine--;
- m_CurrentRun = firstCandidateRun;
- m_CurrentState = UP_RIGHT;
- m_PositionFlag = RIGHT_END;
- WalkRight(m_CurrentLine,m_CurrentPoint,RightEnd(m_CurrentRun),polygon, m_CurrentState);
- }
- }
- else
- {
- IndexType secondCandidateRun = LeftMostRightEndInside(m_CurrentLine-1,RightEnd(m_CurrentRun),m_CurrentRun);
-
- if(IsRunIndexValid(secondCandidateRun))
- {
- // Up-Left case
- m_CurrentState = UP_LEFT;
- m_PositionFlag = RIGHT_END;
- WalkLeft(m_CurrentLine,m_CurrentPoint,RightEnd(secondCandidateRun),polygon, m_CurrentState);
- m_CurrentLine--;
- m_CurrentRun = secondCandidateRun;
-
- }
- else
- {
- // Down-Left case
- m_CurrentState = DOWN_LEFT;
- m_PositionFlag = LEFT_END;
- WalkLeft(m_CurrentLine,m_CurrentPoint,LeftEnd(m_CurrentRun),polygon, m_CurrentState);
-
- }
- }
- break;
- }
- }
+ {
+ case UP_RIGHT:
+ {
+ // First candidate run
+ IndexType firstCandidateRun = Within(m_CurrentPoint,m_CurrentLine-1);
+ if(IsRunIndexValid(firstCandidateRun))
+ {
+ // Second candidate run
+ IndexType secondCandidateRun = RightMostLeftEndInside(m_CurrentLine,RightEnd(m_CurrentRun),firstCandidateRun);
+ if(IsRunIndexValid(secondCandidateRun))
+ {
+ // Down-Right case
+ m_CurrentRun = secondCandidateRun;
+ m_CurrentState = DOWN_RIGHT;
+ m_PositionFlag = LEFT_END;
+ WalkRight(m_CurrentLine-1,m_CurrentPoint,LeftEnd(m_CurrentRun),polygon, m_CurrentState);
+
+ }
+ else
+ {
+ // Up-Right case
+ m_CurrentLine--;
+ m_CurrentRun = firstCandidateRun;
+ m_CurrentState = UP_RIGHT;
+ m_PositionFlag = RIGHT_END;
+ WalkRight(m_CurrentLine,m_CurrentPoint,RightEnd(m_CurrentRun),polygon, m_CurrentState);
+
+ }
+ }
+ else
+ {
+ IndexType secondCandidateRun = LeftMostRightEndInside(m_CurrentLine-1,RightEnd(m_CurrentRun),m_CurrentRun);
+
+ if(IsRunIndexValid(secondCandidateRun))
+ {
+ // Up-Left Case
+ m_CurrentState = UP_LEFT;
+ m_PositionFlag = RIGHT_END;
+ WalkLeft(m_CurrentLine,m_CurrentPoint,RightEnd(secondCandidateRun),polygon, m_CurrentState);
+ m_CurrentLine--;
+ m_CurrentRun = secondCandidateRun;
+ }
+ else
+ {
+ // Down-Left case
+ m_CurrentState = DOWN_LEFT;
+ m_PositionFlag = LEFT_END;
+ WalkLeft(m_CurrentLine,m_CurrentPoint,LeftEnd(m_CurrentRun),polygon, m_CurrentState);
+ }
+ }
+ break;
+ }
+ case DOWN_LEFT:
+ {
+ // First candidate run
+ IndexType firstCandidateRun = Within(m_CurrentPoint,m_CurrentLine+1);
+
+ if(IsRunIndexValid(firstCandidateRun))
+ {
+ // Second candidate run
+ IndexType secondCandidateRun = LeftMostRightEndInside(m_CurrentLine,LeftEnd(m_CurrentRun),firstCandidateRun);
+
+ if(IsRunIndexValid(secondCandidateRun))
+ {
+ // Up-Left case
+ m_CurrentRun = secondCandidateRun;
+ m_CurrentState = UP_LEFT;
+ m_PositionFlag = RIGHT_END;
+ WalkLeft(m_CurrentLine+1,m_CurrentPoint,RightEnd(m_CurrentRun),polygon, m_CurrentState);
+ }
+ else
+ {
+ // Down-Left case
+ m_CurrentLine++;
+ m_CurrentRun = firstCandidateRun;
+ m_CurrentState = DOWN_LEFT;
+ m_PositionFlag = LEFT_END;
+ WalkLeft(m_CurrentLine,m_CurrentPoint,LeftEnd(m_CurrentRun),polygon, m_CurrentState);
+
+ }
+ }
+ else
+ {
+ IndexType secondCandidateRun = RightMostLeftEndInside(m_CurrentLine+1,LeftEnd(m_CurrentRun),m_CurrentRun);
+
+ if(IsRunIndexValid(secondCandidateRun))
+ {
+ // Down-Right case
+ m_CurrentRun = secondCandidateRun;
+ m_CurrentLine++;
+ m_CurrentState = DOWN_RIGHT;
+ m_PositionFlag = LEFT_END;
+ WalkRight(m_CurrentLine,m_CurrentPoint,LeftEnd(m_CurrentRun),polygon, m_CurrentState);
+
+ }
+ else
+ {
+ // Up-Right case
+ m_CurrentState = UP_RIGHT;
+ m_PositionFlag = RIGHT_END;
+ WalkRight(m_CurrentLine,m_CurrentPoint,RightEnd(m_CurrentRun),polygon, m_CurrentState);
+
+ }
+ }
+ break;
+ }
+ case DOWN_RIGHT:
+ {
+ IndexType firstCandidateRun = Within(m_CurrentPoint,m_CurrentLine+1);
+
+ if(IsRunIndexValid(firstCandidateRun))
+ {
+ IndexType secondCandidateRun = LeftMostRightEndInside(m_CurrentLine,RightEnd(m_CurrentRun),firstCandidateRun);
+
+ if(IsRunIndexValid(secondCandidateRun))
+ {
+ // Up-Left case
+ m_CurrentState = UP_LEFT;
+ m_PositionFlag = RIGHT_END;
+ m_CurrentRun = secondCandidateRun;
+ WalkLeft(m_CurrentLine+1,m_CurrentPoint,RightEnd(m_CurrentRun),polygon, m_CurrentState);
+
+ }
+ else
+ {
+ // Down-Left case
+ m_CurrentLine++;
+ m_CurrentRun = firstCandidateRun;
+ m_CurrentState = DOWN_LEFT;
+ m_PositionFlag = LEFT_END;
+ WalkLeft(m_CurrentLine,m_CurrentPoint,LeftEnd(m_CurrentRun),polygon, m_CurrentState);
+
+ }
+ }
+ else
+ {
+ IndexType secondCandidateRun = RightMostLeftEndInside(m_CurrentLine+1,LeftEnd(m_CurrentRun),m_CurrentRun);
+
+ if(IsRunIndexValid(secondCandidateRun))
+ {
+ // Down-Right case
+ m_CurrentLine++;
+ m_CurrentRun = secondCandidateRun;
+ m_CurrentState = DOWN_RIGHT;
+ m_PositionFlag = LEFT_END;
+ WalkRight(m_CurrentLine,m_CurrentPoint,LeftEnd(m_CurrentRun),polygon, m_CurrentState);
+ }
+ else
+ {
+ // Up-Right case
+ m_CurrentState = UP_RIGHT;
+ m_PositionFlag = RIGHT_END;
+ WalkRight(m_CurrentLine,m_CurrentPoint,RightEnd(m_CurrentRun),polygon, m_CurrentState);
+
+ }
+ }
+ break;
+ }
+ case UP_LEFT:
+ {
+ IndexType firstCandidateRun = Within(m_CurrentPoint,m_CurrentLine-1);
+
+ if(IsRunIndexValid(firstCandidateRun))
+ {
+ IndexType secondCandidateRun = RightMostLeftEndInside(m_CurrentLine,LeftEnd(m_CurrentRun),firstCandidateRun);
+
+ if(IsRunIndexValid(secondCandidateRun))
+ {
+ // Down-Right case
+ m_CurrentRun = secondCandidateRun;
+ m_CurrentState = DOWN_RIGHT;
+ m_PositionFlag = LEFT_END;
+ WalkRight(m_CurrentLine-1,m_CurrentPoint,LeftEnd(m_CurrentRun),polygon, m_CurrentState);
+
+ }
+ else
+ {
+ // Up-Right case
+ m_CurrentLine--;
+ m_CurrentRun = firstCandidateRun;
+ m_CurrentState = UP_RIGHT;
+ m_PositionFlag = RIGHT_END;
+ WalkRight(m_CurrentLine,m_CurrentPoint,RightEnd(m_CurrentRun),polygon, m_CurrentState);
+ }
+ }
+ else
+ {
+ IndexType secondCandidateRun = LeftMostRightEndInside(m_CurrentLine-1,RightEnd(m_CurrentRun),m_CurrentRun);
+
+ if(IsRunIndexValid(secondCandidateRun))
+ {
+ // Up-Left case
+ m_CurrentState = UP_LEFT;
+ m_PositionFlag = RIGHT_END;
+ WalkLeft(m_CurrentLine,m_CurrentPoint,RightEnd(secondCandidateRun),polygon, m_CurrentState);
+ m_CurrentLine--;
+ m_CurrentRun = secondCandidateRun;
+
+ }
+ else
+ {
+ // Down-Left case
+ m_CurrentState = DOWN_LEFT;
+ m_PositionFlag = LEFT_END;
+ WalkLeft(m_CurrentLine,m_CurrentPoint,LeftEnd(m_CurrentRun),polygon, m_CurrentState);
+
+ }
+ }
+ break;
+ }
+ }
goesOn = m_CurrentPoint != m_StartingPoint;
}
@@ -350,12 +350,12 @@ LabelObjectToPolygonFunctor<TLabelObject,TPolygon>
switch(m_PositionFlag)
{
case LEFT_END:
- rightoffset=1;
- break;
+ rightoffset=1;
+ break;
case RIGHT_END:
- leftoffset=-1;
- break;
+ leftoffset=-1;
+ break;
}
typename RunsPerLineType::iterator it = m_InternalDataSet.at(line).begin();
@@ -364,9 +364,9 @@ LabelObjectToPolygonFunctor<TLabelObject,TPolygon>
while(resp[0] < 0 && it!= m_InternalDataSet.at(line).end())
{
if( point[0]>=(it->GetIndex()[0])+leftoffset && point[0]<(it->GetIndex()[0]+static_cast<long>(it->GetLength()))+rightoffset)
- {
- resp[0]=idx;
- }
+ {
+ resp[0]=idx;
+ }
++idx;
++it;
}
@@ -418,14 +418,14 @@ LabelObjectToPolygonFunctor<TLabelObject,TPolygon>
{
/// Index is a the right of point
if(it->GetIndex()[0] > point[0]
- /// Index is inside run range
- && it->GetIndex()[0]-1 >= lrun.GetIndex()[0]
- && it->GetIndex()[0]-1 < lrun.GetIndex()[0]+ static_cast<long>(lrun.GetLength()))
- {
- resp[0]=idx;
- }
- ++idx;
- ++it;
+ /// Index is inside run range
+ && it->GetIndex()[0]-1 >= lrun.GetIndex()[0]
+ && it->GetIndex()[0]-1 < lrun.GetIndex()[0]+ static_cast<long>(lrun.GetLength()))
+ {
+ resp[0]=idx;
+ }
+ ++idx;
+ ++it;
}
return resp;
}
@@ -455,14 +455,14 @@ LabelObjectToPolygonFunctor<TLabelObject,TPolygon>
{
/// Index is a the left of point
if(it->GetIndex()[0] + static_cast<long>(it->GetLength()) <= point[0]
- /// right end is inside run range
- && it->GetIndex()[0]+ static_cast<long>(it->GetLength()) >= lrun.GetIndex()[0]
- && it->GetIndex()[0]+ static_cast<long>(it->GetLength()) < lrun.GetIndex()[0]+ static_cast<long>(lrun.GetLength()))
- {
- resp[0]=idx;
- }
- --idx;
- ++it;
+ /// right end is inside run range
+ && it->GetIndex()[0]+ static_cast<long>(it->GetLength()) >= lrun.GetIndex()[0]
+ && it->GetIndex()[0]+ static_cast<long>(it->GetLength()) < lrun.GetIndex()[0]+ static_cast<long>(lrun.GetLength()))
+ {
+ resp[0]=idx;
+ }
+ --idx;
+ ++it;
}
return resp;
}
@@ -479,27 +479,27 @@ LabelObjectToPolygonFunctor<TLabelObject,TPolygon>
switch(state)
{
case UP_RIGHT:
- offset[1]=1;
- break;
+ offset[1]=1;
+ break;
case UP_LEFT:
- offset[1]=1;
- break;
+ offset[1]=1;
+ break;
case DOWN_RIGHT:
- offset[1]=0;
- break;
+ offset[1]=0;
+ break;
case DOWN_LEFT:
- offset[1]=0;
- break;
+ offset[1]=0;
+ break;
}
switch(m_PositionFlag)
{
case LEFT_END:
- offset[0] = 0;
- break;
+ offset[0] = 0;
+ break;
case RIGHT_END:
- offset[0]=1;
- break;
+ offset[0]=1;
+ break;
}
typename PolygonType::VertexType newPoint;
@@ -545,21 +545,21 @@ LabelObjectToPolygonFunctor<TLabelObject,TPolygon>
switch(state)
{
case UP_RIGHT:
- offset[0]=1;
- offset[1]=1;
- break;
+ offset[0]=1;
+ offset[1]=1;
+ break;
case UP_LEFT:
- offset[0]=0;
- offset[1]=1;
- break;
+ offset[0]=0;
+ offset[1]=1;
+ break;
case DOWN_RIGHT:
- offset[0]=1;
- offset[1]=0;
- break;
+ offset[0]=1;
+ offset[1]=0;
+ break;
case DOWN_LEFT:
- offset[0]=0;
- offset[1]=0;
- break;
+ offset[0]=0;
+ offset[1]=0;
+ break;
}
typename PolygonType::VertexType newPoint;
diff --git a/Code/Common/otbMath.h b/Code/Common/otbMath.h
index 0e7aa4ac14f33b60c73252e6c9fa3e0d0a9d38ff..063af5b36bcbb4261f99fc19e9827a80238f2f2f 100644
--- a/Code/Common/otbMath.h
+++ b/Code/Common/otbMath.h
@@ -76,8 +76,8 @@ const long double CONST_PI_8l = 0.3926990816987241548078304229099379L; /* p
const long double CONST_2_PIl = 0.6366197723675813430755350534900574L; /* 2/pi */
const long double CONST_2_SQRTPIl = 1.1283791670955125738961589031215452L; /* 2/sqrt(pi) */
const long double CONST_2PIl = 6.2831853071795864769252867665590058L; /* 2*pi */
-const long double CONST_PI_180l = 0.0174532925199432957692369076848861L; /* pi/180 */
-const long double CONST_180_PIl = 57.295779513082320876798154814105170L; /* 180/pi */
+const long double CONST_PI_180l = 0.0174532925199432957692369076848861L; /* pi/180 */
+const long double CONST_180_PIl = 57.295779513082320876798154814105170L; /* 180/pi */
const long double CONST_LNPIl = std::log(CONST_PIl); /* ln(pi)*/
const long double CONST_SQRTPIl = std::sqrt(CONST_PIl); /* sqrt(pi)*/
const long double CONST_SQRT2l = 1.4142135623730950488016887242096981L; /* sqrt(2) */
diff --git a/Code/Common/otbPostGISConnectionImplementation.h b/Code/Common/otbPostGISConnectionImplementation.h
index c9ab72a75c143918173053622b8f11f298442197..4f6e860116ab46b9ee92c7b596bb2d9b25acd83f 100644
--- a/Code/Common/otbPostGISConnectionImplementation.h
+++ b/Code/Common/otbPostGISConnectionImplementation.h
@@ -27,7 +27,7 @@ namespace otb
/** \class PostGISConnectionImplementation
* \brief this class represents a connection to a PostGIS data base.
*
- *
+ *
*
*/
diff --git a/Code/Common/otbPostGISTable.h b/Code/Common/otbPostGISTable.h
index 146341fdc30c733627fa7c40f83e739ca9243ebe..c9a7ccac1e6aa25b06f52ebee8351fba7efa2695 100644
--- a/Code/Common/otbPostGISTable.h
+++ b/Code/Common/otbPostGISTable.h
@@ -25,8 +25,8 @@ namespace otb
{
/** \class PostGISTable
* \brief this class represents a table of a geospatial database (PostGIS).
- *
- *
+ *
+ *
* \sa GISTableFileReader
* \sa GISTableFileWriter
*
@@ -54,13 +54,13 @@ public:
typedef typename ConnectionType::Pointer ConnectionPointerType;
typedef itk::Point<TPrecision , SpatialDimension > PointType;
typedef PolyLineParametricPathWithValue < TPrecision , SpatialDimension > LineType;
- typedef typename LineType::Pointer LinePointerType;
- typedef Polygon < TPrecision > PolygonType;
- typedef typename PolygonType::Pointer PolygonPointerType;
- typedef typename PolygonType::ConstPointer PolygonConstPointerType;
- typedef ObjectList< PolygonType > PolygonListType;
- typedef typename PolygonListType::Pointer PolygonListPointerType;
- typedef typename PolygonListType::ConstPointer PolygonListConstPointerType;
+ typedef typename LineType::Pointer LinePointerType;
+ typedef Polygon < TPrecision > PolygonType;
+ typedef typename PolygonType::Pointer PolygonPointerType;
+ typedef typename PolygonType::ConstPointer PolygonConstPointerType;
+ typedef ObjectList< PolygonType > PolygonListType;
+ typedef typename PolygonListType::Pointer PolygonListPointerType;
+ typedef typename PolygonListType::ConstPointer PolygonListConstPointerType;
/** typedefs for correct polygon */
typedef otb::CorrectPolygonFunctor<PolygonType> CorrectFunctorType;
@@ -80,8 +80,8 @@ public:
/** Get attributes of the Table*/ //TODO implement
- /** Get srid of the geometric column*/ //TODO implement
- //virtual
+ /** Get srid of the geometric column*/ //TODO implement
+ //virtual
/** Init basic SQL command*/
void InsertBegin( std::stringstream & sqlCmd );
/** Add Point content to the GIS Table*/
diff --git a/Code/Common/otbPostGISTable.txx b/Code/Common/otbPostGISTable.txx
index df470d65748c54183a0ee7e5672f9e8250278b07..92634ac7f66f6ba307067060cf4fceb1e9a3fa72 100644
--- a/Code/Common/otbPostGISTable.txx
+++ b/Code/Common/otbPostGISTable.txx
@@ -36,7 +36,7 @@ namespace otb
template <class TConnectionImplementation, class TPrecision, unsigned int SpatialDimension>
PostGISTable<TConnectionImplementation, TPrecision, SpatialDimension>
- ::PostGISTable()
+ ::PostGISTable()
{
m_Connection = ConnectionType::New();
this->SetSrid(-1);
@@ -110,9 +110,9 @@ template <class TConnectionImplementation, class TPrecision, unsigned int Spatia
{
for (uint i=0 ; i < SpatialDimension ; i++)
{
- sqlCmd << itVertex.Value()[i] << " ";
+ sqlCmd << itVertex.Value()[i] << " ";
++itVertex;
- }
+ }
sqlCmd << ",";
}
//Erase the last ','
@@ -151,9 +151,9 @@ PostGISTable<TConnectionImplementation, TPrecision, SpatialDimension>
//std::cout << "vertex: " << itVertex.Value()<< std::endl;
for (uint i=0 ; i < SpatialDimension ; ++i)
{
- sqlCmd << itVertex.Value()[i] << " ";
+ sqlCmd << itVertex.Value()[i] << " ";
//++itVertex;
- }
+ }
sqlCmd << ",";
++itVertex;
}
@@ -163,13 +163,13 @@ PostGISTable<TConnectionImplementation, TPrecision, SpatialDimension>
//std::cout << "apres arase " << sqlCmd.str() << std::endl;
sqlCmd << "),";
//std::cout << "ext polygon: " << sqlCmd.str() << std::endl;
- //Add interior polygons
+ //Add interior polygons
if ( !polygonListInteriorRing.IsNull() )
{
//get holes
//sqlCmd << ",";
- typedef typename PolygonListType::ConstIterator PolygonListConstIteratorType;
+ typedef typename PolygonListType::ConstIterator PolygonListConstIteratorType;
for (PolygonListConstIteratorType itPolygonList = polygonListInteriorRing->Begin();itPolygonList!=polygonListInteriorRing->End();++itPolygonList)
{
/** correct current polygon interior ring */
@@ -186,7 +186,7 @@ PostGISTable<TConnectionImplementation, TPrecision, SpatialDimension>
{
sqlCmd << itVertex.Value()[i] << " ";
++itVertex;
- }
+ }
sqlCmd << ",";
++itVertex;
}
@@ -217,11 +217,11 @@ PostGISTable<TConnectionImplementation, TPrecision, SpatialDimension>
::InsertGeometries (const std::string &sqlCmd )
{
typedef otb::PostGISFromStringTransactor TransactorType;
- TransactorType myStringTransactor;
+ TransactorType myStringTransactor;
//std::cout << "transactor string" << sqlCmd<< std::endl;
myStringTransactor.SetTransactionString( sqlCmd );
//this->GetConnection()->ConnectToDB();
-this->GetConnection()->GetConnection()->perform( myStringTransactor );
+this->GetConnection()->GetConnection()->perform( myStringTransactor );
// this->GetConnection()->PerformTransaction( myStringTransactor );
//myStringTransactor ( *( this->GetConnection()->GetConnection() ) );
}
@@ -272,15 +272,15 @@ PostGISTable<TConnectionImplementation, TPrecision, SpatialDimension>
"FROM \""+ this->GetTableName() + "\" WHERE NOT geometrytype(\"the_geom\") IS NULL";
typedef otb::PostGISFromStringTransactor TransactorType;
- TransactorType myStringTransactor;
+ TransactorType myStringTransactor;
//std::cout << "transactor string" << sqlCmd<< std::endl;
myStringTransactor.SetTransactionString( query );
//this->GetConnection()->ConnectToDB();
//typedef pqxx::result ResultType;
- //ResultType R = this->GetConnection()->GetConnection()->perform( myStringTransactor );
+ //ResultType R = this->GetConnection()->GetConnection()->perform( myStringTransactor );
-}
+}
diff --git a/Code/Common/otbQuickLookImageGenerator.h b/Code/Common/otbQuickLookImageGenerator.h
index 59da438d10e0a01baa271664c1a50af45bb29a49..ea166da0cb3bcf06785717dfdaa709f36881622e 100755
--- a/Code/Common/otbQuickLookImageGenerator.h
+++ b/Code/Common/otbQuickLookImageGenerator.h
@@ -10,8 +10,8 @@ Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
See OTBCopyright.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.
=========================================================================*/
@@ -52,7 +52,7 @@ public:
typedef Image<double, 2> InternSingleImageType;
typedef itk::DiscreteGaussianImageFilter<InternSingleImageType,InternSingleImageType> GaussianFilterType;
- typedef typename GaussianFilterType::Pointer GaussianFilterPointerType;
+ typedef typename GaussianFilterType::Pointer GaussianFilterPointerType;
typedef PerBandVectorImageFilter<InputImageType, InputImageType, GaussianFilterType> PerBandFilterType;
typedef typename PerBandFilterType::Pointer PerBandFilterPointerType;
typedef StreamingShrinkImageFilter<InputImageType, InputImageType> ShrinkImageFilterType;
@@ -60,7 +60,7 @@ public:
void SetVariance(double var)
- {
+ {
m_Variance = var;
m_GaussianFilter->SetVariance(m_Variance);
this->Modified();
diff --git a/Code/Common/otbQuickLookImageGenerator.txx b/Code/Common/otbQuickLookImageGenerator.txx
index 72f26ced793c11daf9269920e3170a8af6ec4255..5bf2147d10323c59263453bc0e003108897a5b2a 100755
--- a/Code/Common/otbQuickLookImageGenerator.txx
+++ b/Code/Common/otbQuickLookImageGenerator.txx
@@ -10,8 +10,8 @@ Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
See OTBCopyright.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.
=========================================================================*/
diff --git a/Code/Common/otbRadiometricAttributesLabelMapFilter.h b/Code/Common/otbRadiometricAttributesLabelMapFilter.h
index f1c0d9d790c97aaa8a48f81fc51c44872025ee13..7de7c6dc0bc4a646fcc7b20ddccd0529d57923f0 100644
--- a/Code/Common/otbRadiometricAttributesLabelMapFilter.h
+++ b/Code/Common/otbRadiometricAttributesLabelMapFilter.h
@@ -10,8 +10,8 @@ Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
See OTBCopyright.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,7 +32,7 @@ PURPOSE. See the above copyright notices for more information.
#include "otbMultiToMonoChannelExtractROI.h"
#include "otbStatisticsAttributesLabelMapFilter.h"
-namespace otb
+namespace otb
{
/** \class RadiometricAttributesLabelMapFilter
* \brief This filter computes radiometric attributes for each object.
@@ -40,22 +40,22 @@ namespace otb
* Images are supposed to be standard 4-bands image (B,G,R,NIR). The
* index of each channel can be set via the Set***ChannelIndex()
* accessors.
- *
+ *
* This filter internally applies the
* StatisticsAttributesLabelMapFilter to the following features: GEMI,
* NDVI, IR, IC, IB, NDWI2, Intensity and original B, G, R and NIR channels.
- *
+ *
* The ReducedAttributesSet flag allows to tell the internal
* statistics filter to compute only the main attributes.
*
* \sa StatisticsAttributesImageFilter AttributesMapLabelObject
* \sa GEMI NDVI IR IC IB NDWI2
- * \sa VectorIntensityImageFilter
- *
+ * \sa VectorIntensityImageFilter
+ *
* \ingroup ImageEnhancement MathematicalMorphologyImageFilters
*/
template<class TImage, class TFeatureImage>
-class ITK_EXPORT RadiometricAttributesLabelMapFilter :
+class ITK_EXPORT RadiometricAttributesLabelMapFilter :
public itk::InPlaceLabelMapFilter<TImage>
{
public:
@@ -69,7 +69,7 @@ public:
itkStaticConstMacro(ImageDimension, unsigned int,TImage::ImageDimension);
/** Standard New method. */
- itkNewMacro(Self);
+ itkNewMacro(Self);
/** Runtime information support. */
itkTypeMacro(RadiometricAttributesLabelMapFilter,InPlaceLabelMapFilter);
diff --git a/Code/Common/otbRadiometricAttributesLabelMapFilter.txx b/Code/Common/otbRadiometricAttributesLabelMapFilter.txx
index b47e0d8dc7f587eb45195c59cd9ffb6013e61b34..da1b484563f949b93dd520ee793f64a6ca81b462 100644
--- a/Code/Common/otbRadiometricAttributesLabelMapFilter.txx
+++ b/Code/Common/otbRadiometricAttributesLabelMapFilter.txx
@@ -10,8 +10,8 @@ Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
See OTBCopyright.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.
=========================================================================*/
@@ -21,7 +21,7 @@ PURPOSE. See the above copyright notices for more information.
#include "otbRadiometricAttributesLabelMapFilter.h"
#include "itkProgressReporter.h"
-namespace otb
+namespace otb
{
template <class TImage, class TFeatureImage>
diff --git a/Code/Common/otbRectangle.h b/Code/Common/otbRectangle.h
index 11b102c144125d6e7c402c0532c526c5be2ad8eb..f4c979601f2ed912de5fbe5de9504c79bf886ece 100644
--- a/Code/Common/otbRectangle.h
+++ b/Code/Common/otbRectangle.h
@@ -32,7 +32,7 @@ namespace otb
* \brief This class represent a Rectangle.
*
* A rectangle is defined by the median of the width, an orientation and a width
- *
+ *
*/
template<class TValue=double>
class ITK_EXPORT Rectangle
@@ -54,10 +54,10 @@ namespace otb
itkTypeMacro(Rectangle, itk::Object);
/** Derived typedefs */
- typedef itk::ContinuousIndex<ValueType,2> ContinuousIndexType;
- typedef ContinuousIndexType VertexType;
+ typedef itk::ContinuousIndex<ValueType,2> ContinuousIndexType;
+ typedef ContinuousIndexType VertexType;
typedef itk::VectorContainer<unsigned, VertexType> VertexListType;
- typedef typename VertexListType::Pointer VertexListPointerType;
+ typedef typename VertexListType::Pointer VertexListPointerType;
typedef typename VertexListType::ConstIterator VertexListConstIteratorType;
@@ -69,7 +69,7 @@ namespace otb
typedef itk::ImageRegion<2> RegionType;
- /**
+ /**
* Set/Get the parameters the a rectangle
* - width and orientation
*/
@@ -78,7 +78,7 @@ namespace otb
itkSetMacro(Width,ValueType);
itkSetMacro(Orientation,ValueType);
- itkGetMacro(Orientation,ValueType);
+ itkGetMacro(Orientation,ValueType);
/**
* Check wether point is strictly inside the rectangle.
diff --git a/Code/Common/otbRectangle.txx b/Code/Common/otbRectangle.txx
index 54117df8052258a5454636276ca5e3d1837c69cd..e72743f3b3ee77fcbf169a0d4a9fedcd0f5afb0e 100644
--- a/Code/Common/otbRectangle.txx
+++ b/Code/Common/otbRectangle.txx
@@ -61,15 +61,15 @@ Rectangle<TValue>
/** Compute the distance to the orthogonal median of the rectangle*/
- if( this->ComputeEuclideanDistanceToSegment( p1, p2 , point) - (m_Width/2.) < 1e-10
- && this->ComputeEuclideanDistanceToSegment(middleP , corner, point) - (lengthSeg/2.) < 1e-10)
+ if( this->ComputeEuclideanDistanceToSegment( p1, p2 , point) - (m_Width/2.) < 1e-10
+ && this->ComputeEuclideanDistanceToSegment(middleP , corner, point) - (lengthSeg/2.) < 1e-10)
return true;
else
return false;
}
- /**
+ /**
* Method to compute the distance between a point and a segment
*/
template<class TValue>
@@ -90,9 +90,9 @@ Rectangle<TValue>
/** distance from Point P to Segment Q1Q2*/
return (Num/SegmentLength);
- }
+ }
- /**
+ /**
* Method to compute the Bounding region of a rectangle
*/
@@ -108,7 +108,7 @@ Rectangle<TValue>
++it;
VertexType p2 = it.Value();
- /** Compute the four corners of the recatangle*/
+ /** Compute the four corners of the recatangle*/
double dx = vcl_cos(m_Orientation);
double dy = vcl_sin(m_Orientation);
double halfWidth = m_Width/2;
@@ -192,7 +192,7 @@ Rectangle<TValue>
}
/*
- * Method add vertex
+ * Method add vertex
*
*/
template<class TValue>
diff --git a/Code/Common/otbShapeAttributesLabelMapFilter.h b/Code/Common/otbShapeAttributesLabelMapFilter.h
index 8dcd1f53b9928ef06bcf06543056e17b97dab0f7..12efc1e2dcfa9aa50f3663efce2511958f815f1e 100644
--- a/Code/Common/otbShapeAttributesLabelMapFilter.h
+++ b/Code/Common/otbShapeAttributesLabelMapFilter.h
@@ -13,8 +13,8 @@
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,15 +32,15 @@
//#include "itkObjectFactory.h"
-namespace otb
+namespace otb
{
/** \class ShapeAttributesLabelMapFilter
* \brief This class is a fork of the itk::ShapeLabelMapFilter working with AttributesMapLabelObject.
*
* The keys of the attributes inserted into the attributes map follow
- * the following rule: "SHAPE:NameOfAttributes".
- *
+ * the following rule: "SHAPE:NameOfAttributes".
+ *
* With respect to the original itk filter, this filter also compute
* the Flusser moments for each LabelObject.
*
@@ -55,7 +55,7 @@ namespace otb
* \ingroup ImageEnhancement MathematicalMorphologyImageFilters
*/
template<class TImage, class TLabelImage=Image< typename TImage::PixelType, TImage::ImageDimension > >
-class ITK_EXPORT ShapeAttributesLabelMapFilter :
+class ITK_EXPORT ShapeAttributesLabelMapFilter :
public itk::InPlaceLabelMapFilter<TImage>
{
public:
@@ -69,7 +69,7 @@ public:
itkStaticConstMacro(ImageDimension, unsigned int,TImage::ImageDimension);
/** Standard New method. */
- itkNewMacro(Self);
+ itkNewMacro(Self);
/** Runtime information support. */
itkTypeMacro(ShapeAttributesLabelMapFilter,InPlaceLabelMapFilter);
@@ -96,7 +96,7 @@ public:
/// Flusser moments typedef
typedef Polygon<double> PolygonType;
typedef Functor::LabelObjectToPolygonFunctor<LabelObjectType,
- PolygonType> PolygonFunctorType;
+ PolygonType> PolygonFunctorType;
typedef FlusserPathFunction<PolygonType> FlusserPathFunctionType;
/**
diff --git a/Code/Common/otbShapeAttributesLabelMapFilter.txx b/Code/Common/otbShapeAttributesLabelMapFilter.txx
index 63164366719fddb32a60606dc3b41f10e05f3da1..be6b58631f5780cdebf5b7e1f1f8183e28cbbdf6 100644
--- a/Code/Common/otbShapeAttributesLabelMapFilter.txx
+++ b/Code/Common/otbShapeAttributesLabelMapFilter.txx
@@ -13,8 +13,8 @@
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.
=========================================================================*/
@@ -237,7 +237,7 @@ ShapeAttributesLabelMapFilter<TImage, TLabelImage>
// {
// typename LabelObjectType::CentroidType pP;
// output->TransformIndexToPhysicalPoint(iidx, pP);
-//
+//
// for(unsigned int i=0; i<ImageDimension; i++)
// {
// for(unsigned int j=0; j<ImageDimension; j++)
@@ -502,11 +502,11 @@ ShapeAttributesLabelMapFilter<TImage, TLabelImage>
labelObject->SetAttribute( oss.str().c_str(),principalMoments[dim]);
for(unsigned int dim2 = 0;dim2 < ImageDimension;++dim2)
- {
- oss.str("");
- oss<<"SHAPE::PrincipalAxis"<<dim<<dim2;
- labelObject->SetAttribute( oss.str().c_str(),principalAxes(dim,dim2));
- }
+ {
+ oss.str("");
+ oss<<"SHAPE::PrincipalAxis"<<dim<<dim2;
+ labelObject->SetAttribute( oss.str().c_str(),principalAxes(dim,dim2));
+ }
}
labelObject->SetAttribute("SHAPE::RegionElongation", maxSize / minSize );
diff --git a/Code/Common/otbStatisticsAttributesLabelMapFilter.h b/Code/Common/otbStatisticsAttributesLabelMapFilter.h
index d12a2e3af17caf149c88a1eccdc052cd5beb9486..2662b83dd0ba4f999a2f179fb42594612a5965cf 100644
--- a/Code/Common/otbStatisticsAttributesLabelMapFilter.h
+++ b/Code/Common/otbStatisticsAttributesLabelMapFilter.h
@@ -13,8 +13,8 @@
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.
=========================================================================*/
@@ -38,13 +38,13 @@ namespace otb {
* statistics and statistics usefull for classification (not spatially
* dependent statitistics). Reduced set contains only mean, variance,
* skewness and kurtosis.
- *
+ *
* \sa itk::StatisticsLabelMapFilter
*
* \ingroup ImageEnhancement MathematicalMorphologyImageFilters
*/
template<class TImage, class TFeatureImage>
-class ITK_EXPORT StatisticsAttributesLabelMapFilter :
+class ITK_EXPORT StatisticsAttributesLabelMapFilter :
public itk::InPlaceLabelMapFilter<TImage>
{
public:
@@ -75,7 +75,7 @@ public:
itkStaticConstMacro(ImageDimension, unsigned int,TImage::ImageDimension);
/** Standard New method. */
- itkNewMacro(Self);
+ itkNewMacro(Self);
/** Runtime information support. */
itkTypeMacro(StatisticsAttributesLabelMapFilter,InPlaceLabelMapFilter);
diff --git a/Code/Common/otbStatisticsAttributesLabelMapFilter.txx b/Code/Common/otbStatisticsAttributesLabelMapFilter.txx
index 46c81f47647fa3cfad7847a9f48562d3f48e3c43..383e84e7b239fd92c224c37169c28d2a94b1ab90 100644
--- a/Code/Common/otbStatisticsAttributesLabelMapFilter.txx
+++ b/Code/Common/otbStatisticsAttributesLabelMapFilter.txx
@@ -13,8 +13,8 @@
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.
=========================================================================*/
@@ -28,7 +28,7 @@
#include "vnl/algo/vnl_real_eigensystem.h"
#include "vnl/algo/vnl_symmetric_eigensystem.h"
-namespace otb
+namespace otb
{
template <class TImage, class TFeatureImage>
@@ -108,7 +108,7 @@ StatisticsAttributesLabelMapFilter<TImage, TFeatureImage>
output->TransformIndexToPhysicalPoint(idx, physicalPosition);
for(unsigned int i=0; i<ImageDimension; i++)
{
- centerOfGravity[i] += physicalPosition[i] * v;
+ centerOfGravity[i] += physicalPosition[i] * v;
centralMoments[i][i] += v * physicalPosition[i] * physicalPosition[i];
for(unsigned int j=i+1; j<ImageDimension; j++)
{
@@ -218,7 +218,7 @@ StatisticsAttributesLabelMapFilter<TImage, TFeatureImage>
// If we want all the features
if(!m_ReducedAttributeSet)
- {
+ {
oss.str("");
oss<<"STATS::"<<m_FeatureName<<"::Minimum";
labelObject->SetAttribute(oss.str().c_str(),(double)min );
@@ -254,11 +254,11 @@ StatisticsAttributesLabelMapFilter<TImage, TFeatureImage>
labelObject->SetAttribute(oss.str().c_str(), maxIdx[dim]);
for(unsigned int dim2 = 0;dim2 < ImageDimension;++dim2)
- {
- oss.str("");
- oss<<"STATS::"<<m_FeatureName<<"::PrincipalAxis"<<dim<<dim2;
- labelObject->SetAttribute( oss.str().c_str(),principalAxes(dim,dim2));
- }
+ {
+ oss.str("");
+ oss<<"STATS::"<<m_FeatureName<<"::PrincipalAxis"<<dim<<dim2;
+ labelObject->SetAttribute( oss.str().c_str(),principalAxes(dim,dim2));
+ }
}
}
}
diff --git a/Code/Common/otbSubsampledImageRegionConstIterator.h b/Code/Common/otbSubsampledImageRegionConstIterator.h
index a7af829e8e15e5cdcdf6e0a007968557b592366f..cff24b6f681655ba6b71df6885c07deca632e9ed 100644
--- a/Code/Common/otbSubsampledImageRegionConstIterator.h
+++ b/Code/Common/otbSubsampledImageRegionConstIterator.h
@@ -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 {
* \brief Regular subsample iterator over an image
*
* This iterator is a itk::ImageRegionConstIterator that perform a subsampled
- * scan over an image. It runs one pixel over X (in row, line, slice... dimensions),
+ * scan over an image. It runs one pixel over X (in row, line, slice... dimensions),
* if X is the (integer) value of the SubsampleFactor.
*
* Specific value of the subsample factor may be given for each dimension.
@@ -38,7 +38,7 @@ namespace otb {
* \sa WaveletFilterBank
*/
template < class TImage >
-class ITK_EXPORT SubsampledImageRegionConstIterator
+class ITK_EXPORT SubsampledImageRegionConstIterator
: public itk::ImageRegionConstIterator< TImage >
{
public:
@@ -71,7 +71,7 @@ public:
* it needs to be redone here for this subclass to compile properly with gcc. */
typedef typename Superclass::ImageType ImageType;
- /** Offset typedef support. This explicit redefinition allows to Set/Get
+ /** Offset typedef support. This explicit redefinition allows to Set/Get
* the location of the iterator. */
//typedef typename Superclass::OffsetType OffsetType;
typedef unsigned long OffsetType;
@@ -105,15 +105,15 @@ public:
/** Constructor that can be used to cast from an ImageIterator to an
* SubsampledImageRegionConstIterator. Many routines return an ImageIterator
- * but for a particular task, you may want an SubsampledImageRegionConstIterator.
+ * but for a particular task, you may want an SubsampledImageRegionConstIterator.
* Rather than provide overloaded APIs that return different types of Iterators, itk
* returns ImageIterators and uses constructors to cast from an
* ImageIterator to a SubsampledImageRegionConstIterator. */
SubsampledImageRegionConstIterator( const itk::ImageIterator<TImage> &it );
/** Constructor that can be used to cast from an ImageConstIterator to an
- * SubsampledImageRegionConstIterator. Many routines return an ImageIterator
- * but for a particular task, you may want an SubsampledImageRegionConstIterator.
+ * SubsampledImageRegionConstIterator. Many routines return an ImageIterator
+ * but for a particular task, you may want an SubsampledImageRegionConstIterator.
* Rather than provide overloaded APIs that return different types of Iterators, itk
* returns ImageIterators and uses constructors to cast from an
* ImageIterator to a SubsampledImageRegionConstIterator. */
@@ -123,7 +123,7 @@ public:
void SetSubsampleFactor ( typename IndexType::IndexValueType factor );
/** Set / Get the subsample factor */
- void SetSubsampleFactor ( const IndexType & factor );
+ void SetSubsampleFactor ( const IndexType & factor );
const IndexType & GetSubsampleFactor () const
{
@@ -138,10 +138,10 @@ public:
* one pixel past the last pixel of the region. */
void GoToEnd();
- /** Is the iterator at the beginning of the region?
- * "Begin" is defined here as before the first pixel
- * of the region.
- * On the contrary to Superclasses, now you cannot get
+ /** Is the iterator at the beginning of the region?
+ * "Begin" is defined here as before the first pixel
+ * of the region.
+ * On the contrary to Superclasses, now you cannot get
* *it even if IsAtBegin() is true!!!
*/
bool IsAtBegin(void) const
@@ -149,11 +149,11 @@ public:
return ( this->m_Offset <= m_SubSampledBeginOffset );
}
- /** Is the iterator at the end of the region?
- * "End" is defined as past the last candidate pixel
+ /** Is the iterator at the end of the region?
+ * "End" is defined as past the last candidate pixel
* of the region (under the subsample point of view).
*
- * For instance, if in 1D, the Size is 10 with a subsample
+ * For instance, if in 1D, the Size is 10 with a subsample
* factor of 4, the last candidate offset would be 8.
*/
bool IsAtEnd(void) const
@@ -161,7 +161,7 @@ public:
return ( this->m_Offset >= m_SubSampledEndOffset );
}
- /** Set the index.
+ /** Set the index.
* It is moved to the next available (usable) index.
* \sa GetIndex */
void SetIndex(const IndexType &ind) ;
@@ -207,7 +207,7 @@ public:
{
// On the contrary to itk::ImageRegionConstIterator, m_Offset
// is not decremented here (it may become negative!)
- if ( this->m_Offset < this->m_SpanBeginOffset + m_SubsampleFactor[0] )
+ if ( this->m_Offset < this->m_SpanBeginOffset + m_SubsampleFactor[0] )
{
this->Decrement();
}
@@ -228,7 +228,7 @@ public:
return this->m_Offset;
}
- /** GenerateOutputInformation.
+ /** GenerateOutputInformation.
* In order to help copy into a new Image, give the new region parameters
*/
RegionType GenerateOutputInformation () const;
diff --git a/Code/Common/otbSubsampledImageRegionConstIterator.txx b/Code/Common/otbSubsampledImageRegionConstIterator.txx
index 28a57e1813becb034bef2dd691f92540c0a06a1c..6e1b8203b17099b8e23018c68d399725547f828b 100644
--- a/Code/Common/otbSubsampledImageRegionConstIterator.txx
+++ b/Code/Common/otbSubsampledImageRegionConstIterator.txx
@@ -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.
=========================================================================*/
@@ -28,7 +28,7 @@ namespace otb {
template < class TImage >
SubsampledImageRegionConstIterator< TImage >
-::SubsampledImageRegionConstIterator()
+::SubsampledImageRegionConstIterator()
: itk::ImageRegionConstIterator<TImage> ()
{
m_SubsampleFactor.Fill(1);
@@ -123,12 +123,12 @@ SubsampledImageRegionConstIterator< TImage >
for ( unsigned int i = 0; i < ImageIteratorDimension; ++i )
{
m_FirstUsableIndex[i] = startIndex[i];
- while ( m_FirstUsableIndex[i]
+ while ( m_FirstUsableIndex[i]
!= ( m_SubsampleFactor[i] * ( m_FirstUsableIndex[i] / m_SubsampleFactor[i] ) ) )
{
++m_FirstUsableIndex[i];
}
- m_LastUsableIndex[i] = startIndex[i]
+ m_LastUsableIndex[i] = startIndex[i]
+ static_cast<IndexValueType>( m_SubsampleFactor[i] * ( (size[i]-1) / m_SubsampleFactor[i] ) );
}
@@ -148,7 +148,7 @@ SubsampledImageRegionConstIterator< TImage >
const SizeType& size = this->m_Region.GetSize();
this->m_SpanBeginOffset = this->m_Offset;
- this->m_SpanEndOffset = this->m_Offset
+ this->m_SpanEndOffset = this->m_Offset
+ static_cast<IndexValueType>( m_SubsampleFactor[0] * ((size[0]-1) / m_SubsampleFactor[0]) )
+ 1;
}
@@ -172,7 +172,7 @@ SubsampledImageRegionConstIterator< TImage >
for ( unsigned int i = 0; i < ImageIteratorDimension; ++i )
{
- while ( theIndex[i]
+ while ( theIndex[i]
!= ( m_SubsampleFactor[i] * ( theIndex[i] / m_SubsampleFactor[i] ) ) )
{
++theIndex[i];
@@ -181,7 +181,7 @@ SubsampledImageRegionConstIterator< TImage >
if ( theIndex[i] > static_cast<IndexValueType>( this->m_Region.GetIndex()[i] + this->m_Region.GetSize()[i] ) )
{
theIndex[i] = ind[i];
- while ( theIndex[i]
+ while ( theIndex[i]
!= ( m_SubsampleFactor[i] * ( theIndex[i] / m_SubsampleFactor[i] ) ) )
{
--theIndex[i];
@@ -207,14 +207,14 @@ SubsampledImageRegionConstIterator< TImage >
const SizeType& size = this->m_Region.GetSize();
this->m_SpanBeginOffset = this->m_Offset;
- this->m_SpanEndOffset = this->m_Offset
+ this->m_SpanEndOffset = this->m_Offset
+ static_cast<IndexValueType>( m_SubsampleFactor[0] * ((size[0]-1) / m_SubsampleFactor[0]) )
+ 1;
}
template < class TImage >
-typename SubsampledImageRegionConstIterator< TImage >::RegionType
+typename SubsampledImageRegionConstIterator< TImage >::RegionType
SubsampledImageRegionConstIterator< TImage >
::GenerateOutputInformation () const
{
@@ -233,7 +233,7 @@ SubsampledImageRegionConstIterator< TImage >
newRegion.SetIndex( startIndex );
newRegion.SetSize( size );
-#if 0
+#if 0
// #ifndef NDEBUG
std::cerr << "InitialImageSize (";
for ( unsigned int i = 0; i < ImageIteratorDimension-1; i++ )
@@ -273,7 +273,7 @@ SubsampledImageRegionConstIterator< TImage >
::Increment ()
{
// Get the index of the last pixel on the span (row)
- IndexType ind = this->m_Image->ComputeIndex(
+ IndexType ind = this->m_Image->ComputeIndex(
static_cast<typename Superclass::OffsetValueType>(this->m_Offset) );
const IndexType& startIndex = this->m_Region.GetIndex();
@@ -305,7 +305,7 @@ SubsampledImageRegionConstIterator< TImage >
}
}
this->m_Offset = this->m_Image->ComputeOffset( ind );
- this->m_SpanEndOffset = this->m_Offset
+ this->m_SpanEndOffset = this->m_Offset
+ static_cast<IndexValueType>( m_SubsampleFactor[0] * ((size[0]-1) / m_SubsampleFactor[0]) )
+ 1;
this->m_SpanBeginOffset = this->m_Offset;
diff --git a/Code/Common/otbSubsampledImageRegionIterator.h b/Code/Common/otbSubsampledImageRegionIterator.h
index 91a3c611d11525e49c236f57a7e2cbe93fbe4d16..e990a869c9d55973b417dce59e0ef8bc1d673d62 100644
--- a/Code/Common/otbSubsampledImageRegionIterator.h
+++ b/Code/Common/otbSubsampledImageRegionIterator.h
@@ -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 {
* \brief Regular subsample iterator over an image
*
* This iterator is a itk::ImageRegionConstIterator that perform a subsampled
- * scan over an image. It runs one pixel over X (in row, line, slice... dimensions),
+ * scan over an image. It runs one pixel over X (in row, line, slice... dimensions),
* if X is the (integer) value of the SubsampleFactor.
*
* It inherits from SubsampledImageRegionConstIterator and can modify the pixel values...
@@ -38,7 +38,7 @@ namespace otb {
* \sa SubsampledImageRegionConstIterator
*/
template < class TImage >
-class ITK_EXPORT SubsampledImageRegionIterator
+class ITK_EXPORT SubsampledImageRegionIterator
: public SubsampledImageRegionConstIterator< TImage >
{
public:
@@ -66,7 +66,7 @@ public:
typedef typename Superclass::IndexValueType IndexValueType;
// Constructors
- SubsampledImageRegionIterator()
+ SubsampledImageRegionIterator()
: SubsampledImageRegionConstIterator< TImage > () { }
SubsampledImageRegionIterator ( const ImageType *ptr, const RegionType ®ion )
@@ -85,15 +85,15 @@ public:
void Set( const PixelType & value) const
{
this->m_PixelAccessorFunctor.Set( *(const_cast<InternalPixelType *>(
- this->m_Buffer + this->m_Offset ) ), value );
+ this->m_Buffer + this->m_Offset ) ), value );
}
- PixelType & Value(void)
- {
- return *(const_cast<InternalPixelType *>(this->m_Buffer+this->m_Offset));
+ PixelType & Value(void)
+ {
+ return *(const_cast<InternalPixelType *>(this->m_Buffer+this->m_Offset));
}
-}; // end of class
+}; // end of class
} // end of namespace otb
diff --git a/Code/Common/otbUnaryFunctorWithIndexImageFilter.txx b/Code/Common/otbUnaryFunctorWithIndexImageFilter.txx
index 3d11f86a593fa03d9406c0814ab0454b63e4c482..4ddb04eb81f3a3164281bf3bd3bcc2d9b157c976 100644
--- a/Code/Common/otbUnaryFunctorWithIndexImageFilter.txx
+++ b/Code/Common/otbUnaryFunctorWithIndexImageFilter.txx
@@ -105,7 +105,7 @@ UnaryFunctorWithIndexImageFilter<TInputImage, TOutputImage, TFunction>
inputIt.GoToBegin();
outputIt.GoToBegin();
- while( !inputIt.IsAtEnd() )
+ while( !inputIt.IsAtEnd() )
{
outputIt.Set( m_Functor( inputIt.Get(), inputIt.GetIndex() ) );
++inputIt;
diff --git a/Code/Common/otbVectorDataProperties.h b/Code/Common/otbVectorDataProperties.h
index 6f04f61911f41e7c38a0713525ea2647dfa89576..ca10f7a408105a2ab39858781f0c606091d0cf59 100644
--- a/Code/Common/otbVectorDataProperties.h
+++ b/Code/Common/otbVectorDataProperties.h
@@ -74,7 +74,7 @@ class ITK_EXPORT VectorDataProperties : public itk::DataObject
/** Get/Set the VectorData. */
// itkGetObjectMacro(VectorDataObject, VectorDataType);
void SetVectorDataObject(const VectorDataType * v) {m_VectorDataObject=const_cast <VectorDataType *>(v); }
-//
+//
RegionType GetBoundingRegion() {return m_BoundingRegion;}
void SetBoundingRegion(RegionType & region) {m_BoundingRegion=region; }
diff --git a/Code/Common/otbVectorDataProperties.txx b/Code/Common/otbVectorDataProperties.txx
index 8529304597d5781e54974dca462993f97880fb2d..acc46b47ec304b5817ec841e887e9ba03582b2e8 100644
--- a/Code/Common/otbVectorDataProperties.txx
+++ b/Code/Common/otbVectorDataProperties.txx
@@ -33,22 +33,22 @@ VectorDataProperties<TVectorData>
// m_InputGISConnection = InputGISConnectionType::New();
// m_DropExistingGISTable = false;
// m_GISTableName = "otb_to_gis_sample";
-}
+}
*/
-template <class TVectorData>
+template <class TVectorData>
bool VectorDataProperties<TVectorData>
::IsBoundingRegionNull()
{
for (unsigned int i = 0;i<VectorDataDimension;++i)
{
if ( ( m_BoundingRegion.GetOrigin(i) != itk::NumericTraits<Type>::ZeroValue()) || ( m_BoundingRegion.GetSize(i) != itk::NumericTraits<Type>::ZeroValue() ) )
- return false;
- }
+ return false;
+ }
return true;
}
/**
* Add a region
- */
+ */
template <class TVectorData>
void
VectorDataProperties<TVectorData>
@@ -56,7 +56,7 @@ VectorDataProperties<TVectorData>
{
// std::cout << "add region: " << region << std::endl;
if (this->IsBoundingRegionNull() )
- {
+ {
m_BoundingRegion = region;
}
else
@@ -92,7 +92,7 @@ VectorDataProperties<TVectorData>
}
template<class TVectorData>
-void
+void
VectorDataProperties<TVectorData>
::ProcessNode(InternalTreeNodeType * source)
{
diff --git a/Code/Common/otbVectorDataToGISTableFilter.txx b/Code/Common/otbVectorDataToGISTableFilter.txx
index 24a9f7efb065322e5d1b8425e2c84694ba58fc2a..c6b74736d8b272cba13f948cd03b08c6ca1b7b37 100644
--- a/Code/Common/otbVectorDataToGISTableFilter.txx
+++ b/Code/Common/otbVectorDataToGISTableFilter.txx
@@ -9,8 +9,8 @@
Copyright (c) Insight Software Consortium. All rights reserved.
See ITKCopyright.txt or http://www.itk.org/HTML/Copyright.htm 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 @@ VectorDataToGISTableFilter< TVectorData, TGISTable >
m_InputGISConnection = InputGISConnectionType::New();
m_DropExistingGISTable = false;
m_GISTableName = "vectordata_to_gis";
-}
+}
@@ -77,7 +77,7 @@ VectorDataToGISTableFilter< TVectorData, TGISTable >
}
template<class TVectorData , class TGISTable>
-void
+void
VectorDataToGISTableFilter< TVectorData, TGISTable >
::GenerateInputRequestedRegion()
{/*
@@ -93,7 +93,7 @@ VectorDataToGISTableFilter< TVectorData, TGISTable >
/*
template<class TInputImage, class TVectorData >
-void
+void
LabelMapToVectorDataFilter<TInputImage, TVectorData>
::EnlargeOutputRequestedRegion(DataObject *)
{
@@ -150,7 +150,7 @@ VectorDataToGISTableFilter< TVectorData, TGISTable >
/**Test if the driver is available*/
if ( gisWriter->CanWriteFile(outputOGRConnStr.data()) ) {
- //Write VectorData to the GIS Table using OGR translation
+ //Write VectorData to the GIS Table using OGR translation
gisWriter->SetFileName(outputOGRConnStr);
otbGenericMsgDebugMacro(<<"Write vector data to GIS table " << outputOGRConnStr);
@@ -164,7 +164,7 @@ VectorDataToGISTableFilter< TVectorData, TGISTable >
output->SetTableName (inputRoot->Get()->GetNodeId());
std::cout << "tablename " << output->GetTableName() << std::endl;
}
- else
+ else
{
itkGenericExceptionMacro(<< "Not valid connection string (PG:*) " << outputOGRConnStr);
}
diff --git a/Code/FeatureExtraction/otbComplexMomentPathFunction.txx b/Code/FeatureExtraction/otbComplexMomentPathFunction.txx
index cf169b025910f2beeb82c7c61b105eeaca43b464..096a38b077896f7ccedb2128a2d436ee7a1e7d30 100644
--- a/Code/FeatureExtraction/otbComplexMomentPathFunction.txx
+++ b/Code/FeatureExtraction/otbComplexMomentPathFunction.txx
@@ -132,7 +132,7 @@ ComplexMomentPathFunction<TInputPath,TOutput,TPrecision>
PrecisionType ds;
VertexType dest;
- // This variable will be used to normalize the moment
+ // This variable will be used to normalize the moment
PrecisionType norm = 0.;
while(it!=vertexList->End())
@@ -144,17 +144,17 @@ ComplexMomentPathFunction<TInputPath,TOutput,TPrecision>
dest[1] -= centroid[1];
// Don't forget the ds part of the integration process
- ds = vcl_sqrt(vcl_pow(dest[0]-source[0],2.)+vcl_pow(dest[1]-source[1],2.));
+ ds = vcl_sqrt(vcl_pow(dest[0]-source[0],2.)+vcl_pow(dest[1]-source[1],2.));
norm+=ds;
value += ds * EvaluateComplexMomentAtIndex(source);
source=dest;
++it;
}
// Close the loop
- dest = vertexList->Begin().Value();
+ dest = vertexList->Begin().Value();
dest[0] -= centroid[0];
dest[1] -= centroid[1];
- ds = vcl_sqrt(vcl_pow(dest[0]-source[0],2.)+vcl_pow(dest[1]-source[1],2.));
+ ds = vcl_sqrt(vcl_pow(dest[0]-source[0],2.)+vcl_pow(dest[1]-source[1],2.));
norm+=ds;
value += EvaluateComplexMomentAtIndex(source)*ds;
norm = vcl_pow(norm,((PrecisionType)m_P+(PrecisionType)m_Q)/2.);
diff --git a/Code/FeatureExtraction/otbImageFittingPolygonListFilter.txx b/Code/FeatureExtraction/otbImageFittingPolygonListFilter.txx
index ae99476b3af27588a4996942a8970ceba28e7dc6..f4e2ea5693ca68b0726e665e7a792d82c4211a92 100644
--- a/Code/FeatureExtraction/otbImageFittingPolygonListFilter.txx
+++ b/Code/FeatureExtraction/otbImageFittingPolygonListFilter.txx
@@ -116,12 +116,12 @@ ImageFittingPolygonListFilter<TPath, TImage>
start[0] = static_cast<long int>(currentPoint[0]-m_Radius);
start[1] = static_cast<long int>(currentPoint[1]-m_Radius);
region.SetIndex(start);
- region.Crop(inputImagePtr->GetLargestPossibleRegion());
+ region.Crop(inputImagePtr->GetLargestPossibleRegion());
NeighborhoodIteratorType nIt(inputImagePtr, region);
double maxValue=0.0;
VertexType maxPoint = currentPoint;
- nIt.GoToBegin();
+ nIt.GoToBegin();
while( !nIt.IsAtEnd() )
{
if (regionLargest.IsInside(nIt.GetIndex()))
@@ -134,7 +134,7 @@ ImageFittingPolygonListFilter<TPath, TImage>
maxPoint=middlePoint;
}
}
- ++nIt;
+ ++nIt;
}
currentPoint=maxPoint;
newPolygon->AddVertex(maxPoint);
@@ -160,7 +160,7 @@ ImageFittingPolygonListFilter<TPath, TImage>
NeighborhoodIteratorType nIt(inputImagePtr, region);
double maxValue=0.0;
VertexType maxPoint = currentPoint;
- nIt.GoToBegin();
+ nIt.GoToBegin();
while( !nIt.IsAtEnd() )
{
@@ -174,7 +174,7 @@ ImageFittingPolygonListFilter<TPath, TImage>
maxPoint=middlePoint;
}
}
- ++nIt;
+ ++nIt;
}
currentPoint=maxPoint;
newPolygon->AddVertex(maxPoint);
@@ -198,7 +198,7 @@ ImageFittingPolygonListFilter<TPath, TImage>
NeighborhoodIteratorType nIt(inputImagePtr, region);
double maxValue=0.0;
VertexType maxPoint = currentPoint;
- nIt.GoToBegin();
+ nIt.GoToBegin();
while ( !nIt.IsAtEnd() )
{
if (regionLargest.IsInside(nIt.GetIndex()))
@@ -211,7 +211,7 @@ ImageFittingPolygonListFilter<TPath, TImage>
maxPoint=middlePoint;
}
}
- ++nIt;
+ ++nIt;
}
currentPoint=maxPoint;
newPolygon->AddVertex(maxPoint);
diff --git a/Code/FeatureExtraction/otbImageToLineSegmentVectorData.h b/Code/FeatureExtraction/otbImageToLineSegmentVectorData.h
index 5a5be70b29b550f696f9bb693e08e00e6fabc4f6..6904c9132f5a2af00c44340facf872037892bad6 100644
--- a/Code/FeatureExtraction/otbImageToLineSegmentVectorData.h
+++ b/Code/FeatureExtraction/otbImageToLineSegmentVectorData.h
@@ -45,7 +45,7 @@ namespace otb
template<class TInputImage, class TPrecision=double >
class ITK_EXPORT PersistentLineSegmentDetector :
public PersistentImageFilter<TInputImage, TInputImage>
-{
+{
public:
/** Standard Self typedef */
typedef PersistentLineSegmentDetector Self;
@@ -80,10 +80,10 @@ public PersistentImageFilter<TInputImage, TInputImage>
typedef itk::ExtractImageFilter<ImageType, ImageType> ExtractorType;
typedef typename ExtractorType::Pointer ExtractorPointerType;
- typedef ObjectList<ExtractorType> ExtractorListType;
+ typedef ObjectList<ExtractorType> ExtractorListType;
typedef ObjectList<LineDetectorType> LineDetectorListType;
- // Vector of region
+ // Vector of region
typedef std::vector<RegionType> RegionListType;
virtual void Reset(void);
diff --git a/Code/FeatureExtraction/otbImageToLineSegmentVectorData.txx b/Code/FeatureExtraction/otbImageToLineSegmentVectorData.txx
index 88646a9f840b7bd26b3f7bace8db47911d095910..140af734e4d2e1d58a9a7a813d28133da395b451 100644
--- a/Code/FeatureExtraction/otbImageToLineSegmentVectorData.txx
+++ b/Code/FeatureExtraction/otbImageToLineSegmentVectorData.txx
@@ -156,7 +156,7 @@ ImageToLineSegmentVectorData<TInputImage, TPrecision>
* For that we have to fuse different thread output, in particular for line that throw thread.
* For that, for each thread and each detected line, we look if one of its extrema is over a thread lower limit (RegionList.GetSize()[1]).
* If yes, we store the line. If no, we add it to the vector data.
- * At the next loop (ie. next thread), for each line, we check that it doesn't have a point in common with lines that end at the end of
+ * At the next loop (ie. next thread), for each line, we check that it doesn't have a point in common with lines that end at the end of
* the previous thread.
* If yes we compute the extrema (one point ineach thread).
* If not, we add it to the vector data, else we store it.
@@ -198,123 +198,123 @@ ImageToLineSegmentVectorData<TInputImage, TPrecision>
typename LineSpatialObjectType::const_iterator itEnd = this->GetLines()->GetNthElement(i)->end();
while(it != itEnd)
- {
- VertexType p1,p2;
- typename LineType::Pointer l = LineType::New();
- typename LineSpatialObjectType::LineType::PointListType & pointsList = (*it)->GetPoints();
- typename LineSpatialObjectType::LineType::PointListType::const_iterator itPoints = pointsList.begin();
- p1[0] =(*itPoints).GetPosition()[0]; //First Vertex
- p1[1] =(*itPoints).GetPosition()[1];
- ++itPoints;
- p2[0] =(*itPoints).GetPosition()[0]; //Second Vertex
- p2[1] =(*itPoints).GetPosition()[1];
-
- bool go = false;
- // horizontal line
- if( vcl_abs(p1[1]-whereAmI[1])<m_ThreadDistanceThreshold && vcl_abs(p2[1]-whereAmI[1])<m_ThreadDistanceThreshold )
- {
- go = true;
- }
- // point over the border
- else if( vcl_abs(p1[1]-whereAmI[1])<m_ThreadDistanceThreshold || vcl_abs(p2[1]-whereAmI[1])<m_ThreadDistanceThreshold )
- {
- // have to fuse?
- unsigned int j=0;
- bool done = false;
- VertexType p1Old;
- VertexType p2Old;
- while(j<vertexList.size() && done==false)
- {
- p1Old = vertexList[j][0];
- p2Old = vertexList[j][1];
-
- // if p1=p1old and p2=p2Old or p1=p2old and p2=p1Old mod 1
- if( ( vcl_abs(p1[0]-p1Old[0])<m_ThreadDistanceThreshold && vcl_abs(p1[1]-p1Old[1])<m_ThreadDistanceThreshold ) ||
- ( vcl_abs(p2[0]-p2Old[0])<m_ThreadDistanceThreshold && vcl_abs(p2[1]-p2Old[1])<m_ThreadDistanceThreshold ) ||
- ( vcl_abs(p1[0]-p2Old[0])<m_ThreadDistanceThreshold && vcl_abs(p1[1]-p2Old[1])<m_ThreadDistanceThreshold ) ||
- ( vcl_abs(p2[0]-p1Old[0])<m_ThreadDistanceThreshold && vcl_abs(p2[1]-p1Old[1])<m_ThreadDistanceThreshold ) )
- {
- done = true;
- }
- ++j;
- }
- if(done==true && j!=0)
- {
- DoubleVertexType vert;
- // keep the 2 lines extramities
- // p1 is the common point -> keep p2
- if(vcl_abs(p1[1]-whereAmI[1])<m_ThreadDistanceThreshold)
- {
- vert.push_back(p2);
- // p1 is the same as p1Old -> keep p2Old
- if( vcl_abs(p1[0]-p1Old[0])<m_ThreadDistanceThreshold && vcl_abs(p1[1]-p1Old[1])<m_ThreadDistanceThreshold )
- vert.push_back(p2Old);
- else
- vert.push_back(p1Old);
- }
- // p2 is the common point -> keep p1
- else
- {
- vert.push_back(p1);
- // p2 is the same as p1Old -> keep p1Old
- if( vcl_abs(p2[0]-p2Old[0])<m_ThreadDistanceThreshold && vcl_abs(p2[1]-p2Old[1]<m_ThreadDistanceThreshold) )
- vert.push_back(p1Old);
- else
- vert.push_back(p2Old);
- }
- vertexNewList.push_back(vert);
- // j-1 because of the ++j at the end of the while
- vertexList.erase(vertexList.begin()+(j-1));
- }
- else if(j==0)
- {
- DoubleVertexType vert;
- vert.push_back(p1);
- vert.push_back(p2);
- vertexNewList.push_back(vert);
- }
- // no point to fuse
- else
- go = true;
- }// else if( vcl_abs(p1[1]-whereAmI[1])<m_ThreadDistanceThreshold || vcl_abs(p2[1]-whereAmI[1])<m_ThreadDistanceThreshold )
- else
- {
- go = true;
- }
-
-
- if( go==true)
- {
- l->AddVertex(p1);
- l->AddVertex(p2);
-
- DataNodePointerType node = DataNodeType::New();
- node->SetNodeType(otb::FEATURE_LINE);
- node->SetLine(l);
- vlines->GetDataTree()->Add(node,folder);
- }
-
- ++it;
- } // End while(it != itEnd) loop
+ {
+ VertexType p1,p2;
+ typename LineType::Pointer l = LineType::New();
+ typename LineSpatialObjectType::LineType::PointListType & pointsList = (*it)->GetPoints();
+ typename LineSpatialObjectType::LineType::PointListType::const_iterator itPoints = pointsList.begin();
+ p1[0] =(*itPoints).GetPosition()[0]; //First Vertex
+ p1[1] =(*itPoints).GetPosition()[1];
+ ++itPoints;
+ p2[0] =(*itPoints).GetPosition()[0]; //Second Vertex
+ p2[1] =(*itPoints).GetPosition()[1];
+
+ bool go = false;
+ // horizontal line
+ if( vcl_abs(p1[1]-whereAmI[1])<m_ThreadDistanceThreshold && vcl_abs(p2[1]-whereAmI[1])<m_ThreadDistanceThreshold )
+ {
+ go = true;
+ }
+ // point over the border
+ else if( vcl_abs(p1[1]-whereAmI[1])<m_ThreadDistanceThreshold || vcl_abs(p2[1]-whereAmI[1])<m_ThreadDistanceThreshold )
+ {
+ // have to fuse?
+ unsigned int j=0;
+ bool done = false;
+ VertexType p1Old;
+ VertexType p2Old;
+ while(j<vertexList.size() && done==false)
+ {
+ p1Old = vertexList[j][0];
+ p2Old = vertexList[j][1];
+
+ // if p1=p1old and p2=p2Old or p1=p2old and p2=p1Old mod 1
+ if( ( vcl_abs(p1[0]-p1Old[0])<m_ThreadDistanceThreshold && vcl_abs(p1[1]-p1Old[1])<m_ThreadDistanceThreshold ) ||
+ ( vcl_abs(p2[0]-p2Old[0])<m_ThreadDistanceThreshold && vcl_abs(p2[1]-p2Old[1])<m_ThreadDistanceThreshold ) ||
+ ( vcl_abs(p1[0]-p2Old[0])<m_ThreadDistanceThreshold && vcl_abs(p1[1]-p2Old[1])<m_ThreadDistanceThreshold ) ||
+ ( vcl_abs(p2[0]-p1Old[0])<m_ThreadDistanceThreshold && vcl_abs(p2[1]-p1Old[1])<m_ThreadDistanceThreshold ) )
+ {
+ done = true;
+ }
+ ++j;
+ }
+ if(done==true && j!=0)
+ {
+ DoubleVertexType vert;
+ // keep the 2 lines extramities
+ // p1 is the common point -> keep p2
+ if(vcl_abs(p1[1]-whereAmI[1])<m_ThreadDistanceThreshold)
+ {
+ vert.push_back(p2);
+ // p1 is the same as p1Old -> keep p2Old
+ if( vcl_abs(p1[0]-p1Old[0])<m_ThreadDistanceThreshold && vcl_abs(p1[1]-p1Old[1])<m_ThreadDistanceThreshold )
+ vert.push_back(p2Old);
+ else
+ vert.push_back(p1Old);
+ }
+ // p2 is the common point -> keep p1
+ else
+ {
+ vert.push_back(p1);
+ // p2 is the same as p1Old -> keep p1Old
+ if( vcl_abs(p2[0]-p2Old[0])<m_ThreadDistanceThreshold && vcl_abs(p2[1]-p2Old[1]<m_ThreadDistanceThreshold) )
+ vert.push_back(p1Old);
+ else
+ vert.push_back(p2Old);
+ }
+ vertexNewList.push_back(vert);
+ // j-1 because of the ++j at the end of the while
+ vertexList.erase(vertexList.begin()+(j-1));
+ }
+ else if(j==0)
+ {
+ DoubleVertexType vert;
+ vert.push_back(p1);
+ vert.push_back(p2);
+ vertexNewList.push_back(vert);
+ }
+ // no point to fuse
+ else
+ go = true;
+ }// else if( vcl_abs(p1[1]-whereAmI[1])<m_ThreadDistanceThreshold || vcl_abs(p2[1]-whereAmI[1])<m_ThreadDistanceThreshold )
+ else
+ {
+ go = true;
+ }
+
+
+ if( go==true)
+ {
+ l->AddVertex(p1);
+ l->AddVertex(p2);
+
+ DataNodePointerType node = DataNodeType::New();
+ node->SetNodeType(otb::FEATURE_LINE);
+ node->SetLine(l);
+ vlines->GetDataTree()->Add(node,folder);
+ }
+
+ ++it;
+ } // End while(it != itEnd) loop
// write the false alarm in vertexList (those that don't have a continuation in the next thread)
for(unsigned int k=0; k<vertexList.size(); ++k)
- {
- typename LineType::Pointer l = LineType::New();
- l->AddVertex(vertexList[k][0]);
- l->AddVertex(vertexList[k][1]);
-
- DataNodePointerType node = DataNodeType::New();
- node->SetNodeType(otb::FEATURE_LINE);
- node->SetLine(l);
- vlines->GetDataTree()->Add(node,folder);
- }
+ {
+ typename LineType::Pointer l = LineType::New();
+ l->AddVertex(vertexList[k][0]);
+ l->AddVertex(vertexList[k][1]);
+
+ DataNodePointerType node = DataNodeType::New();
+ node->SetNodeType(otb::FEATURE_LINE);
+ node->SetLine(l);
+ vlines->GetDataTree()->Add(node,folder);
+ }
vertexList.clear();
vertexList = vertexNewList;
vertexNewList.clear();
whereAmI[0] += regionList[i].GetSize()[0];
whereAmI[1] += regionList[i].GetSize()[1];
-
+
}// End for loop
return vlines;
diff --git a/Code/FeatureExtraction/otbLineSegmentDetector.txx b/Code/FeatureExtraction/otbLineSegmentDetector.txx
index 1d222944210b3e1833a968509bb74c223caa2f21..a21aad06ec80e08eb5f707aaa8763a770240332a 100644
--- a/Code/FeatureExtraction/otbLineSegmentDetector.txx
+++ b/Code/FeatureExtraction/otbLineSegmentDetector.txx
@@ -184,14 +184,14 @@ LineSegmentDetector<TInputImage,TPrecision >
InputIndexType id = modulusImage->GetRequestedRegion().GetIndex();
- // Don't take in carre the boudary of the image.
- // Special cases for streamed call
+ // Don't take in carre the boudary of the image.
+ // Special cases for streamed call
if( modulusImage->GetRequestedRegion().GetIndex()[0] == 0)
{
id[0]++;
size[0]--;
if( modulusImage->GetRequestedRegion().GetSize()[0]+modulusImage->GetRequestedRegion().GetIndex()[0] == m_ImageSize[0])
- size[0]--;
+ size[0]--;
}
else if( modulusImage->GetRequestedRegion().GetSize()[0]+modulusImage->GetRequestedRegion().GetIndex()[0] == m_ImageSize[0])
{
@@ -203,7 +203,7 @@ LineSegmentDetector<TInputImage,TPrecision >
id[1]++;
size[1]--;
if( modulusImage->GetRequestedRegion().GetSize()[1]+modulusImage->GetRequestedRegion().GetIndex()[1] == m_ImageSize[1])
- size[1]--;
+ size[1]--;
}
else if( modulusImage->GetRequestedRegion().GetSize()[1]+modulusImage->GetRequestedRegion().GetIndex()[1] == m_ImageSize[1])
{
@@ -222,7 +222,7 @@ LineSegmentDetector<TInputImage,TPrecision >
OutputIndexType index = it.GetIndex();
unsigned int bin = static_cast<unsigned int> (static_cast<double>(it.Value())/lengthBin);
if( it.Value()- m_Threshold >1e-10 )
- tempHisto[NbBin-bin-1].push_back(it.GetIndex());
+ tempHisto[NbBin-bin-1].push_back(it.GetIndex());
++it;
}
@@ -253,9 +253,9 @@ LineSegmentDetector<TInputImage, TPrecision>
/** If the point is not yet computed */
if(!this->IsUsed(index))
- {
- this->GrowRegion(index);
- }
+ {
+ this->GrowRegion(index);
+ }
++ItIndexVector;
}
++ItCoordinateList;
@@ -476,7 +476,7 @@ LineSegmentDetector<TInputImage, TPrecision>
{
itLabel.SetIndex(index);
if( itLabel.Get() == 1 )
- isUsed = true;
+ isUsed = true;
}
else
{
@@ -487,7 +487,7 @@ LineSegmentDetector<TInputImage, TPrecision>
// radiusLabel.Fill(0);
// NeighborhoodLabelIteratorType itLabel(radiusLabel,m_UsedPointImage,
// m_UsedPointImage->GetRequestedRegion());
-//
+//
// itLabel.SetLocation(index);
// if(*(itLabel.GetCenterValue()) == 1)
// isUsed = true;
@@ -565,15 +565,15 @@ LineSegmentDetector<TInputImage, TPrecision>
InputIndexType NeighIndex = itNeigh.GetIndex(s);
double angleComp = itNeighDir.GetPixel(s);
- if(this->GetInput()->GetLargestPossibleRegion().IsInside(NeighIndex)) /** Check if the index is inside the image*/
- {
- if( !this->IsUsed(NeighIndex) && this->IsAligned(angleComp, regionAngle, m_Prec) )
- {
+ if(this->GetInput()->GetLargestPossibleRegion().IsInside(NeighIndex)) /** Check if the index is inside the image*/
+ {
+ if( !this->IsUsed(NeighIndex) && this->IsAligned(angleComp, regionAngle, m_Prec) )
+ {
- this->SetPixelToUsed(NeighIndex);
- reg.push_back(NeighIndex);
- }
- }
+ this->SetPixelToUsed(NeighIndex);
+ reg.push_back(NeighIndex);
+ }
+ }
++s;
}
}/** End Searching loop*/
diff --git a/Code/FeatureExtraction/otbLineSpatialObjectListToRightAnglePointSetFilter.h b/Code/FeatureExtraction/otbLineSpatialObjectListToRightAnglePointSetFilter.h
index ceb59fb3858f6671f44b0379d1c93cdd7d5c8f05..4212a676b793eb435bd3bb4f07029c39d91366cc 100644
--- a/Code/FeatureExtraction/otbLineSpatialObjectListToRightAnglePointSetFilter.h
+++ b/Code/FeatureExtraction/otbLineSpatialObjectListToRightAnglePointSetFilter.h
@@ -76,7 +76,7 @@ public:
typedef itk::VariableSizeMatrix<unsigned int> checkMatrixType;
/**
- * Public Methods :
+ * Public Methods :
* Get the Input Image & Get The input Image
*/
virtual InputImageType* GetInputImage();
@@ -95,11 +95,11 @@ protected:
/**
* Without the GenrateOutputInformation below it does not work
- * Because the ProcessObject class do a static_cast to allow memory and copy
+ * Because the ProcessObject class do a static_cast to allow memory and copy
* the output (here a pointset). It works fine with images but with pointsets
* no size is specified ...
* the aim of the GenerateOutputInformation below is to avoid the guilty static_cast
- *
+ *
*/
virtual void GenerateOutputInformation(){};
diff --git a/Code/FeatureExtraction/otbLineSpatialObjectListToRightAnglePointSetFilter.txx b/Code/FeatureExtraction/otbLineSpatialObjectListToRightAnglePointSetFilter.txx
index a91acae07595d923f0c77e44c1bb0adfb7a50db4..b28f6e37d0fad74ed9b948d3949dc45d05ca2c1a 100644
--- a/Code/FeatureExtraction/otbLineSpatialObjectListToRightAnglePointSetFilter.txx
+++ b/Code/FeatureExtraction/otbLineSpatialObjectListToRightAnglePointSetFilter.txx
@@ -99,37 +99,37 @@ LineSpatialObjectListToRightAnglePointSetFilter<TImage,TLinesList ,TPointSet>
while(itLinesListCur != itLinesListCurEnd )
{
/** Check If segments are already computed */
- if( segmentsUsedMatrix[counterTest][counterCur]== 0 && segmentsUsedMatrix[counterCur][counterTest] == 0 )
- {
+ if( segmentsUsedMatrix[counterTest][counterCur]== 0 && segmentsUsedMatrix[counterCur][counterTest] == 0 )
+ {
/** Set the segments to USED (== 1)*/
segmentsUsedMatrix[counterTest][counterCur] = 1;
segmentsUsedMatrix[counterCur][counterTest] = 1;
- /** Compute the angle formed by the two segments */
- double Angle = this->ComputeAngleFormedBySegments(*itLinesListTest, *itLinesListCur);
+ /** Compute the angle formed by the two segments */
+ double Angle = this->ComputeAngleFormedBySegments(*itLinesListTest, *itLinesListCur);
- /** Check if the angle is a right one */
+ /** Check if the angle is a right one */
if(vcl_abs(Angle - CONST_PI_2) <= m_ThresholdAngle )
- {
- /** Right angle coordinate*/
- PointType RightAngleCoordinate;
- RightAngleCoordinate = this->ComputeAngleRightCoordinate(*itLinesListTest, *itLinesListCur);
-
- /** Compute the distance between the two segments and the right angle formed by this segments*/
- double dist1 = this->ComputeDistanceFromPointToSegment(RightAngleCoordinate,*itLinesListTest);
- double dist2 = this->ComputeDistanceFromPointToSegment(RightAngleCoordinate,*itLinesListCur) ;
-
- /** Use Pythagore to compute the distance between the two segments*/
- double SegmentDistance = vcl_sqrt(dist1*dist1 + dist2*dist2);
-
-// if(this->ComputeDistanceFromPointToSegment(RightAngleCoordinate,*itLinesListTest) <m_ThresholdDistance &&
-// this->ComputeDistanceFromPointToSegment(RightAngleCoordinate,*itLinesListCur) <m_ThresholdDistance)
- if(SegmentDistance < m_ThresholdDistance)
- {
- /** If Right Angle & not so far from segments: Add it to the pointSet*/
- this->AddRightAngleToPointSet(RightAngleCoordinate , *itLinesListTest , *itLinesListCur );
- }
- }
+ {
+ /** Right angle coordinate*/
+ PointType RightAngleCoordinate;
+ RightAngleCoordinate = this->ComputeAngleRightCoordinate(*itLinesListTest, *itLinesListCur);
+
+ /** Compute the distance between the two segments and the right angle formed by this segments*/
+ double dist1 = this->ComputeDistanceFromPointToSegment(RightAngleCoordinate,*itLinesListTest);
+ double dist2 = this->ComputeDistanceFromPointToSegment(RightAngleCoordinate,*itLinesListCur) ;
+
+ /** Use Pythagore to compute the distance between the two segments*/
+ double SegmentDistance = vcl_sqrt(dist1*dist1 + dist2*dist2);
+
+// if(this->ComputeDistanceFromPointToSegment(RightAngleCoordinate,*itLinesListTest) <m_ThresholdDistance &&
+// this->ComputeDistanceFromPointToSegment(RightAngleCoordinate,*itLinesListCur) <m_ThresholdDistance)
+ if(SegmentDistance < m_ThresholdDistance)
+ {
+ /** If Right Angle & not so far from segments: Add it to the pointSet*/
+ this->AddRightAngleToPointSet(RightAngleCoordinate , *itLinesListTest , *itLinesListCur );
+ }
+ }
}
++counterCur;
++itLinesListCur;
@@ -141,7 +141,7 @@ LineSpatialObjectListToRightAnglePointSetFilter<TImage,TLinesList ,TPointSet>
/**
* Method : Compute Distance between a point and a segment
- *
+ *
*/
template <class TImage, class TLinesList , class TPointSet>
double
@@ -165,7 +165,7 @@ LineSpatialObjectListToRightAnglePointSetFilter<TImage,TLinesList ,TPointSet>
/**
* Method : Compute Angle formed by the two segments
- *
+ *
*/
template <class TImage, class TLinesList , class TPointSet>
double
@@ -179,7 +179,7 @@ LineSpatialObjectListToRightAnglePointSetFilter<TImage,TLinesList ,TPointSet>
}
/**
- * Method : ComputeDistanceBetweenSegments
+ * Method : ComputeDistanceBetweenSegments
*/
template <class TImage, class TLinesList , class TPointSet>
double
@@ -188,26 +188,26 @@ LineSpatialObjectListToRightAnglePointSetFilter<TImage,TLinesList ,TPointSet>
{
typename LineType::PointListType & pointsList = line->GetPoints();
typename LineType::PointListType::const_iterator itPoints = pointsList.begin();
- double Xp1 = (*itPoints).GetPosition()[0];
- double Yp1 = (*itPoints).GetPosition()[1];
+ double Xp1 = (*itPoints).GetPosition()[0];
+ double Yp1 = (*itPoints).GetPosition()[1];
++itPoints;
- double Xp2 = (*itPoints).GetPosition()[0];
+ double Xp2 = (*itPoints).GetPosition()[0];
double Yp2 = (*itPoints).GetPosition()[1];
//Compute the orientation
double dx = Xp1 - Xp2;
double dy = Yp1 - Yp2 ;
double orientation = vcl_atan2(dy,dx);
- if(orientation < 0)
+ if(orientation < 0)
orientation += CONST_PI;
- return orientation ;
+ return orientation ;
}
/**
- * Method : ComputeDistanceBetweenSegments
+ * Method : ComputeDistanceBetweenSegments
*/
template <class TImage, class TLinesList , class TPointSet>
typename LineSpatialObjectListToRightAnglePointSetFilter<TImage,TLinesList ,TPointSet>
@@ -221,11 +221,11 @@ LineSpatialObjectListToRightAnglePointSetFilter<TImage,TLinesList ,TPointSet>
typename LineType::PointListType & pointsList = lineSrc->GetPoints();
typename LineType::PointListType::const_iterator itPoints = pointsList.begin();
- double Xp1 = (*itPoints).GetPosition()[0];
- double Yp1 = (*itPoints).GetPosition()[1];
+ double Xp1 = (*itPoints).GetPosition()[0];
+ double Yp1 = (*itPoints).GetPosition()[1];
++itPoints;
- double Xp2 = (*itPoints).GetPosition()[0];
- double Yp2 = (*itPoints).GetPosition()[1];
+ double Xp2 = (*itPoints).GetPosition()[0];
+ double Yp2 = (*itPoints).GetPosition()[1];
/** Extract Indexes from the Dst line to instantiate the line iterator*/
typename LineType::PointListType &pointsListDst = lineDst->GetPoints();
@@ -250,7 +250,7 @@ LineSpatialObjectListToRightAnglePointSetFilter<TImage,TLinesList ,TPointSet>
if(Xp1 < Xp2 )
LengthSegmentAy = Yp2 - Yp1;
- else
+ else
LengthSegmentAy = Yp1 - Yp2;
slopeA = LengthSegmentAy/(Xp2-Xp1);
@@ -262,7 +262,7 @@ LineSpatialObjectListToRightAnglePointSetFilter<TImage,TLinesList ,TPointSet>
if(Xq1 < Xq2 )
lengthSegmentBy = Yq2 - Yq1;
- else
+ else
lengthSegmentBy = Yq1 - Yq2;
slopeB = lengthSegmentBy/(Xq2-Xq1);
@@ -298,7 +298,7 @@ LineSpatialObjectListToRightAnglePointSetFilter<TImage,TLinesList ,TPointSet>
VectorLineType vectorLine;
vectorLine.push_back(LineDst);
vectorLine.push_back(LineCur);
- m_OutputPointSet->SetPointData(CurrentPos , vectorLine);
+ m_OutputPointSet->SetPointData(CurrentPos , vectorLine);
}
/**
diff --git a/Code/FeatureExtraction/otbRegionImageToRectangularPathListFilter.h b/Code/FeatureExtraction/otbRegionImageToRectangularPathListFilter.h
index 6dc5de27a39a5a79ccc1a054ab01d2e8189b3eb3..9ec94f9d6a55592a75e9713d84d5392386c4954c 100644
--- a/Code/FeatureExtraction/otbRegionImageToRectangularPathListFilter.h
+++ b/Code/FeatureExtraction/otbRegionImageToRectangularPathListFilter.h
@@ -10,8 +10,8 @@
See OTBCopyright.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.
=========================================================================*/
@@ -33,7 +33,7 @@ namespace otb
/** \class RegionImageToRectangularPathListFilter
* \class ImageToPathListAlignFilter
- * \brief Base class used to implement filter to model regions by rectangles.
+ * \brief Base class used to implement filter to model regions by rectangles.
*
*/
template <class TInputImage, class TOutputPath>
@@ -60,13 +60,13 @@ public:
/** Some convenient typedefs. */
typedef typename Superclass::OutputPathListType OutputPathListType;
- typedef typename Superclass::InputImageType InputImageType;
- typedef typename Superclass::InputImageRegionType InputImageRegionType;
+ typedef typename Superclass::InputImageType InputImageType;
+ typedef typename Superclass::InputImageRegionType InputImageRegionType;
typedef typename InputImageType::Pointer InputImagePointer;
typedef typename InputImageType::ConstPointer InputImageConstPointer;
- typedef typename InputImageType::SizeType SizeType;
- typedef typename InputImageType::ValueType ValueType;
+ typedef typename InputImageType::SizeType SizeType;
+ typedef typename InputImageType::ValueType ValueType;
typedef typename InputImageType::PixelType PixelType;
typedef typename Superclass::OutputPathType OutputPathType;
@@ -77,7 +77,7 @@ public:
//typedef typename itk::NumericTraits<PixelType>::RealType RealType;
typedef double RealType;
// typedef typename itk::Image<RealType,InputImageDimension> RealImageType;
- typedef typename otb::Image<RealType,InputImageDimension> RealImageType;
+ typedef typename otb::Image<RealType,InputImageDimension> RealImageType;
typedef typename RealImageType::Pointer RealImageTypePointer;
typedef typename RealImageType::IndexType RealImageTypeIndexType;
diff --git a/Code/FeatureExtraction/otbRegionImageToRectangularPathListFilter.txx b/Code/FeatureExtraction/otbRegionImageToRectangularPathListFilter.txx
index 511fbb8f41d61fc318da63bb165837ea4667ead0..a0ba14cb6daecdaeafb04f3f5a50f020843cf9b5 100644
--- a/Code/FeatureExtraction/otbRegionImageToRectangularPathListFilter.txx
+++ b/Code/FeatureExtraction/otbRegionImageToRectangularPathListFilter.txx
@@ -10,8 +10,8 @@
See OTBCopyright.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.
=========================================================================*/
@@ -21,7 +21,7 @@
#ifndef __otbRegionImageToRectangularPathListFilter_txx
#define __otbRegionImageToRectangularPathListFilter_txx
-#include <iostream>
+#include <iostream>
#include <exception>
#include "otbRegionImageToRectangularPathListFilter.h"
#include "itkImageRegionIterator.h"
@@ -32,7 +32,7 @@
#include "itkNumericTraits.h"
#include "itkImageLinearConstIteratorWithIndex.h"
#include "itkImageLinearIteratorWithIndex.h"
-#include "otbMath.h"
+#include "otbMath.h"
#include "itkBinaryThresholdImageFunction.h"
#include "itkNeighborhoodBinaryThresholdImageFunction.h"
#include "itkFloodFilledImageFunctionConditionalIterator.h"
@@ -67,18 +67,18 @@ template <class TInputImage, class TOutputPath>
void
RegionImageToRectangularPathListFilter<TInputImage,TOutputPath>
::GenerateData(void)
-{
+{
typename InputImageType::SizeType Taille;
//this->DebugOn();
//itkDebugMacro(<< "RegionImageToRectangularPathListFilter::GenerateData() called");
- // Get the input and output pointers
+ // Get the input and output pointers
const InputImageType * InputImage = this->GetInput();
OutputPathListType * OutputPath = this->GetOutput();
// Generate the image
-/* Filter algorithm */
+/* Filter algorithm */
Taille = InputImage->GetLargestPossibleRegion().GetSize();
itkDebugMacro(<< "Input image size : " << Taille);
@@ -220,8 +220,8 @@ RegionImageToRectangularPathListFilter<TInputImage,TOutputPath>
adevXY = vcl_sqrt(crossTermAXY) / n;
// Compute eigenvalues and eigenvectors of variance-covariance matrix (for DIRECTION)
- double delta,
- l1, l2, /* eigenvalues */
+ double delta,
+ l1, l2, /* eigenvalues */
y1, y2, /* eigenvectors y coordinate, for x = 1*/
x1 = 1, /* first eigenvector x coordinate */
x2 = 1, /* second eigenvector x coordinate, 1 except in special case when covarXY == 0 */
@@ -239,8 +239,8 @@ RegionImageToRectangularPathListFilter<TInputImage,TOutputPath>
}
// Compute eigenvalues and eigenvectors of absolute mean deviation matrix (for PROPORTIONS)
- double adelta,
- al1, al2, /* eigenvalues */
+ double adelta,
+ al1, al2, /* eigenvalues */
ay1, ay2, /* eigenvectors y coordinate, for x = 1*/
ax1 = 1, /* first eigenvector x coordinate */
ax2 = 1; /* second eigenvector x coordinate, 1 except in special case when covarXY == 0 */
@@ -341,7 +341,7 @@ RegionImageToRectangularPathListFilter<TInputImage,TOutputPath>
// Build rectangle list, converting image coordinates into physical coordinates
typedef typename OutputPathType::ContinuousIndexType ContinuousIndexType;
- ContinuousIndexType point;
+ ContinuousIndexType point;
OutputPathPointerType path = OutputPathType::New();
@@ -387,7 +387,7 @@ RegionImageToRectangularPathListFilter<TInputImage,TOutputPath>
itkDebugMacro(<< "ImageToPathListAlignFilter::GenerateData() finished");
-} // end update function
+} // end update function
template <class TInputImage, class TOutputPath>
diff --git a/Code/FeatureExtraction/otbSFSTexturesFunctor.h b/Code/FeatureExtraction/otbSFSTexturesFunctor.h
index f915ffefe96e1846c5e0ab1f8a5eeae91c773643..f7d2579a23face6050e1d902e2ff2cbc79edf6c2 100644
--- a/Code/FeatureExtraction/otbSFSTexturesFunctor.h
+++ b/Code/FeatureExtraction/otbSFSTexturesFunctor.h
@@ -165,11 +165,11 @@ public:
maxSorted.pop_back();
doo=true;
}
- // Some visual plateform segfault at the ++ when the previous condition is checked
- // even if a -- is done.
- // Seems to be due to std::vector::insert that change the pointer.
- if( !doo )
- ++itVector;
+ // Some visual plateform segfault at the ++ when the previous condition is checked
+ // even if a -- is done.
+ // Seems to be due to std::vector::insert that change the pointer.
+ if( !doo )
+ ++itVector;
}
doo = false;
itVector = minSorted.begin();
@@ -179,13 +179,13 @@ public:
{
minSorted.insert(itVector, dist);
minSorted.pop_back();
- doo=true;
+ doo=true;
}
- // Some visual plateform segfault at the ++ when the previous condition is checked
- // even if a -- is done.
- // Seems to be due to std::vector::insert that change the pointer.
- if( !doo )
- ++itVector;
+ // Some visual plateform segfault at the ++ when the previous condition is checked
+ // even if a -- is done.
+ // Seems to be due to std::vector::insert that change the pointer.
+ if( !doo )
+ ++itVector;
}
}
diff --git a/Code/FeatureExtraction/otbSFSTexturesImageFilter.txx b/Code/FeatureExtraction/otbSFSTexturesImageFilter.txx
index 8827dcb2d94c2dfd3eb435655823f938735b1453..b669e7c2049ed992ef9c67322c42c8750c512d61 100644
--- a/Code/FeatureExtraction/otbSFSTexturesImageFilter.txx
+++ b/Code/FeatureExtraction/otbSFSTexturesImageFilter.txx
@@ -117,7 +117,7 @@ SFSTexturesImageFilter<TInputImage, TOutputImage>
return static_cast<OutputImageType * >(this->itk::ProcessObject::GetOutput(1) );
}
-//Return output PSI image
+//Return output PSI image
template <class TInputImage, class TOutputImage>
const typename SFSTexturesImageFilter<TInputImage, TOutputImage>::OutputImageType *
SFSTexturesImageFilter<TInputImage, TOutputImage>
@@ -408,12 +408,12 @@ SFSTexturesImageFilter<TInputImage, TOutputImage>
while ( !outputIt1.IsAtEnd() )
{
- outputFunctor = m_FunctorList[threadId]( neighInputIt);
+ outputFunctor = m_FunctorList[threadId]( neighInputIt);
for(unsigned int i = 0; i<outItList.size(); ++i)
{
if( textStatus[i]==true )
(*outItList[i]).Set( outputFunctor[i] );
- }
+ }
++neighInputIt;
for(unsigned int i = 0; i<outItList.size(); ++i)
diff --git a/Code/FeatureExtraction/otbSiftFastImageFilter.txx b/Code/FeatureExtraction/otbSiftFastImageFilter.txx
index 6b23f131ddccc6c77d10185af399f293770bad2e..3e8deabcc2bc3b00b3c8d2ca989138d4e1fa8ae5 100644
--- a/Code/FeatureExtraction/otbSiftFastImageFilter.txx
+++ b/Code/FeatureExtraction/otbSiftFastImageFilter.txx
@@ -93,7 +93,7 @@ SiftFastImageFilter<TInputImage,TOutputPointSet>
outputPointSet->SetPoint(numkeys,point);
outputPointSet->SetPointData(numkeys,data);
- //Fill the current point and its orientation
+ //Fill the current point and its orientation
std::pair< OutputPointType,double> pair;
pair.first = point;
pair.second = key->ori;
diff --git a/Code/FeatureExtraction/otbSqrtSpectralAngleFunctor.h b/Code/FeatureExtraction/otbSqrtSpectralAngleFunctor.h
index b582d53cbc0267b16005c87ddc1fb6e1cbda868f..67ff67f72f28dc3f9f03bbb31a0d69624ff68326 100644
--- a/Code/FeatureExtraction/otbSqrtSpectralAngleFunctor.h
+++ b/Code/FeatureExtraction/otbSqrtSpectralAngleFunctor.h
@@ -10,8 +10,8 @@ Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
See OTBCopyright.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.
=========================================================================*/
diff --git a/Code/FeatureExtraction/otbUrbanAreaDetectionImageFilter.h b/Code/FeatureExtraction/otbUrbanAreaDetectionImageFilter.h
index d47bc7aad0076193ef59d4a57efb93f666d8d045..a030e0fe178966e9fcec957778b77e5c135cec70 100644
--- a/Code/FeatureExtraction/otbUrbanAreaDetectionImageFilter.h
+++ b/Code/FeatureExtraction/otbUrbanAreaDetectionImageFilter.h
@@ -11,8 +11,8 @@ Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
See OTBCopyright.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.
=========================================================================*/
@@ -158,7 +158,7 @@ protected:
* \brief where the white areas represents the urban areas.
*/
template <class TInputImage, class TOutputImage,
- class TFunction = Functor::RadiometricNonWaterNonVegetationIndexFunctor<
+ class TFunction = Functor::RadiometricNonWaterNonVegetationIndexFunctor<
typename TInputImage::PixelType,
typename TOutputImage::PixelType> >
class ITK_EXPORT UrbanAreaDetectionImageFilter :
diff --git a/Code/GeospatialAnalysis/otbGISTableFunction.h b/Code/GeospatialAnalysis/otbGISTableFunction.h
index a783a65807c9021a22c41a1b3640d08101ec0c85..deb6746f769758eb13132340ca5e1649a747d55a 100644
--- a/Code/GeospatialAnalysis/otbGISTableFunction.h
+++ b/Code/GeospatialAnalysis/otbGISTableFunction.h
@@ -32,8 +32,8 @@ namespace otb
* a const transaction on a GISTable.
*
* The input table is set via method SetInputTable().
- *
- *
+ *
+ *
* \sa GISTable
* \sa GISConnection
*
diff --git a/Code/GeospatialAnalysis/otbPostGISCreateTableTransactor.cxx b/Code/GeospatialAnalysis/otbPostGISCreateTableTransactor.cxx
index bec314bcef46ba8bc640af1d55fb3cb2ce94305e..238d10bdc0e295263197446f627a1759dcffabf6 100644
--- a/Code/GeospatialAnalysis/otbPostGISCreateTableTransactor.cxx
+++ b/Code/GeospatialAnalysis/otbPostGISCreateTableTransactor.cxx
@@ -63,7 +63,7 @@ void PostGISCreateTableTransactor::operator()(pqxx::nontransaction &T)
std::stringstream createCommand;
createCommand << "CREATE TABLE "<< m_TableName
- <<" (id serial PRIMARY KEY, genre TEXT);";
+ <<" (id serial PRIMARY KEY, genre TEXT);";
otbGenericMsgDebugMacro(<<"Create Command " << createCommand.str());
m_Result = T.exec(createCommand.str());
diff --git a/Code/GeospatialAnalysis/otbPostGISCreateTableTransactor.h b/Code/GeospatialAnalysis/otbPostGISCreateTableTransactor.h
index 483a442a0cc934b82b74efd2c72b637a9392a321..595eebfddcc60bb53a7d162adbdaea1722bdbb7c 100644
--- a/Code/GeospatialAnalysis/otbPostGISCreateTableTransactor.h
+++ b/Code/GeospatialAnalysis/otbPostGISCreateTableTransactor.h
@@ -28,13 +28,13 @@ namespace otb
/** \class PostGISCreateTableTransactor
- * \brief PQXX-based transactor for creating PostGIS tables
+ * \brief PQXX-based transactor for creating PostGIS tables
+ *
*
- *
* The copy constructor and the "=" operator have to be defined for
* deep copy, so that libpqxx is able to get the values set for the
* class variables.
- *
+ *
*
* \ingroup GISTransactors
*/
diff --git a/Code/GeospatialAnalysis/otbPostGISFromStringTransactor.cxx b/Code/GeospatialAnalysis/otbPostGISFromStringTransactor.cxx
index fc9f7cf3b896505383231891ce78b27f527e92e2..d349caa204ef7267fde27609720ec1c3ed6cc097 100644
--- a/Code/GeospatialAnalysis/otbPostGISFromStringTransactor.cxx
+++ b/Code/GeospatialAnalysis/otbPostGISFromStringTransactor.cxx
@@ -36,7 +36,7 @@ PostGISFromStringTransactor::PostGISFromStringTransactor(const PostGISFromString
PostGISFromStringTransactor& PostGISFromStringTransactor::operator=(const PostGISFromStringTransactor& pgt) throw() {
m_TransactionString = pgt.GetTransactionString();
return *this;
-}
+}
void PostGISFromStringTransactor::operator()(pqxx::nontransaction &T)
{
diff --git a/Code/GeospatialAnalysis/otbPostGISFromStringTransactor.h b/Code/GeospatialAnalysis/otbPostGISFromStringTransactor.h
index 1cf69b812c55824d55ede68f31bf22533e2fc42e..cbf0d1bebc7f8786b34f054db0312b59d1cc0599 100644
--- a/Code/GeospatialAnalysis/otbPostGISFromStringTransactor.h
+++ b/Code/GeospatialAnalysis/otbPostGISFromStringTransactor.h
@@ -28,13 +28,13 @@ namespace otb
/** \class PostGISFromStringTransactor
- * \brief PQXX-based transactor for executing PostGIS queries.
+ * \brief PQXX-based transactor for executing PostGIS queries.
+ *
*
- *
* The copy constructor and the "=" operator have to be defined for
* deep copy, so that libpqxx is able to get the values set for the
* class variables.
- *
+ *
*
* \ingroup GISTransactors
*/
diff --git a/Code/GeospatialAnalysis/otbPostGISQueryTransactor.cxx b/Code/GeospatialAnalysis/otbPostGISQueryTransactor.cxx
index ee463bc1a2731116a161de5e2470468ea9dc6d5b..dd65a4169b36643591e6fa755969695fda2dc9e5 100644
--- a/Code/GeospatialAnalysis/otbPostGISQueryTransactor.cxx
+++ b/Code/GeospatialAnalysis/otbPostGISQueryTransactor.cxx
@@ -23,7 +23,7 @@
namespace otb
{
-PostGISQueryTransactor::PostGISQueryTransactor() : PostGISQueryTransactor::Superclass()
+PostGISQueryTransactor::PostGISQueryTransactor() : PostGISQueryTransactor::Superclass()
{
m_ViewName = "default_view";
}
@@ -32,14 +32,14 @@ PostGISQueryTransactor::PostGISQueryTransactor(const PostGISQueryTransactor& pgt
: PostGISQueryTransactor::Superclass()
{
m_TransactionString = pgt.GetTransactionString();
- m_ViewName = pgt.GetViewName();
+ m_ViewName = pgt.GetViewName();
}
PostGISQueryTransactor& PostGISQueryTransactor::operator=(const PostGISQueryTransactor& pgt) throw() {
m_TransactionString = pgt.GetTransactionString();
m_ViewName = pgt.GetViewName();
return *this;
-}
+}
void PostGISQueryTransactor::operator()(pqxx::nontransaction &T)
{
diff --git a/Code/GeospatialAnalysis/otbPostGISQueryTransactor.h b/Code/GeospatialAnalysis/otbPostGISQueryTransactor.h
index d89ab81cdb754bb0b7a6d4b3fc75e0a0377e163b..bd17bedf2455380806eaca3c059bebb1770529b2 100644
--- a/Code/GeospatialAnalysis/otbPostGISQueryTransactor.h
+++ b/Code/GeospatialAnalysis/otbPostGISQueryTransactor.h
@@ -28,13 +28,13 @@ namespace otb
/** \class PostGISQueryTransactor
- * \brief PQXX-based transactor for executing PostGIS queries.
+ * \brief PQXX-based transactor for executing PostGIS queries.
+ *
*
- *
* The copy constructor and the "=" operator have to be defined for
* deep copy, so that libpqxx is able to get the values set for the
* class variables.
- *
+ *
*
* \ingroup GISTransactors
*/
diff --git a/Code/GeospatialAnalysis/otbTransactorGISTableFunction.h b/Code/GeospatialAnalysis/otbTransactorGISTableFunction.h
index 7029eed84f26eb557dd5a9e068a15271745250fa..f92bcbb6bbe0aec9ea01b8e31ba125b7193d8ea6 100644
--- a/Code/GeospatialAnalysis/otbTransactorGISTableFunction.h
+++ b/Code/GeospatialAnalysis/otbTransactorGISTableFunction.h
@@ -30,8 +30,8 @@ namespace otb
* TransactorGISTableFunction is a baseclass for all objects that evaluate
* a const transaction on a GISTable using an external transactor.
*
- *
- *
+ *
+ *
*
* \ingroup TransactorGISTableFunctions
*/
diff --git a/Code/IO/otbDefaultImageMetadataInterface.h b/Code/IO/otbDefaultImageMetadataInterface.h
index a8d0e22769302f313159fc398ed77a380321d9ab..24767e1ce8cc5a482c503d32467beba444ef13eb 100644
--- a/Code/IO/otbDefaultImageMetadataInterface.h
+++ b/Code/IO/otbDefaultImageMetadataInterface.h
@@ -56,98 +56,98 @@ public:
/** Get the radiometric bias from the ossim metadata */
VariableLengthVectorType GetPhysicalBias( const MetaDataDictionaryType & ) const
{
- itkExceptionMacro("GetPhysicalBias not implemented in DefaultImageMetadataInterface, no captor type found");
+ itkExceptionMacro("GetPhysicalBias not implemented in DefaultImageMetadataInterface, no captor type found");
};
/** Get the radiometric gain from the ossim metadata */
VariableLengthVectorType GetPhysicalGain( const MetaDataDictionaryType & ) const
{
- itkExceptionMacro("GetPhysicalGain not implemented in DefaultImageMetadataInterface, no captor type found");
+ itkExceptionMacro("GetPhysicalGain not implemented in DefaultImageMetadataInterface, no captor type found");
};
/** Get the solar irradiance from the ossim metadata */
VariableLengthVectorType GetSolarIrradiance( const MetaDataDictionaryType & ) const
{
- itkExceptionMacro("GetSolarIrradiance not implemented in DefaultImageMetadataInterface, no captor type found");
+ itkExceptionMacro("GetSolarIrradiance not implemented in DefaultImageMetadataInterface, no captor type found");
};
/** Get the imaging acquisition day from the ossim metadata */
int GetDay( const MetaDataDictionaryType & ) const
{
- itkExceptionMacro("GetDay not implemented in DefaultImageMetadataInterface, no captor type found");
+ itkExceptionMacro("GetDay not implemented in DefaultImageMetadataInterface, no captor type found");
};
/** Get the imaging acquisition month from the ossim metadata */
int GetMonth( const MetaDataDictionaryType & ) const
{
- itkExceptionMacro("GetMonth not implemented in DefaultImageMetadataInterface, no captor type found");
+ itkExceptionMacro("GetMonth not implemented in DefaultImageMetadataInterface, no captor type found");
};
/** Get the imaging acquisition year from the ossim metadata */
int GetYear( const MetaDataDictionaryType & ) const
{
- itkExceptionMacro("GetYear not implemented in DefaultImageMetadataInterface, no captor type found");
+ itkExceptionMacro("GetYear not implemented in DefaultImageMetadataInterface, no captor type found");
};
/** Get the imaging acquisition hour from the ossim metadata */
int GetHour( const MetaDataDictionaryType & ) const
{
- itkExceptionMacro("GetHour not implemented in DefaultImageMetadataInterface, no captor type found");
+ itkExceptionMacro("GetHour not implemented in DefaultImageMetadataInterface, no captor type found");
};
/** Get the imaging acquisition minute from the ossim metadata */
int GetMinute( const MetaDataDictionaryType & ) const
{
- itkExceptionMacro("GetMinute not implemented in DefaultImageMetadataInterface, no captor type found");
+ itkExceptionMacro("GetMinute not implemented in DefaultImageMetadataInterface, no captor type found");
};
/** Get the imaging production day from the ossim metadata */
int GetProductionDay( const MetaDataDictionaryType & ) const
{
- itkExceptionMacro("GetProductionDay not implemented in DefaultImageMetadataInterface, no captor type found");
+ itkExceptionMacro("GetProductionDay not implemented in DefaultImageMetadataInterface, no captor type found");
};
/** Get the imaging production month from the ossim metadata */
int GetProductionMonth( const MetaDataDictionaryType & ) const
{
- itkExceptionMacro("GetProductionMonth not implemented in DefaultImageMetadataInterface, no captor type found");
+ itkExceptionMacro("GetProductionMonth not implemented in DefaultImageMetadataInterface, no captor type found");
};
/** Get the imaging production year from the ossim metadata */
int GetProductionYear( const MetaDataDictionaryType & ) const
{
- itkExceptionMacro("GetProductionYear not implemented in DefaultImageMetadataInterface, no captor type found");
+ itkExceptionMacro("GetProductionYear not implemented in DefaultImageMetadataInterface, no captor type found");
};
/** Get the sat elevation from the ossim metadata */
double GetSatElevation( const MetaDataDictionaryType & ) const
{
- itkExceptionMacro("GetSatElevation not implemented in DefaultImageMetadataInterface, no captor type found");
+ itkExceptionMacro("GetSatElevation not implemented in DefaultImageMetadataInterface, no captor type found");
};
/** Get the sat azimuth from the ossim metadata */
double GetSatAzimuth( const MetaDataDictionaryType & ) const
{
- itkExceptionMacro("GetSatElevation not implemented in DefaultImageMetadataInterface, no captor type found");
+ itkExceptionMacro("GetSatElevation not implemented in DefaultImageMetadataInterface, no captor type found");
};
/** Get the first wavelength for the spectral band definition */
VariableLengthVectorType GetFirstWavelengths( const MetaDataDictionaryType & ) const
{
- itkExceptionMacro("GetFirstWavelengths not implemented in DefaultImageMetadataInterface, no captor type found");
+ itkExceptionMacro("GetFirstWavelengths not implemented in DefaultImageMetadataInterface, no captor type found");
};
/** Get the last wavelength for the spectral band definition */
VariableLengthVectorType GetLastWavelengths( const MetaDataDictionaryType & ) const
{
- itkExceptionMacro("GetLastWavelengths not implemented in DefaultImageMetadataInterface, no captor type found");
+ itkExceptionMacro("GetLastWavelengths not implemented in DefaultImageMetadataInterface, no captor type found");
};
bool CanRead( const MetaDataDictionaryType & ) const
{
- // This clas is the default one, it has to be able to call every metadata
- return true;
+ // This clas is the default one, it has to be able to call every metadata
+ return true;
};
protected:
diff --git a/Code/IO/otbIkonosImageMetadataInterface.cxx b/Code/IO/otbIkonosImageMetadataInterface.cxx
index a11002f6715de88ebbd5e6f221cc464395273809..c74ee6336bcf898c804efa8d714c35c593602288 100755
--- a/Code/IO/otbIkonosImageMetadataInterface.cxx
+++ b/Code/IO/otbIkonosImageMetadataInterface.cxx
@@ -53,7 +53,7 @@ IkonosImageMetadataInterface::GetSolarIrradiance( const MetaDataDictionaryType &
{
if( !this->CanRead( dict ) )
{
- itkExceptionMacro(<<"Invalid Metadata, no Ikonos Image");
+ itkExceptionMacro(<<"Invalid Metadata, no Ikonos Image");
}
ImageKeywordlistType imageKeywordlist;
@@ -72,25 +72,25 @@ IkonosImageMetadataInterface::GetSolarIrradiance( const MetaDataDictionaryType &
std::string key= "support_data.band_name";
ossimString keywordString = kwl.find(key.c_str());
if(keywordString=="Pan")
- {
- outputValuesVariableLengthVector[0] = 1375.8;
- }
+ {
+ outputValuesVariableLengthVector[0] = 1375.8;
+ }
else if(keywordString=="Blue")
- {
- outputValuesVariableLengthVector[0] = 1930.9;
- }
+ {
+ outputValuesVariableLengthVector[0] = 1930.9;
+ }
else if(keywordString=="Green")
- {
- outputValuesVariableLengthVector[0] = 1854.8;
- }
+ {
+ outputValuesVariableLengthVector[0] = 1854.8;
+ }
else if(keywordString=="Red")
- {
- outputValuesVariableLengthVector[0] = 1556.5;
- }
+ {
+ outputValuesVariableLengthVector[0] = 1556.5;
+ }
else if(keywordString=="NIR")
- {
- outputValuesVariableLengthVector[0] = 1156.9;
- }
+ {
+ outputValuesVariableLengthVector[0] = 1156.9;
+ }
return outputValuesVariableLengthVector;
}
@@ -101,7 +101,7 @@ IkonosImageMetadataInterface::GetDay( const MetaDataDictionaryType & dict ) cons
{
if( !this->CanRead( dict ) )
{
- itkExceptionMacro(<<"Invalid Metadata, no Ikonos Image");
+ itkExceptionMacro(<<"Invalid Metadata, no Ikonos Image");
}
ImageKeywordlistType imageKeywordlist;
@@ -138,7 +138,7 @@ IkonosImageMetadataInterface::GetMonth( const MetaDataDictionaryType & dict ) co
{
if( !this->CanRead( dict ) )
{
- itkExceptionMacro(<<"Invalid Metadata, no Ikonos Image");
+ itkExceptionMacro(<<"Invalid Metadata, no Ikonos Image");
}
ImageKeywordlistType imageKeywordlist;
@@ -173,7 +173,7 @@ IkonosImageMetadataInterface::GetHour( const MetaDataDictionaryType & dict ) con
{
if( !this->CanRead( dict ) )
{
- itkExceptionMacro(<<"Invalid Metadata, no Ikonos Image");
+ itkExceptionMacro(<<"Invalid Metadata, no Ikonos Image");
}
ImageKeywordlistType imageKeywordlist;
@@ -209,7 +209,7 @@ IkonosImageMetadataInterface::GetMinute( const MetaDataDictionaryType & dict ) c
{
if( !this->CanRead( dict ) )
{
- itkExceptionMacro(<<"Invalid Metadata, no Ikonos Image");
+ itkExceptionMacro(<<"Invalid Metadata, no Ikonos Image");
}
ImageKeywordlistType imageKeywordlist;
@@ -245,7 +245,7 @@ IkonosImageMetadataInterface::GetYear( const MetaDataDictionaryType & dict ) con
{
if( !this->CanRead( dict ) )
{
- itkExceptionMacro(<<"Invalid Metadata, no Ikonos Image");
+ itkExceptionMacro(<<"Invalid Metadata, no Ikonos Image");
}
ImageKeywordlistType imageKeywordlist;
@@ -281,7 +281,7 @@ IkonosImageMetadataInterface::GetProductionDay( const MetaDataDictionaryType & d
{
if( !this->CanRead( dict ) )
{
- itkExceptionMacro(<<"Invalid Metadata, no Ikonos Image");
+ itkExceptionMacro(<<"Invalid Metadata, no Ikonos Image");
}
ImageKeywordlistType imageKeywordlist;
@@ -318,7 +318,7 @@ IkonosImageMetadataInterface::GetProductionMonth( const MetaDataDictionaryType &
{
if( !this->CanRead( dict ) )
{
- itkExceptionMacro(<<"Invalid Metadata, no Ikonos Image");
+ itkExceptionMacro(<<"Invalid Metadata, no Ikonos Image");
}
ImageKeywordlistType imageKeywordlist;
@@ -353,7 +353,7 @@ IkonosImageMetadataInterface::GetProductionYear( const MetaDataDictionaryType &
{
if( !this->CanRead( dict ) )
{
- itkExceptionMacro(<<"Invalid Metadata, no Ikonos Image");
+ itkExceptionMacro(<<"Invalid Metadata, no Ikonos Image");
}
ImageKeywordlistType imageKeywordlist;
@@ -395,7 +395,7 @@ IkonosImageMetadataInterface
{
if( !this->CanRead( dict ) )
{
- itkExceptionMacro(<<"Invalid Metadata, no Ikonos Image");
+ itkExceptionMacro(<<"Invalid Metadata, no Ikonos Image");
}
VariableLengthVectorType outputValuesVariableLengthVector;
@@ -412,7 +412,7 @@ IkonosImageMetadataInterface
{
if( !this->CanRead( dict ) )
{
- itkExceptionMacro(<<"Invalid Metadata, no Ikonos Image");
+ itkExceptionMacro(<<"Invalid Metadata, no Ikonos Image");
}
int productionYear = this->GetProductionYear(dict);
@@ -480,7 +480,7 @@ IkonosImageMetadataInterface::GetSatElevation( const MetaDataDictionaryType & di
{
if( !this->CanRead( dict ) )
{
- itkExceptionMacro(<<"Invalid Metadata, no Ikonos Image");
+ itkExceptionMacro(<<"Invalid Metadata, no Ikonos Image");
}
ImageKeywordlistType imageKeywordlist;
@@ -503,7 +503,7 @@ IkonosImageMetadataInterface::GetSatAzimuth( const MetaDataDictionaryType & dict
{
if( !this->CanRead( dict ) )
{
- itkExceptionMacro(<<"Invalid Metadata, no Ikonos Image");
+ itkExceptionMacro(<<"Invalid Metadata, no Ikonos Image");
}
ImageKeywordlistType imageKeywordlist;
@@ -573,7 +573,7 @@ IkonosImageMetadataInterface
{
if( !this->CanRead( dict ) )
{
- itkExceptionMacro(<<"Invalid Metadata, no Ikonos Image");
+ itkExceptionMacro(<<"Invalid Metadata, no Ikonos Image");
}
ImageKeywordlistType imageKeywordlist;
diff --git a/Code/IO/otbImage.h b/Code/IO/otbImage.h
index 360671c92c14f955690c07a0dbaa717f704df2c3..8641ca72dff8087c78a31c395936a1e32d102c8a 100644
--- a/Code/IO/otbImage.h
+++ b/Code/IO/otbImage.h
@@ -190,7 +190,7 @@ private:
Image(const Self&); //purposely not implemented
void operator=(const Self&); //purposely not implemented
- /** Only here to have access to projection and coordinates datas.
+ /** Only here to have access to projection and coordinates datas.
Those method will disappear.
Use Default because don't need to know the sensor type*/
typename DefaultImageMetadataInterface::Pointer m_ImageMetadataInterface;
diff --git a/Code/IO/otbImageFileWriter.h b/Code/IO/otbImageFileWriter.h
index 9ae3ee5a20a52a523dd20e3c4ac034c3164ae495..7c912068e37a2969187e33622d58fe7f09edc4ab 100644
--- a/Code/IO/otbImageFileWriter.h
+++ b/Code/IO/otbImageFileWriter.h
@@ -72,7 +72,7 @@ public:
/** Type use to define number of divisions */
typedef StreamingMode CalculationDivisionEnumType;
- /** A special Write() method. It invokes the creating of the
+ /** A special Write() method. It invokes the creating of the
* specific otb::ImageIOFactory.
*/
virtual void Write(void);
diff --git a/Code/IO/otbImageFileWriter.txx b/Code/IO/otbImageFileWriter.txx
index ea5f2ac0da9dc64f3ff7590cf63b00a76b76f5c6..d04d4ae503820935e8906f7406d7bc9b5e2106ed 100644
--- a/Code/IO/otbImageFileWriter.txx
+++ b/Code/IO/otbImageFileWriter.txx
@@ -43,7 +43,7 @@ ImageFileWriter<TInputImage>
// create default region splitter
m_RegionSplitterUseToEstimateNumberOfStreamDivisions = itk::ImageRegionSplitter<InputImageDimension>::New();
- this->Superclass::SetNumberOfStreamDivisions(10);
+ this->Superclass::SetNumberOfStreamDivisions(10);
}
diff --git a/Code/IO/otbImageMetadataInterfaceBase.cxx b/Code/IO/otbImageMetadataInterfaceBase.cxx
index 39ba59ab32e30098654d640e09ad1cf8ac10de89..df61387cf7e3b95fad026abbc711cedb0dc72f4e 100644
--- a/Code/IO/otbImageMetadataInterfaceBase.cxx
+++ b/Code/IO/otbImageMetadataInterfaceBase.cxx
@@ -83,7 +83,7 @@ ImageMetadataInterfaceBase::GetGCPCount( const MetaDataDictionaryType & dict) co
}
-OTB_GCP &
+OTB_GCP &
ImageMetadataInterfaceBase::GetGCPs( MetaDataDictionaryType & dict, unsigned int GCPnum )
{
std::string key;
@@ -237,7 +237,7 @@ ImageMetadataInterfaceBase::GetGCPZ( const MetaDataDictionaryType & dict, unsign
}
-ImageMetadataInterfaceBase::VectorType
+ImageMetadataInterfaceBase::VectorType
ImageMetadataInterfaceBase::GetGeoTransform( const MetaDataDictionaryType & dict ) const
{
VectorType adfGeoTransform;
diff --git a/Code/IO/otbImageMetadataInterfaceFactory.h b/Code/IO/otbImageMetadataInterfaceFactory.h
index a6d600915fde66aa02a7049f2f2bfc8b85790980..0dde69e917446f8812395ab329644ff1ccb53063 100644
--- a/Code/IO/otbImageMetadataInterfaceFactory.h
+++ b/Code/IO/otbImageMetadataInterfaceFactory.h
@@ -47,7 +47,7 @@ public:
typedef ImageMetadataInterfaceBase::VectorType VectorType;
typedef ImageMetadataInterfaceBase::VariableLengthVectorType VariableLengthVectorType;
typedef ImageMetadataInterfaceBase::ImageKeywordlistType ImageKeywordlistType;
- typedef ImageMetadataInterfaceBase::Pointer ImageMetadataInterfaceBasePointerType;
+ typedef ImageMetadataInterfaceBase::Pointer ImageMetadataInterfaceBasePointerType;
/** Create the appropriate ImageMetadataInterfaceFactory depending on the particulars of the file. */
static ImageMetadataInterfaceBasePointerType CreateIMI( const MetaDataDictionaryType & dict );
diff --git a/Code/IO/otbImageSeriesFileReader.h b/Code/IO/otbImageSeriesFileReader.h
index cb8a76de11a9457e0717b48eca748486b638c1aa..b80c027fc73b201df5c644f0a200784cd3ddcecb 100644
--- a/Code/IO/otbImageSeriesFileReader.h
+++ b/Code/IO/otbImageSeriesFileReader.h
@@ -38,7 +38,7 @@ namespace otb {
* \brief Reader class dedicated to image series reading
*
* Actually, this class is mostly dedicated to read ENVI META FILE. Specialisations
- * of the template are given relatively to the king of image (or vector image) used
+ * of the template are given relatively to the king of image (or vector image) used
* in input and/or output.
*
*
diff --git a/Code/IO/otbImageSeriesFileReader.txx b/Code/IO/otbImageSeriesFileReader.txx
index 2f0ab0dc2ea5ef78de84185c8ef5ae7c7605e901..164b5dac397bd5460a30baf43e20c5fefa53d4c9 100644
--- a/Code/IO/otbImageSeriesFileReader.txx
+++ b/Code/IO/otbImageSeriesFileReader.txx
@@ -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.
=========================================================================*/
@@ -25,7 +25,7 @@
namespace otb {
template < class TImage, class TInternalImage >
-ImageSeriesFileReader< TImage, TInternalImage >
+ImageSeriesFileReader< TImage, TInternalImage >
::ImageSeriesFileReader ()
{
m_ExtractorList = ExtractSelectionListType::New();
@@ -33,7 +33,7 @@ ImageSeriesFileReader< TImage, TInternalImage >
template < class TImage, class TInternalImage >
void
-ImageSeriesFileReader< TImage, TInternalImage >
+ImageSeriesFileReader< TImage, TInternalImage >
::AllocateListOfComponents ()
{
for ( unsigned int i = 0; i < this->GetNumberOfOutputs(); ++i )
@@ -46,7 +46,7 @@ ImageSeriesFileReader< TImage, TInternalImage >
template < class TImage, class TInternalImage >
void
-ImageSeriesFileReader< TImage, TInternalImage >
+ImageSeriesFileReader< TImage, TInternalImage >
::GenerateData( unsigned int idx )
{
itk::OStringStream msg;
@@ -85,7 +85,7 @@ ImageSeriesFileReader< Image< TPixel, 2 >, Image< TInternalPixel, 2 > >
}
/**
- * TestBandSelection tests if the templated Image type is compatible
+ * TestBandSelection tests if the templated Image type is compatible
* with the bande selection provided in the Meta File
*/
template < class TPixel, class TInternalPixel >
@@ -120,10 +120,10 @@ template < class TPixel, class TInternalPixel >
void
ImageSeriesFileReader< Image< TPixel, 2 >, Image< TInternalPixel, 2 > >
::GenerateData( unsigned int idx )
-{
+{
otbMsgDebugMacro( << "Reading " << idx << "th image: " << this->m_ListOfFileNames[ idx ] );
- ReaderType * reader
+ ReaderType * reader
= static_cast<ReaderType*>( this->m_ImageFileReaderList->GetNthElement( idx ) );
reader->SetFileName( this->m_ListOfFileNames[ idx ] );
@@ -141,7 +141,7 @@ ImageSeriesFileReader< Image< TPixel, 2 >, Image< TInternalPixel, 2 > >
}
/* *********************************************************************
- * Methods that are specific to instanciation with Image type for TImage
+ * Methods that are specific to instanciation with Image type for TImage
* and VectorImage as TInternalImage
* *********************************************************************
*/
@@ -175,7 +175,7 @@ ImageSeriesFileReader< Image< TPixel, 2 >, VectorImage< TInternalPixel, 2 > >
}
/**
- * TestBandSelection tests if the templated Image type is compatible
+ * TestBandSelection tests if the templated Image type is compatible
* with the bande selection provided in the Meta File
*/
template < class TPixel, class TInternalPixel >
@@ -195,7 +195,7 @@ ImageSeriesFileReader< Image< TPixel, 2 >, VectorImage< TInternalPixel, 2 > >
}
/**
- * GenerateData for Image type as output and VectorImage type for reading
+ * GenerateData for Image type as output and VectorImage type for reading
*/
template < class TPixel, class TInternalPixel >
void
@@ -204,7 +204,7 @@ ImageSeriesFileReader< Image< TPixel, 2 >, VectorImage< TInternalPixel, 2 > >
{
otbMsgDebugMacro( << "Reading " << idx << "th image: " << this->m_ListOfFileNames[ idx ] );
- ReaderType * reader
+ ReaderType * reader
= static_cast<ReaderType*>( this->m_ImageFileReaderList->GetNthElement( idx ) );
reader->SetFileName( this->m_ListOfFileNames[ idx ] );
@@ -223,7 +223,7 @@ ImageSeriesFileReader< Image< TPixel, 2 >, VectorImage< TInternalPixel, 2 > >
}
/* ******************************************************************
- * Methods that are specific to instanciation with VectorImage types
+ * Methods that are specific to instanciation with VectorImage types
* ******************************************************************
*/
@@ -265,7 +265,7 @@ ImageSeriesFileReader< VectorImage< TPixel, 2 >, VectorImage< TInternalPixel, 2
{
otbMsgDebugMacro( << "Reading " << idx << "th image: " << this->m_ListOfFileNames[ idx ] );
- ReaderType * reader
+ ReaderType * reader
= static_cast<ReaderType*>( this->m_ImageFileReaderList->GetNthElement( idx ) );
reader->SetFileName( this->m_ListOfFileNames[ idx ] );
diff --git a/Code/IO/otbImageSeriesFileReaderBase.h b/Code/IO/otbImageSeriesFileReaderBase.h
index 3129245d431f2a2d84a1c5212f4c57505a2013c5..384e0d2802485ff4b0cb41b8990e62bf49fd73b4 100644
--- a/Code/IO/otbImageSeriesFileReaderBase.h
+++ b/Code/IO/otbImageSeriesFileReaderBase.h
@@ -55,12 +55,12 @@ namespace otb {
};
/** \class ImageSeriesFileReaderBase
- * \brief
+ * \brief
* \sa ImageSeriesFileReader
*/
template < class TImage, class TInternalImage = TImage >
-class ITK_EXPORT ImageSeriesFileReaderBase
+class ITK_EXPORT ImageSeriesFileReaderBase
: public ImageListSource< TImage >
{
public:
diff --git a/Code/IO/otbImageSeriesFileReaderBase.txx b/Code/IO/otbImageSeriesFileReaderBase.txx
index 6a007144ce6fb59677ca948257ab154f0503819a..03899c3333b7a3f14bda1cc4b4759ea6e73995ea 100644
--- a/Code/IO/otbImageSeriesFileReaderBase.txx
+++ b/Code/IO/otbImageSeriesFileReaderBase.txx
@@ -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.
=========================================================================*/
@@ -25,7 +25,7 @@
namespace otb {
template < class TImage, class TInternalImage >
-ImageSeriesFileReaderBase< TImage, TInternalImage >
+ImageSeriesFileReaderBase< TImage, TInternalImage >
::ImageSeriesFileReaderBase ()
{
m_OutputList = OutputImageListType::New();
@@ -38,7 +38,7 @@ ImageSeriesFileReaderBase< TImage, TInternalImage >
template < class TImage, class TInternalImage >
void
-ImageSeriesFileReaderBase< TImage, TInternalImage >
+ImageSeriesFileReaderBase< TImage, TInternalImage >
::SetFileName ( const std::string & file )
{
return SetFileName( file.c_str() );
@@ -46,10 +46,10 @@ ImageSeriesFileReaderBase< TImage, TInternalImage >
template < class TImage, class TInternalImage >
void
-ImageSeriesFileReaderBase< TImage, TInternalImage >
+ImageSeriesFileReaderBase< TImage, TInternalImage >
::SetFileName ( const char * file )
{
- if ( file && ( file == m_FileName ) )
+ if ( file && ( file == m_FileName ) )
return;
if ( file )
@@ -66,7 +66,7 @@ ImageSeriesFileReaderBase< TImage, TInternalImage >
template < class TImage, class TInternalImage >
typename ImageSeriesFileReaderBase< TImage, TInternalImage >::OutputImageListType *
-ImageSeriesFileReaderBase< TImage, TInternalImage >
+ImageSeriesFileReaderBase< TImage, TInternalImage >
::GetOutput ()
{
if ( this->GetNumberOfOutputs() < 1 )
@@ -77,7 +77,7 @@ ImageSeriesFileReaderBase< TImage, TInternalImage >
template < class TImage, class TInternalImage >
typename ImageSeriesFileReaderBase< TImage, TInternalImage >::OutputImageType *
-ImageSeriesFileReaderBase< TImage, TInternalImage >
+ImageSeriesFileReaderBase< TImage, TInternalImage >
::GetOutput ( unsigned int idx )
{
if ( this->GetNumberOfOutputs() < 1 )
@@ -91,7 +91,7 @@ ImageSeriesFileReaderBase< TImage, TInternalImage >
template < class TImage, class TInternalImage >
void
-ImageSeriesFileReaderBase< TImage, TInternalImage >
+ImageSeriesFileReaderBase< TImage, TInternalImage >
::ReadMetaFile ()
{
m_ListOfFileNames.clear();
@@ -104,7 +104,7 @@ ImageSeriesFileReaderBase< TImage, TInternalImage >
std::ifstream inputFile ( m_FileName.c_str(), std::ios_base::in );
inputFile >> aLine;
- if ( aLine != "ENVI" )
+ if ( aLine != "ENVI" )
{
inputFile.close();
itk::OStringStream msg;
@@ -115,7 +115,7 @@ ImageSeriesFileReaderBase< TImage, TInternalImage >
}
inputFile >> aLine;
- if ( aLine != "META" )
+ if ( aLine != "META" )
{
inputFile.close();
itk::OStringStream msg;
@@ -126,7 +126,7 @@ ImageSeriesFileReaderBase< TImage, TInternalImage >
}
inputFile >> aLine;
- if ( aLine != "FILE" )
+ if ( aLine != "FILE" )
{
inputFile.close();
itk::OStringStream msg;
@@ -138,7 +138,7 @@ ImageSeriesFileReaderBase< TImage, TInternalImage >
while ( 1 )
{
- /*
+ /*
* Reading the filenames
*/
do {
@@ -165,14 +165,14 @@ ImageSeriesFileReaderBase< TImage, TInternalImage >
}
}
else
- return; // normal exit
+ return; // normal exit
inputFile >> aLine;
std::cerr << "-> " << aLine << "\n";
// Get the Image fileName
- // The test may modify image file name to add the path
+ // The test may modify image file name to add the path
// Or throw an exception when not found nor readable
TestFileExistanceAndReadability( aLine, kImageFileName );
m_ListOfFileNames.push_back( aLine );
@@ -285,7 +285,7 @@ ImageSeriesFileReaderBase< TImage, TInternalImage >
IndexType index;
index[0] = beg_col - 1;
- index[1] = beg_line - 1;
+ index[1] = beg_line - 1;
SizeType size;
size[0] = end_col - beg_col + 1;
@@ -301,7 +301,7 @@ ImageSeriesFileReaderBase< TImage, TInternalImage >
template < class TImage, class TInternalImage >
void
-ImageSeriesFileReaderBase< TImage, TInternalImage >
+ImageSeriesFileReaderBase< TImage, TInternalImage >
::AllocateListOfComponents ()
{
for ( unsigned int i = 0; i < GetNumberOfOutputs(); ++i )
@@ -312,11 +312,11 @@ ImageSeriesFileReaderBase< TImage, TInternalImage >
}
/**
- * GenerateData
+ * GenerateData
*/
template < class TImage, class TInternalImage >
void
-ImageSeriesFileReaderBase< TImage, TInternalImage >
+ImageSeriesFileReaderBase< TImage, TInternalImage >
::GenerateData( unsigned int idx )
{
itk::OStringStream msg;
@@ -328,7 +328,7 @@ ImageSeriesFileReaderBase< TImage, TInternalImage >
template < class TImage, class TInternalImage >
void
-ImageSeriesFileReaderBase< TImage, TInternalImage >
+ImageSeriesFileReaderBase< TImage, TInternalImage >
::GenerateData( )
{
for ( unsigned int i = 0; i < GetNumberOfOutputs(); ++i )
@@ -340,7 +340,7 @@ ImageSeriesFileReaderBase< TImage, TInternalImage >
*/
template < class TImage, class TInternalImage >
typename ImageSeriesFileReaderBase< TImage, TInternalImage >::OutputImageListType *
-ImageSeriesFileReaderBase< TImage, TInternalImage >
+ImageSeriesFileReaderBase< TImage, TInternalImage >
::GenerateOutput()
{
this->Update();
@@ -349,7 +349,7 @@ ImageSeriesFileReaderBase< TImage, TInternalImage >
template < class TImage, class TInternalImage >
typename ImageSeriesFileReaderBase< TImage, TInternalImage >::OutputImageType *
-ImageSeriesFileReaderBase< TImage, TInternalImage >
+ImageSeriesFileReaderBase< TImage, TInternalImage >
::GenerateOutput( unsigned int idx )
{
this->GenerateData( idx );
@@ -359,7 +359,7 @@ ImageSeriesFileReaderBase< TImage, TInternalImage >
template < class TImage, class TInternalImage >
void
-ImageSeriesFileReaderBase< TImage, TInternalImage >
+ImageSeriesFileReaderBase< TImage, TInternalImage >
::PrintSelf ( std::ostream& os, itk::Indent indent ) const
{
Superclass::PrintSelf(os, indent);
@@ -372,8 +372,8 @@ ImageSeriesFileReaderBase< TImage, TInternalImage >
for ( unsigned int i = 0; i < GetNumberOfOutputs(); ++i )
{
os << indent << " " << "Filename : " << m_ListOfFileNames[i] << "\n";
- os << indent << " " << "RegionSelection: Index( "
- << m_ListOfRegionSelection[i].GetIndex()[0] << ", "
+ os << indent << " " << "RegionSelection: Index( "
+ << m_ListOfRegionSelection[i].GetIndex()[0] << ", "
<< m_ListOfRegionSelection[i].GetIndex()[1] << ") Size( "
<< m_ListOfRegionSelection[i].GetSize()[0] << ", "
<< m_ListOfRegionSelection[i].GetSize()[1] << ")\n";
@@ -394,7 +394,7 @@ ImageSeriesFileReaderBase< TImage, TInternalImage >
template < class TImage, class TInternalImage >
void
-ImageSeriesFileReaderBase< TImage, TInternalImage >
+ImageSeriesFileReaderBase< TImage, TInternalImage >
::TestFileExistanceAndReadability ( std::string & file, FileType fileType )
{
// Test if the file exists.
diff --git a/Code/IO/otbOGRIOHelper.h b/Code/IO/otbOGRIOHelper.h
index 971ad6f56a95eedc547be95f38880d357e7c777e..c2baeb8789505b6333763ea2fe3e287c1318723d 100644
--- a/Code/IO/otbOGRIOHelper.h
+++ b/Code/IO/otbOGRIOHelper.h
@@ -20,20 +20,20 @@
#include <vector>
-//TODO change this include have to define from what inherate this class
+//TODO change this include have to define from what inherate this class
//#include "otbPolyLineParametricPathWithValue.h" //for vcl_abs
#include "ogrsf_frmts.h"
#include "otbVectorData.h"
-namespace otb
+namespace otb
{
-/** \class OGRIOHelper
+/** \class OGRIOHelper
* \brief This class IO OGR
*
- */
+ */
template <class TVectorData >
class OGRIOHelper
{
@@ -78,7 +78,7 @@ public:
inline DataNodePointerType ConvertGeometryToPolygonNode(const OGRGeometry * ogrGeometry) const;
- inline void ConvertOGRLayerToDataTreeNode (OGRLayer * layer, InternalTreeNodeType * documentPtr) const;
+ inline void ConvertOGRLayerToDataTreeNode (OGRLayer * layer, InternalTreeNodeType * documentPtr) const;
/** end conversion tools */
unsigned int ProcessNodeWrite(InternalTreeNodeType * source, OGRDataSource * m_DataSource, OGRGeometryCollection * ogrCollection, OGRLayer * ogrCurrentLayer, OGRSpatialReference * oSRS);
@@ -89,7 +89,7 @@ public:
private:
/** Number of layer in the Tree*/
- unsigned int m_Kept;
+ unsigned int m_Kept;
}; // end class OGRIOHelper
diff --git a/Code/IO/otbOGRIOHelper.txx b/Code/IO/otbOGRIOHelper.txx
index 122f30ee732115f880bd1ab03eeb8c4be87fac61..f43f33719d8a62c79cc5596b406947c35ac188b6 100644
--- a/Code/IO/otbOGRIOHelper.txx
+++ b/Code/IO/otbOGRIOHelper.txx
@@ -24,7 +24,7 @@
-namespace otb
+namespace otb
{
@@ -177,9 +177,9 @@ OGRIOHelper<TVectorData>
node->SetPolygonInteriorRings(intRings);
return node;
-}
+}
-template<class TVectorData>
+template<class TVectorData>
inline void OGRIOHelper<TVectorData>
::ConvertOGRLayerToDataTreeNode (OGRLayer * layer, InternalTreeNodeType * documentPtr) const
{
@@ -551,7 +551,7 @@ inline void OGRIOHelper<TVectorData>
chrono.Stop();
++counter;
}//end While feature
- otbMsgDevMacro(<<layer->GetFeatureCount()<<" features read, average insertion time "<<chrono.GetMeanTime()<<" s");
+ otbMsgDevMacro(<<layer->GetFeatureCount()<<" features read, average insertion time "<<chrono.GetMeanTime()<<" s");
}
@@ -847,7 +847,7 @@ OGRLayer * ogrCurrentLayer, OGRSpatialReference * oSRS)
}
return m_Kept;
-}
+}
/*
template<class TLabelObject, class TPolygon>
inline typename OGRIOHelper<TLabelObject,TPolygon>
diff --git a/Code/IO/otbOGRVectorDataIO.txx b/Code/IO/otbOGRVectorDataIO.txx
index a63022ed1c42c270e6a197d7db73ff835512271e..6201a26f06c45aa24d0b0f7c827a28696bccefa2 100644
--- a/Code/IO/otbOGRVectorDataIO.txx
+++ b/Code/IO/otbOGRVectorDataIO.txx
@@ -187,7 +187,7 @@ bool OGRVectorDataIO<TData>::CanWriteFile( const char* filename ) const
return false;
}
- return ( this->GetOGRDriverName(filename) != "NOT-FOUND" );
+ return ( this->GetOGRDriverName(filename) != "NOT-FOUND" );
}
template<class TData>
@@ -292,7 +292,7 @@ template<class TData>
}
-template<class TData>
+template<class TData>
std::string
OGRVectorDataIO<TData>::GetOGRDriverName(std::string name) const
{
@@ -308,7 +308,7 @@ OGRVectorDataIO<TData>::GetOGRDriverName(std::string name) const
{
driverOGR="PostgreSQL";
}
- else
+ else
{
extension = System::GetExtension(upperName);
if (extension=="SHP")
diff --git a/Code/IO/otbPrepareSRTMDirectory.cxx b/Code/IO/otbPrepareSRTMDirectory.cxx
index 9315af7e9e4a7ef3987b82085fa8c15aa22ad0b3..d18b8665fbafe785f2d8162916ed525cf26e2ce1 100644
--- a/Code/IO/otbPrepareSRTMDirectory.cxx
+++ b/Code/IO/otbPrepareSRTMDirectory.cxx
@@ -114,7 +114,7 @@ bool PrepareSRTMDirectory::Evaluate()
else
{
inputfilename << "S";
- outputfilename << "S";
+ outputfilename << "S";
}
inputfilename << std::setfill('0') << std::setw(2) << vcl_abs(j);
@@ -143,9 +143,9 @@ bool PrepareSRTMDirectory::Evaluate()
ossimFilename inputFile(inputfilename.str().c_str());
ossimFilename outputFile(outputfilename.str().c_str());
if(!inputFile.exists())
- {
- itkExceptionMacro(<<"ERROR, can't find file "<<inputFile);
- }
+ {
+ itkExceptionMacro(<<"ERROR, can't find file "<<inputFile);
+ }
inputFile.copyFileTo(outputFile);
diff --git a/Code/IO/otbQuickBirdImageMetadataInterface.cxx b/Code/IO/otbQuickBirdImageMetadataInterface.cxx
index b5dd89f1d68ac794d60a305ed467d9e1fb996ea2..5abf7954258e595d8baa97828c4e249b371e6c16 100755
--- a/Code/IO/otbQuickBirdImageMetadataInterface.cxx
+++ b/Code/IO/otbQuickBirdImageMetadataInterface.cxx
@@ -56,7 +56,7 @@ QuickBirdImageMetadataInterface::GetSolarIrradiance( const MetaDataDictionaryTyp
{
if( !this->CanRead( dict ) )
{
- itkExceptionMacro(<<"Invalid Metadata, no QuickBird Image");
+ itkExceptionMacro(<<"Invalid Metadata, no QuickBird Image");
}
ImageKeywordlistType imageKeywordlist;
@@ -99,7 +99,7 @@ QuickBirdImageMetadataInterface::GetDay( const MetaDataDictionaryType & dict ) c
{
if( !this->CanRead( dict ) )
{
- itkExceptionMacro(<<"Invalid Metadata, no QuickBird Image");
+ itkExceptionMacro(<<"Invalid Metadata, no QuickBird Image");
}
ImageKeywordlistType imageKeywordlist;
@@ -134,7 +134,7 @@ QuickBirdImageMetadataInterface::GetMonth( const MetaDataDictionaryType & dict )
{
if( !this->CanRead( dict ) )
{
- itkExceptionMacro(<<"Invalid Metadata, no QuickBird Image");
+ itkExceptionMacro(<<"Invalid Metadata, no QuickBird Image");
}
ImageKeywordlistType imageKeywordlist;
@@ -168,7 +168,7 @@ QuickBirdImageMetadataInterface::GetYear( const MetaDataDictionaryType & dict )
{
if( !this->CanRead( dict ) )
{
- itkExceptionMacro(<<"Invalid Metadata, no QuickBird Image");
+ itkExceptionMacro(<<"Invalid Metadata, no QuickBird Image");
}
ImageKeywordlistType imageKeywordlist;
@@ -202,7 +202,7 @@ QuickBirdImageMetadataInterface::GetHour( const MetaDataDictionaryType & dict )
{
if( !this->CanRead( dict ) )
{
- itkExceptionMacro(<<"Invalid Metadata, no QuickBird Image");
+ itkExceptionMacro(<<"Invalid Metadata, no QuickBird Image");
}
ImageKeywordlistType imageKeywordlist;
@@ -236,7 +236,7 @@ QuickBirdImageMetadataInterface::GetMinute( const MetaDataDictionaryType & dict
{
if( !this->CanRead( dict ) )
{
- itkExceptionMacro(<<"Invalid Metadata, no QuickBird Image");
+ itkExceptionMacro(<<"Invalid Metadata, no QuickBird Image");
}
ImageKeywordlistType imageKeywordlist;
@@ -270,7 +270,7 @@ QuickBirdImageMetadataInterface::GetProductionDay( const MetaDataDictionaryType
{
if( !this->CanRead( dict ) )
{
- itkExceptionMacro(<<"Invalid Metadata, no QuickBird Image");
+ itkExceptionMacro(<<"Invalid Metadata, no QuickBird Image");
}
ImageKeywordlistType imageKeywordlist;
@@ -305,7 +305,7 @@ QuickBirdImageMetadataInterface::GetProductionMonth( const MetaDataDictionaryTyp
{
if( !this->CanRead( dict ) )
{
- itkExceptionMacro(<<"Invalid Metadata, no QuickBird Image");
+ itkExceptionMacro(<<"Invalid Metadata, no QuickBird Image");
}
ImageKeywordlistType imageKeywordlist;
@@ -339,7 +339,7 @@ QuickBirdImageMetadataInterface::GetProductionYear( const MetaDataDictionaryType
{
if( !this->CanRead( dict ) )
{
- itkExceptionMacro(<<"Invalid Metadata, no QuickBird Image");
+ itkExceptionMacro(<<"Invalid Metadata, no QuickBird Image");
}
ImageKeywordlistType imageKeywordlist;
@@ -374,7 +374,7 @@ QuickBirdImageMetadataInterface
{
if( !this->CanRead( dict ) )
{
- itkExceptionMacro(<<"Invalid Metadata, no QuickBird Image");
+ itkExceptionMacro(<<"Invalid Metadata, no QuickBird Image");
}
ImageKeywordlistType ImageKeywordlist;
@@ -414,7 +414,7 @@ QuickBirdImageMetadataInterface
{
if( !this->CanRead( dict ) )
{
- itkExceptionMacro(<<"Invalid Metadata, no QuickBird Image");
+ itkExceptionMacro(<<"Invalid Metadata, no QuickBird Image");
}
ImageKeywordlistType ImageKeywordlist;
@@ -482,96 +482,96 @@ QuickBirdImageMetadataInterface
if (keywordStringBId == ossimString("P") )
outputValuesVariableLengthVector.SetSize(1);
else
- outputValuesVariableLengthVector.SetSize(4);
+ outputValuesVariableLengthVector.SetSize(4);
outputValuesVariableLengthVector.Fill(1.);
if (!isPost20030606)
{
- if(bitsPerPixel==16)
- {
- if (keywordStringBId == ossimString("P"))
- {
- if (TDILevel != 10)
- outputValuesVariableLengthVector[0] = 0.08381880;
- else if (TDILevel != 13)
- outputValuesVariableLengthVector[0] = 0.06447600;
- else if (TDILevel != 18)
- outputValuesVariableLengthVector[0] = 0.04656600;
- else if (TDILevel != 24)
- outputValuesVariableLengthVector[0] = 0.03494440;
- else if (TDILevel != 32)
- outputValuesVariableLengthVector[0] = 0.02618840;
- }
- else
- {
- outputValuesVariableLengthVector[0] = 0.01604120;
- outputValuesVariableLengthVector[1] = 0.01438470;
- outputValuesVariableLengthVector[2] = 0.01267350;
- outputValuesVariableLengthVector[3] = 0.01542420;
- }
-
- }
- else
- {
- if (keywordStringBId == ossimString("P"))
- {
- if (TDILevel != 10)
- outputValuesVariableLengthVector[0] = 1.02681367;
- else if (TDILevel != 13)
- outputValuesVariableLengthVector[0] = 1.02848939;
- else if (TDILevel != 18)
- outputValuesVariableLengthVector[0] = 1.02794702;
- else if (TDILevel != 24)
- outputValuesVariableLengthVector[0] = 1.02989685;
- else if (TDILevel != 32)
- outputValuesVariableLengthVector[0] = 1.02739898;
-
- ossimString keywordStringAbsCalFactor = kwl.find("support_data.absCalFactor");
- outputValuesVariableLengthVector[0] *= keywordStringAbsCalFactor.toDouble();
- }
- else
- {
- ossimString keywordStringAcalFact = kwl.find("support_data.B_band_absCalFactor");
- outputValuesVariableLengthVector[0] = 1.12097834 * keywordStringAcalFact.toDouble();
- keywordStringAcalFact = kwl.find("support_data.G_band_absCalFactor");
- outputValuesVariableLengthVector[1] = 1.37652632 * keywordStringAcalFact.toDouble();
- keywordStringAcalFact = kwl.find("support_data.R_band_absCalFactor");
- outputValuesVariableLengthVector[2] = 1.30954587 * keywordStringAcalFact.toDouble();
- keywordStringAcalFact = kwl.find("support_data.N_band_absCalFactor");
- outputValuesVariableLengthVector[3] = 0.98368622 * keywordStringAcalFact.toDouble();
- }
- }
+ if(bitsPerPixel==16)
+ {
+ if (keywordStringBId == ossimString("P"))
+ {
+ if (TDILevel != 10)
+ outputValuesVariableLengthVector[0] = 0.08381880;
+ else if (TDILevel != 13)
+ outputValuesVariableLengthVector[0] = 0.06447600;
+ else if (TDILevel != 18)
+ outputValuesVariableLengthVector[0] = 0.04656600;
+ else if (TDILevel != 24)
+ outputValuesVariableLengthVector[0] = 0.03494440;
+ else if (TDILevel != 32)
+ outputValuesVariableLengthVector[0] = 0.02618840;
+ }
+ else
+ {
+ outputValuesVariableLengthVector[0] = 0.01604120;
+ outputValuesVariableLengthVector[1] = 0.01438470;
+ outputValuesVariableLengthVector[2] = 0.01267350;
+ outputValuesVariableLengthVector[3] = 0.01542420;
+ }
+
+ }
+ else
+ {
+ if (keywordStringBId == ossimString("P"))
+ {
+ if (TDILevel != 10)
+ outputValuesVariableLengthVector[0] = 1.02681367;
+ else if (TDILevel != 13)
+ outputValuesVariableLengthVector[0] = 1.02848939;
+ else if (TDILevel != 18)
+ outputValuesVariableLengthVector[0] = 1.02794702;
+ else if (TDILevel != 24)
+ outputValuesVariableLengthVector[0] = 1.02989685;
+ else if (TDILevel != 32)
+ outputValuesVariableLengthVector[0] = 1.02739898;
+
+ ossimString keywordStringAbsCalFactor = kwl.find("support_data.absCalFactor");
+ outputValuesVariableLengthVector[0] *= keywordStringAbsCalFactor.toDouble();
+ }
+ else
+ {
+ ossimString keywordStringAcalFact = kwl.find("support_data.B_band_absCalFactor");
+ outputValuesVariableLengthVector[0] = 1.12097834 * keywordStringAcalFact.toDouble();
+ keywordStringAcalFact = kwl.find("support_data.G_band_absCalFactor");
+ outputValuesVariableLengthVector[1] = 1.37652632 * keywordStringAcalFact.toDouble();
+ keywordStringAcalFact = kwl.find("support_data.R_band_absCalFactor");
+ outputValuesVariableLengthVector[2] = 1.30954587 * keywordStringAcalFact.toDouble();
+ keywordStringAcalFact = kwl.find("support_data.N_band_absCalFactor");
+ outputValuesVariableLengthVector[3] = 0.98368622 * keywordStringAcalFact.toDouble();
+ }
+ }
}
else
{
- if (keywordStringBId == ossimString("P"))
- {
- ossimString keywordStringAbsCalFactor = kwl.find("support_data.absCalFactor");
- outputValuesVariableLengthVector[0] = keywordStringAbsCalFactor.toDouble();
- }
- else
- {
- ossimString keywordStringAcalFact = kwl.find("support_data.B_band_absCalFactor");
- outputValuesVariableLengthVector[0] = keywordStringAcalFact.toDouble();
- keywordStringAcalFact = kwl.find("support_data.G_band_absCalFactor");
- outputValuesVariableLengthVector[1] = keywordStringAcalFact.toDouble();
- keywordStringAcalFact = kwl.find("support_data.R_band_absCalFactor");
- outputValuesVariableLengthVector[2] = keywordStringAcalFact.toDouble();
- keywordStringAcalFact = kwl.find("support_data.N_band_absCalFactor");
- outputValuesVariableLengthVector[3] = keywordStringAcalFact.toDouble();
- }
+ if (keywordStringBId == ossimString("P"))
+ {
+ ossimString keywordStringAbsCalFactor = kwl.find("support_data.absCalFactor");
+ outputValuesVariableLengthVector[0] = keywordStringAbsCalFactor.toDouble();
+ }
+ else
+ {
+ ossimString keywordStringAcalFact = kwl.find("support_data.B_band_absCalFactor");
+ outputValuesVariableLengthVector[0] = keywordStringAcalFact.toDouble();
+ keywordStringAcalFact = kwl.find("support_data.G_band_absCalFactor");
+ outputValuesVariableLengthVector[1] = keywordStringAcalFact.toDouble();
+ keywordStringAcalFact = kwl.find("support_data.R_band_absCalFactor");
+ outputValuesVariableLengthVector[2] = keywordStringAcalFact.toDouble();
+ keywordStringAcalFact = kwl.find("support_data.N_band_absCalFactor");
+ outputValuesVariableLengthVector[3] = keywordStringAcalFact.toDouble();
+ }
}
if (keywordStringBId == ossimString("P") )
- {
- outputValuesVariableLengthVector[0] = 0.398 / outputValuesVariableLengthVector[0];
+ {
+ outputValuesVariableLengthVector[0] = 0.398 / outputValuesVariableLengthVector[0];
}
else
{
outputValuesVariableLengthVector[0] = 0.068 / outputValuesVariableLengthVector[0];
- outputValuesVariableLengthVector[1] = 0.099 / outputValuesVariableLengthVector[1];
+ outputValuesVariableLengthVector[1] = 0.099 / outputValuesVariableLengthVector[1];
outputValuesVariableLengthVector[2] = 0.071 / outputValuesVariableLengthVector[2];
outputValuesVariableLengthVector[3] = 0.114 / outputValuesVariableLengthVector[3];
}
@@ -584,7 +584,7 @@ QuickBirdImageMetadataInterface::GetSatElevation( const MetaDataDictionaryType &
{
if( !this->CanRead( dict ) )
{
- itkExceptionMacro(<<"Invalid Metadata, no QuickBird Image");
+ itkExceptionMacro(<<"Invalid Metadata, no QuickBird Image");
}
ImageKeywordlistType imageKeywordlist;
@@ -607,7 +607,7 @@ QuickBirdImageMetadataInterface::GetSatAzimuth( const MetaDataDictionaryType & d
{
if( !this->CanRead( dict ) )
{
- itkExceptionMacro(<<"Invalid Metadata, no QuickBird Image");
+ itkExceptionMacro(<<"Invalid Metadata, no QuickBird Image");
}
ImageKeywordlistType imageKeywordlist;
@@ -631,7 +631,7 @@ QuickBirdImageMetadataInterface
{
if( !this->CanRead( dict ) )
{
- itkExceptionMacro(<<"Invalid Metadata, no QuickBird Image");
+ itkExceptionMacro(<<"Invalid Metadata, no QuickBird Image");
}
ImageKeywordlistType imageKeywordlist;
@@ -679,7 +679,7 @@ QuickBirdImageMetadataInterface
{
if( !this->CanRead( dict ) )
{
- itkExceptionMacro(<<"Invalid Metadata, no QuickBird Image");
+ itkExceptionMacro(<<"Invalid Metadata, no QuickBird Image");
}
ImageKeywordlistType imageKeywordlist;
diff --git a/Code/IO/otbSpotImageMetadataInterface.cxx b/Code/IO/otbSpotImageMetadataInterface.cxx
index 63fbdcd14b5c90f7dd30598f21755790e4542bc6..725f4ea5929b42cea73ad0a3528e73728b6f9d6c 100755
--- a/Code/IO/otbSpotImageMetadataInterface.cxx
+++ b/Code/IO/otbSpotImageMetadataInterface.cxx
@@ -54,7 +54,7 @@ SpotImageMetadataInterface::GetInstrument( const MetaDataDictionaryType & dict )
{
if( !this->CanRead( dict ) )
{
- itkExceptionMacro(<<"Invalid Metadata, no Ikonos Image");
+ itkExceptionMacro(<<"Invalid Metadata, no Ikonos Image");
}
ImageKeywordlistType imageKeywordlist;
@@ -78,7 +78,7 @@ SpotImageMetadataInterface::GetInstrumentIndex( const MetaDataDictionaryType & d
{
if( !this->CanRead( dict ) )
{
- itkExceptionMacro(<<"Invalid Metadata, no Ikonos Image");
+ itkExceptionMacro(<<"Invalid Metadata, no Ikonos Image");
}
ImageKeywordlistType imageKeywordlist;
@@ -103,7 +103,7 @@ SpotImageMetadataInterface::GetSolarIrradiance( const MetaDataDictionaryType & d
{
if( !this->CanRead( dict ) )
{
- itkExceptionMacro(<<"Invalid Metadata, no Ikonos Image");
+ itkExceptionMacro(<<"Invalid Metadata, no Ikonos Image");
}
ImageKeywordlistType imageKeywordlist;
@@ -126,7 +126,7 @@ SpotImageMetadataInterface::GetSolarIrradiance( const MetaDataDictionaryType & d
{
if (!keywordStrings[i].empty())
{
- outputValues.push_back(keywordStrings[i].toDouble());
+ outputValues.push_back(keywordStrings[i].toDouble());
}
}
@@ -136,8 +136,8 @@ SpotImageMetadataInterface::GetSolarIrradiance( const MetaDataDictionaryType & d
//In the case of SPOT, the bands are in a different order:
// XS3, XS2. XS1, SWIR in the tif file.
if(outputValues.size() != 4)
- itkGenericExceptionMacro(<<"Invalid Solar Irradiance");
-
+ itkGenericExceptionMacro(<<"Invalid Solar Irradiance");
+
outputValuesVariableLengthVector[0]=outputValues[2];
outputValuesVariableLengthVector[1]=outputValues[1];
outputValuesVariableLengthVector[2]=outputValues[0];
@@ -152,7 +152,7 @@ SpotImageMetadataInterface::GetDay( const MetaDataDictionaryType & dict ) const
{
if( !this->CanRead( dict ) )
{
- itkExceptionMacro(<<"Invalid Metadata, no Ikonos Image");
+ itkExceptionMacro(<<"Invalid Metadata, no Ikonos Image");
}
ImageKeywordlistType imageKeywordlist;
@@ -188,7 +188,7 @@ SpotImageMetadataInterface::GetMonth( const MetaDataDictionaryType & dict ) cons
{
if( !this->CanRead( dict ) )
{
- itkExceptionMacro(<<"Invalid Metadata, no Ikonos Image");
+ itkExceptionMacro(<<"Invalid Metadata, no Ikonos Image");
}
ImageKeywordlistType imageKeywordlist;
@@ -224,7 +224,7 @@ SpotImageMetadataInterface::GetYear( const MetaDataDictionaryType & dict ) const
{
if( !this->CanRead( dict ) )
{
- itkExceptionMacro(<<"Invalid Metadata, no Ikonos Image");
+ itkExceptionMacro(<<"Invalid Metadata, no Ikonos Image");
}
ImageKeywordlistType imageKeywordlist;
@@ -258,7 +258,7 @@ SpotImageMetadataInterface::GetHour( const MetaDataDictionaryType & dict ) const
{
if( !this->CanRead( dict ) )
{
- itkExceptionMacro(<<"Invalid Metadata, no Spot Image");
+ itkExceptionMacro(<<"Invalid Metadata, no Spot Image");
}
ImageKeywordlistType imageKeywordlist;
@@ -292,7 +292,7 @@ SpotImageMetadataInterface::GetMinute( const MetaDataDictionaryType & dict ) con
{
if( !this->CanRead( dict ) )
{
- itkExceptionMacro(<<"Invalid Metadata, no Spot Image");
+ itkExceptionMacro(<<"Invalid Metadata, no Spot Image");
}
ImageKeywordlistType imageKeywordlist;
@@ -325,7 +325,7 @@ SpotImageMetadataInterface::GetProductionDay( const MetaDataDictionaryType & dic
{
if( !this->CanRead( dict ) )
{
- itkExceptionMacro(<<"Invalid Metadata, no Spot Image");
+ itkExceptionMacro(<<"Invalid Metadata, no Spot Image");
}
ImageKeywordlistType imageKeywordlist;
@@ -359,7 +359,7 @@ SpotImageMetadataInterface::GetProductionMonth( const MetaDataDictionaryType & d
{
if( !this->CanRead( dict ) )
{
- itkExceptionMacro(<<"Invalid Metadata, no Spot Image");
+ itkExceptionMacro(<<"Invalid Metadata, no Spot Image");
}
ImageKeywordlistType imageKeywordlist;
@@ -394,7 +394,7 @@ SpotImageMetadataInterface::GetProductionYear( const MetaDataDictionaryType & di
{
if( !this->CanRead( dict ) )
{
- itkExceptionMacro(<<"Invalid Metadata, no Spot Image");
+ itkExceptionMacro(<<"Invalid Metadata, no Spot Image");
}
ImageKeywordlistType imageKeywordlist;
@@ -429,7 +429,7 @@ SpotImageMetadataInterface
{
if( !this->CanRead( dict ) )
{
- itkExceptionMacro(<<"Invalid Metadata, no Ikonos Image");
+ itkExceptionMacro(<<"Invalid Metadata, no Ikonos Image");
}
ImageKeywordlistType imageKeywordlist;
@@ -478,7 +478,7 @@ SpotImageMetadataInterface
{
if( !this->CanRead( dict ) )
{
- itkExceptionMacro(<<"Invalid Metadata, no Ikonos Image");
+ itkExceptionMacro(<<"Invalid Metadata, no Ikonos Image");
}
ImageKeywordlistType imageKeywordlist;
@@ -526,7 +526,7 @@ SpotImageMetadataInterface::GetSatElevation( const MetaDataDictionaryType & dict
{
if( !this->CanRead( dict ) )
{
- itkExceptionMacro(<<"Invalid Metadata, no Spot Image");
+ itkExceptionMacro(<<"Invalid Metadata, no Spot Image");
}
ImageKeywordlistType imageKeywordlist;
@@ -549,7 +549,7 @@ SpotImageMetadataInterface::GetSatAzimuth( const MetaDataDictionaryType & dict )
{
if( !this->CanRead( dict ) )
{
- itkExceptionMacro(<<"Invalid Metadata, no Spot Image");
+ itkExceptionMacro(<<"Invalid Metadata, no Spot Image");
}
ImageKeywordlistType imageKeywordlist;
@@ -571,7 +571,7 @@ SpotImageMetadataInterface::GetSatAzimuth( const MetaDataDictionaryType & dict )
if( (step-48)<0 )
{
- satAz += 90.;
+ satAz += 90.;
}
else
satAz = satAz - 90.;
@@ -585,7 +585,7 @@ SpotImageMetadataInterface
{
if( !this->CanRead( dict ) )
{
- itkExceptionMacro(<<"Invalid Metadata, no Spot Image");
+ itkExceptionMacro(<<"Invalid Metadata, no Spot Image");
}
ImageKeywordlistType imageKeywordlist;
@@ -637,7 +637,7 @@ SpotImageMetadataInterface
{
if( !this->CanRead( dict ) )
{
- itkExceptionMacro(<<"Invalid Metadata, no Spot Image");
+ itkExceptionMacro(<<"Invalid Metadata, no Spot Image");
}
ImageKeywordlistType imageKeywordlist;
diff --git a/Code/IO/otbTerraSarImageMetadataInterface.cxx b/Code/IO/otbTerraSarImageMetadataInterface.cxx
index 18236f90cf07891809bc059a81fd1cf4f47e33b2..5bc39bead19674d6bd626fa4cfa7bb76c15de0f5 100644
--- a/Code/IO/otbTerraSarImageMetadataInterface.cxx
+++ b/Code/IO/otbTerraSarImageMetadataInterface.cxx
@@ -77,7 +77,7 @@ TerraSarImageMetadataInterface::GetDay( const MetaDataDictionaryType & dict ) co
{
if( !this->CanRead( dict ) )
{
- itkExceptionMacro(<<"Invalid Metadata, no TerraSar Image");
+ itkExceptionMacro(<<"Invalid Metadata, no TerraSar Image");
}
/*
ImageKeywordlistType imageKeywordlist;
@@ -115,7 +115,7 @@ TerraSarImageMetadataInterface::GetMonth( const MetaDataDictionaryType & dict )
{
if( !this->CanRead( dict ) )
{
- itkExceptionMacro(<<"Invalid Metadata, no TerraSar Image");
+ itkExceptionMacro(<<"Invalid Metadata, no TerraSar Image");
}
/*
ImageKeywordlistType imageKeywordlist;
@@ -153,9 +153,9 @@ TerraSarImageMetadataInterface::GetYear( const MetaDataDictionaryType & dict ) c
{
if( !this->CanRead( dict ) )
{
- itkExceptionMacro(<<"Invalid Metadata, no TerraSar Image");
+ itkExceptionMacro(<<"Invalid Metadata, no TerraSar Image");
}
- /*
+ /*
ImageKeywordlistType imageKeywordlist;
if (dict.HasKey(MetaDataKey::OSSIMKeywordlistKey))
@@ -189,7 +189,7 @@ TerraSarImageMetadataInterface::GetHour( const MetaDataDictionaryType & dict ) c
{
if( !this->CanRead( dict ) )
{
- itkExceptionMacro(<<"Invalid Metadata, no TerraSar Image");
+ itkExceptionMacro(<<"Invalid Metadata, no TerraSar Image");
}
/*
ImageKeywordlistType imageKeywordlist;
@@ -225,7 +225,7 @@ TerraSarImageMetadataInterface::GetMinute( const MetaDataDictionaryType & dict )
{
if( !this->CanRead( dict ) )
{
- itkExceptionMacro(<<"Invalid Metadata, no TerraSar Image");
+ itkExceptionMacro(<<"Invalid Metadata, no TerraSar Image");
}
/*
ImageKeywordlistType imageKeywordlist;
@@ -260,7 +260,7 @@ TerraSarImageMetadataInterface::GetProductionDay( const MetaDataDictionaryType &
{
if( !this->CanRead( dict ) )
{
- itkExceptionMacro(<<"Invalid Metadata, no TerraSar Image");
+ itkExceptionMacro(<<"Invalid Metadata, no TerraSar Image");
}
ImageKeywordlistType imageKeywordlist;
@@ -294,7 +294,7 @@ TerraSarImageMetadataInterface::GetProductionMonth( const MetaDataDictionaryType
{
if( !this->CanRead( dict ) )
{
- itkExceptionMacro(<<"Invalid Metadata, no TerraSar Image");
+ itkExceptionMacro(<<"Invalid Metadata, no TerraSar Image");
}
ImageKeywordlistType imageKeywordlist;
@@ -329,7 +329,7 @@ TerraSarImageMetadataInterface::GetProductionYear( const MetaDataDictionaryType
{
if( !this->CanRead( dict ) )
{
- itkExceptionMacro(<<"Invalid Metadata, no TerraSar Image");
+ itkExceptionMacro(<<"Invalid Metadata, no TerraSar Image");
}
ImageKeywordlistType imageKeywordlist;
diff --git a/Code/IO/otbVectorDataFileReader.txx b/Code/IO/otbVectorDataFileReader.txx
index ca29e5c25fd351996cda36f16924da0951596682..49bb0aec8a1cc7a1e5c48172adc1ed3b136774b2 100644
--- a/Code/IO/otbVectorDataFileReader.txx
+++ b/Code/IO/otbVectorDataFileReader.txx
@@ -74,7 +74,7 @@ VectorDataFileReader<TOutputVectorData>
// Test if the file can be open for reading access.
//Only if m_FileName speciy a filename (not a dirname)
- // FIXME shapefile should be able to open a directory and load the
+ // FIXME shapefile should be able to open a directory and load the
// individual shapefiles as layers
if ( System::IsAFileName( this->m_FileName ) == true )
{
diff --git a/Code/IO/otbVectorImage.h b/Code/IO/otbVectorImage.h
index 4deb83cf3219a0ce36bb9736e4681983705ce601..8e46ac6fcae9420a0b9700e940bffbe61d10af67 100644
--- a/Code/IO/otbVectorImage.h
+++ b/Code/IO/otbVectorImage.h
@@ -181,7 +181,7 @@ protected:
private:
VectorImage(const Self&); //purposely not implemented
void operator=(const Self&); //purposely not implemented
- /** Only here to have access to projection and coordinates datas.
+ /** Only here to have access to projection and coordinates datas.
Those method will disappear.
Use Default because don't need to know the sensor type*/
typename DefaultImageMetadataInterface::Pointer m_ImageMetadataInterface;
diff --git a/Code/Learning/otbExhaustiveExponentialOptimizer.cxx b/Code/Learning/otbExhaustiveExponentialOptimizer.cxx
index c256ce2941bc051952551c912f6080ac245b6cd5..874cace2e33bf5292aee371884811d33648e80c2 100644
--- a/Code/Learning/otbExhaustiveExponentialOptimizer.cxx
+++ b/Code/Learning/otbExhaustiveExponentialOptimizer.cxx
@@ -115,7 +115,7 @@ ExhaustiveExponentialOptimizer
itkDebugMacro("ResumeWalk");
m_Stop = false;
- while( !m_Stop )
+ while( !m_Stop )
{
ParametersType currentPosition = this->GetCurrentPosition();
@@ -127,12 +127,12 @@ ExhaustiveExponentialOptimizer
m_CurrentValue = this->GetValue( currentPosition );
- if (m_CurrentValue > m_MaximumMetricValue)
+ if (m_CurrentValue > m_MaximumMetricValue)
{
m_MaximumMetricValue = m_CurrentValue;
m_MaximumMetricValuePosition = currentPosition;
}
- if (m_CurrentValue < m_MinimumMetricValue)
+ if (m_CurrentValue < m_MinimumMetricValue)
{
m_MinimumMetricValue = m_CurrentValue;
m_MinimumMetricValuePosition = currentPosition;
@@ -165,7 +165,7 @@ ExhaustiveExponentialOptimizer
void
ExhaustiveExponentialOptimizer
::AdvanceOneStep( void )
-{
+{
itkDebugMacro("AdvanceOneStep");
const unsigned int spaceDimension = m_CostFunction->GetNumberOfParameters();
@@ -181,7 +181,7 @@ ExhaustiveExponentialOptimizer
void
ExhaustiveExponentialOptimizer
-::IncrementIndex( ParametersType &newPosition )
+::IncrementIndex( ParametersType &newPosition )
{
unsigned int idx = 0;
const unsigned int spaceDimension = m_CostFunction->GetNumberOfParameters();
@@ -208,10 +208,10 @@ ExhaustiveExponentialOptimizer
for(unsigned int i=0; i<spaceDimension; i++)
{
- newPosition[i] = this->GetInitialPosition()[i]
+ newPosition[i] = this->GetInitialPosition()[i]
* this->GetScales()[i]
* vcl_pow(m_GeometricProgression,
- static_cast<double>(m_CurrentIndex[i]-m_NumberOfSteps[i]) * m_StepLength);
+ static_cast<double>(m_CurrentIndex[i]-m_NumberOfSteps[i]) * m_StepLength);
}
}
@@ -227,7 +227,7 @@ ExhaustiveExponentialOptimizer
os << indent << "CurrentIteration = " << m_CurrentIteration << std::endl;
os << indent << "Stop = " << m_Stop << std::endl;
os << indent << "CurrentParameter = " << m_CurrentParameter << std::endl;
- os << indent << "GeometricProgression = " << m_GeometricProgression << std::endl;
+ os << indent << "GeometricProgression = " << m_GeometricProgression << std::endl;
os << indent << "CurrentIndex = " << m_CurrentIndex << std::endl;
os << indent << "MaximumNumberOfIterations = " << m_MaximumNumberOfIterations << std::endl;
os << indent << "MaximumMetricValue = " << m_MaximumMetricValue << std::endl;
diff --git a/Code/Learning/otbExhaustiveExponentialOptimizer.h b/Code/Learning/otbExhaustiveExponentialOptimizer.h
index ae9eeb818df6c19b86ff9314136781998d63a4ab..880d18fe367a2f1b6103812c1ece8ec149ab27bf 100644
--- a/Code/Learning/otbExhaustiveExponentialOptimizer.h
+++ b/Code/Learning/otbExhaustiveExponentialOptimizer.h
@@ -25,7 +25,7 @@ namespace otb
/** \class ExhaustiveExponentialOptimizer
* \brief This optimizer performs an exhaustive search on an exponential scale.
- *
+ *
* This optimizer is equivalent to an exhaustive search in a discrete grid
* defined over the parametric space. The grid is centered on the initial
* position. The subdivisions of the grid along each one of the dimensions
@@ -33,13 +33,13 @@ namespace otb
* scale factor m_ScaleFactor, with the exponant following an
* arithmetic progression from 0 to m_NumberOfSteps * m_StepLength in
* both positive and negative direction.
- *
- * This optimizer can be use to perform a preliminary coarse search on
+ *
+ * This optimizer can be use to perform a preliminary coarse search on
* the search space.
*
* \ingroup Numerics Optimizers
*/
-class ITK_EXPORT ExhaustiveExponentialOptimizer :
+class ITK_EXPORT ExhaustiveExponentialOptimizer :
public itk::SingleValuedNonLinearOptimizer
{
public:
@@ -94,7 +94,7 @@ protected:
unsigned long m_CurrentIteration;
bool m_Stop;
unsigned int m_CurrentParameter;
- double m_GeometricProgression;
+ double m_GeometricProgression;
ParametersType m_CurrentIndex;
unsigned long m_MaximumNumberOfIterations;
MeasureType m_MaximumMetricValue;
@@ -102,7 +102,7 @@ protected:
ParametersType m_MinimumMetricValuePosition;
ParametersType m_MaximumMetricValuePosition;
-private:
+private:
ExhaustiveExponentialOptimizer(const Self&); //purposely not implemented
void operator=(const Self&);//purposely not implemented
diff --git a/Code/Learning/otbSOMWithMissingValue.h b/Code/Learning/otbSOMWithMissingValue.h
index 4237018699a6c95346ef610a35b42bc0318f5558..ce552fdf7808a935cf2eb81d9ea43449a2192368 100644
--- a/Code/Learning/otbSOMWithMissingValue.h
+++ b/Code/Learning/otbSOMWithMissingValue.h
@@ -9,11 +9,11 @@ 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.
=========================================================================*/
@@ -22,14 +22,14 @@ PURPOSE. See the above copyright notices for more information.
#include "otbPeriodicSOM.h"
-namespace otb
+namespace otb
{
/**
* \class SOMWithMissingValue
* \brief This class implements SOM training with missing value
*
* The distance between vectors that may have missing components is holded
- * by the EuclideanDistanceWithMissingValue class in the SOMMap distance
+ * by the EuclideanDistanceWithMissingValue class in the SOMMap distance
* template. Nevertheless, this class re-implements the UpdateMap method to
* adapt the evaluation of each component of the 'newNeuron' when dealing
* with missing values.
@@ -41,7 +41,7 @@ namespace otb
* \sa EuclideanDistanceWithMissingValue
*/
template < class TListSample, class TMap,
- class TSOMLearningBehaviorFunctor = Functor::CzihoSOMLearningBehaviorFunctor,
+ class TSOMLearningBehaviorFunctor = Functor::CzihoSOMLearningBehaviorFunctor,
class TSOMNeighborhoodBehaviorFunctor = Functor::CzihoSOMNeighborhoodBehaviorFunctor >
class ITK_EXPORT SOMWithMissingValue
: public PeriodicSOM< TListSample, TMap, TSOMLearningBehaviorFunctor, TSOMNeighborhoodBehaviorFunctor >
@@ -49,8 +49,8 @@ class ITK_EXPORT SOMWithMissingValue
public:
/** Standard typedefs */
typedef SOMWithMissingValue Self;
- typedef PeriodicSOM< TListSample, TMap,
- TSOMLearningBehaviorFunctor,
+ typedef PeriodicSOM< TListSample, TMap,
+ TSOMLearningBehaviorFunctor,
TSOMNeighborhoodBehaviorFunctor > Superclass;
typedef itk::SmartPointer<Self> Pointer;
typedef itk::SmartPointer<const Self> ConstPointer;
@@ -100,11 +100,11 @@ class ITK_EXPORT SOMWithMissingValue
Superclass::PrintSelf(os,indent); }
private:
- SOMWithMissingValue ( const Self & ); // purposely not implemented
+ SOMWithMissingValue ( const Self & ); // purposely not implemented
void operator=(const Self&); // purposely not implemented
-}; // end of class
+}; // end of class
} // end of namespace otb
diff --git a/Code/Learning/otbSOMbasedImageFilter.h b/Code/Learning/otbSOMbasedImageFilter.h
index e3e5e37992147c593f7aea328fb193cbcfde24d6..020d32bf00edfe4a7ea990a98182593c4b4d0bc8 100644
--- a/Code/Learning/otbSOMbasedImageFilter.h
+++ b/Code/Learning/otbSOMbasedImageFilter.h
@@ -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.
=========================================================================*/
@@ -32,7 +32,7 @@ namespace Functor {
* \brief This class implements the functor that perform substitution between
* input image pixels and the corresponding winning neurons of a Kohonen map.
*
- * On the contrary to \doxygen{otb}{SOMClassifier}, it does not yield labels but the
+ * On the contrary to \doxygen{otb}{SOMClassifier}, it does not yield labels but the
* value of the winning neurons. Also, it is threaded...
*/
template < class TInput, class TOutput, class TDistanceMetric, class TMap >
@@ -64,7 +64,7 @@ namespace Functor {
DistanceType * GetDistance () { return this->m_Distance; }
protected:
- /** GetWinner redefinition by using its own TDistanceMetric that
+ /** GetWinner redefinition by using its own TDistanceMetric that
* could be different from the one of the SOM map */
IndexType GetWinner ( const NeuronType & sample );
@@ -79,26 +79,26 @@ namespace Functor {
} // end of namespace Functor
/** \class SOMbasedImageFilter
- * \brief This class perform the substitution between initial input image
+ * \brief This class perform the substitution between initial input image
* pixels and the winning neurons of a SOM.
*
- * It performs the projection of the SOM onto the data. On the contrary to
+ * It performs the projection of the SOM onto the data. On the contrary to
* \doxygen{otb}{SOMClassifier}, it does not yield labels but an image which
* corresponds to the quantized version of the initial image when considering
* SOMmap as a codebook of a vector quantization.
*
* SOMbasedImageFilter is templated over a TDistanceMetric since it could be
- * different from the initial DistanceMetric used for the SOM training. Moreover
+ * different from the initial DistanceMetric used for the SOM training. Moreover
* TMap is a template for the SOM that can be a simple VectorImage.
*
* \ingroup Streamed
* \sa EuclideanDistanceWithMissingValue
*/
-template < class TInputImage, class TOutputImage,
+template < class TInputImage, class TOutputImage,
class TDistanceMetric, class TMap >
-class ITK_EXPORT SOMbasedImageFilter
+class ITK_EXPORT SOMbasedImageFilter
: public itk::UnaryFunctorImageFilter< TInputImage, TOutputImage,
- Functor::SOMbasedImageFilterFunctor< typename TInputImage::PixelType,
+ Functor::SOMbasedImageFilterFunctor< typename TInputImage::PixelType,
typename TOutputImage::PixelType,
TDistanceMetric, TMap > >
{
@@ -106,8 +106,8 @@ class ITK_EXPORT SOMbasedImageFilter
/** Standard class typedefs. */
typedef SOMbasedImageFilter Self;
typedef typename itk::UnaryFunctorImageFilter< TInputImage, TOutputImage,
- Functor::SOMbasedImageFilterFunctor<
- typename TInputImage::PixelType,
+ Functor::SOMbasedImageFilterFunctor<
+ typename TInputImage::PixelType,
typename TOutputImage::PixelType,
TDistanceMetric, TMap > > Superclass;
typedef itk::SmartPointer<Self> Pointer;
@@ -126,7 +126,7 @@ class ITK_EXPORT SOMbasedImageFilter
typedef TMap MapType;
typedef typename MapType::Pointer MapPointerType;
- typedef Functor::SOMbasedImageFilterFunctor<
+ typedef Functor::SOMbasedImageFilterFunctor<
typename TInputImage::PixelType,
typename TOutputImage::PixelType,
TDistanceMetric, TMap > FunctorType;
@@ -145,7 +145,7 @@ class ITK_EXPORT SOMbasedImageFilter
virtual ~SOMbasedImageFilter () { }
private :
- SOMbasedImageFilter ( const Self & );
+ SOMbasedImageFilter ( const Self & );
void operator=(const Self&); //purposely not implemented
MapPointerType m_Map;
diff --git a/Code/Learning/otbSOMbasedImageFilter.txx b/Code/Learning/otbSOMbasedImageFilter.txx
index 46dc0e4d043601ac5b350acec425326dbaad4be9..09e0eb14e0326170b011f9522c23dcf5c4626b5c 100644
--- a/Code/Learning/otbSOMbasedImageFilter.txx
+++ b/Code/Learning/otbSOMbasedImageFilter.txx
@@ -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.
=========================================================================*/
diff --git a/Code/Learning/otbSVMCrossValidationCostFunction.h b/Code/Learning/otbSVMCrossValidationCostFunction.h
index 48beeddf8555428c08b457246c47c101795fd5b8..a3068760a76adcc3334205267dc615625f9a342d 100644
--- a/Code/Learning/otbSVMCrossValidationCostFunction.h
+++ b/Code/Learning/otbSVMCrossValidationCostFunction.h
@@ -28,8 +28,8 @@ namespace otb
* \brief This function returns the cross validation accuracy of a SVM model.
*
* It allows to perform parameters selection to maximize the
- * accuracy using ITK optimizers.
- *
+ * accuracy using ITK optimizers.
+ *
* Given an input SVM model, the number of parameters depends on the
* type of kernel:
* - Linear kernel : C
@@ -42,11 +42,11 @@ namespace otb
*
* The GetValueAndDerivatives() uses the GetValue() function to
* compute the partial derivatives. as such, it can be quite intensive.
- *
+ *
* \ingroup ClassificationFilters
*/
-template <class TModel>
-class ITK_EXPORT SVMCrossValidationCostFunction
+template <class TModel>
+class ITK_EXPORT SVMCrossValidationCostFunction
: public itk::SingleValuedCostFunction
{
public:
diff --git a/Code/Learning/otbSVMCrossValidationCostFunction.txx b/Code/Learning/otbSVMCrossValidationCostFunction.txx
index baaf0952f5f43e6325cffdf110d23b62b7a615f3..25ad5bcb07a843370cae782d30103ac7dac3a8e1 100644
--- a/Code/Learning/otbSVMCrossValidationCostFunction.txx
+++ b/Code/Learning/otbSVMCrossValidationCostFunction.txx
@@ -32,7 +32,7 @@ namespace otb
{}
template<class TModel>
typename SVMCrossValidationCostFunction<TModel>
- ::MeasureType
+ ::MeasureType
SVMCrossValidationCostFunction<TModel>
::GetValue(const ParametersType ¶meters) const
{
@@ -55,7 +55,7 @@ namespace otb
}
template<class TModel>
- void
+ void
SVMCrossValidationCostFunction<TModel>
::GetDerivative(const ParametersType ¶meters, DerivativeType &derivative) const
{
@@ -83,7 +83,7 @@ namespace otb
}
template<class TModel>
- unsigned int
+ unsigned int
SVMCrossValidationCostFunction<TModel>
::GetNumberOfParameters (void) const
{
@@ -112,45 +112,45 @@ namespace otb
default:
// C
- return 1;
+ return 1;
}
}
template<class TModel>
- void
+ void
SVMCrossValidationCostFunction<TModel>
::UpdateParameters(struct svm_parameter& svm_parameters, const ParametersType & parameters) const
{
switch(m_Model->GetKernelType())
{
case LINEAR:
- // C
- svm_parameters.C = parameters[0];
- break;
+ // C
+ svm_parameters.C = parameters[0];
+ break;
case POLY:
- // C, gamma and coef0
- svm_parameters.C = parameters[0];
- svm_parameters.gamma = parameters[1];
- svm_parameters.coef0 = parameters[2];
- break;
+ // C, gamma and coef0
+ svm_parameters.C = parameters[0];
+ svm_parameters.gamma = parameters[1];
+ svm_parameters.coef0 = parameters[2];
+ break;
case RBF:
- // C and gamma
- svm_parameters.C = parameters[0];
- svm_parameters.gamma = parameters[1];
- break;
+ // C and gamma
+ svm_parameters.C = parameters[0];
+ svm_parameters.gamma = parameters[1];
+ break;
case SIGMOID:
- // C, gamma and coef0
- svm_parameters.C = parameters[0];
- svm_parameters.gamma = parameters[1];
- svm_parameters.coef0 = parameters[2];
- break;
+ // C, gamma and coef0
+ svm_parameters.C = parameters[0];
+ svm_parameters.gamma = parameters[1];
+ svm_parameters.coef0 = parameters[2];
+ break;
default:
- svm_parameters.C = parameters[0];
- break;
+ svm_parameters.C = parameters[0];
+ break;
}
}
diff --git a/Code/Learning/otbSVMImageClassificationWithRuleFilter.h b/Code/Learning/otbSVMImageClassificationWithRuleFilter.h
index 166b47257c229e5745eb1aa89cfdba74bc1cb613..573aa1696f79fca3396cbaead04b14c27fd9aa39 100644
--- a/Code/Learning/otbSVMImageClassificationWithRuleFilter.h
+++ b/Code/Learning/otbSVMImageClassificationWithRuleFilter.h
@@ -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.
=========================================================================*/
@@ -76,7 +76,7 @@ public:
typedef typename ModelType::DistancesVectorType DistanceValueType;
typedef typename DistanceValueType::ValueType RuleValueType;
- typedef VectorImage< RuleValueType, OutputImageType::ImageDimension >
+ typedef VectorImage< RuleValueType, OutputImageType::ImageDimension >
OutputRuleImageType;
typedef typename OutputRuleImageType::Pointer OutputRuleImagePointerType;
typedef typename OutputRuleImageType::RegionType OutputRuleImageRegionType;
@@ -92,16 +92,16 @@ protected:
/** Destructor */
virtual ~SVMImageClassificationWithRuleFilter() {};
- /** GenerateOutputInformation
- * Set the number of bands of the output rule image.
- * Copy informations from the input image if existing.
- **/
- virtual void GenerateOutputInformation();
+ /** GenerateOutputInformation
+ * Set the number of bands of the output rule image.
+ * Copy informations from the input image if existing.
+ **/
+ virtual void GenerateOutputInformation();
- /** AllocateOutputs
- * Output allocation redefinition for VectorImage (used in TOutputRuleImage)
- **/
- virtual void AllocateOutputs();
+ /** AllocateOutputs
+ * Output allocation redefinition for VectorImage (used in TOutputRuleImage)
+ **/
+ virtual void AllocateOutputs();
/** Threaded generate data */
virtual void ThreadedGenerateData(const OutputImageRegionType &outputRegionForThread,int threadId);
diff --git a/Code/Learning/otbSVMImageClassificationWithRuleFilter.txx b/Code/Learning/otbSVMImageClassificationWithRuleFilter.txx
index 6f2bade2cb9106dae9706cc6b880182416d435ab..fc8e84d17c16a362ce13f1e273683bd96c75a0ab 100644
--- a/Code/Learning/otbSVMImageClassificationWithRuleFilter.txx
+++ b/Code/Learning/otbSVMImageClassificationWithRuleFilter.txx
@@ -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.
=========================================================================*/
@@ -38,7 +38,7 @@ void
SVMImageClassificationWithRuleFilter< TInputImage, TOutputImage, TMaskImage >
::GenerateOutputInformation ()
{
- Superclass::GenerateOutputInformation();
+ Superclass::GenerateOutputInformation();
if ( this->GetModel() == NULL )
{
@@ -46,11 +46,11 @@ SVMImageClassificationWithRuleFilter< TInputImage, TOutputImage, TMaskImage >
}
// add output information on the rule image
- this->GetOutputRule()->SetNumberOfComponentsPerPixel(
- this->GetModel()->GetNumberOfClasses() * ( this->GetModel()->GetNumberOfClasses()-1 ) / 2 );
+ this->GetOutputRule()->SetNumberOfComponentsPerPixel(
+ this->GetModel()->GetNumberOfClasses() * ( this->GetModel()->GetNumberOfClasses()-1 ) / 2 );
- this->GetOutputRule()->CopyInformation( this->GetInput() );
- this->GetOutputRule()->SetRegions( this->GetInput()->GetLargestPossibleRegion() );
+ this->GetOutputRule()->CopyInformation( this->GetInput() );
+ this->GetOutputRule()->SetRegions( this->GetInput()->GetLargestPossibleRegion() );
}
template < class TInputImage, class TOutputImage, class TMaskImage >
@@ -66,10 +66,10 @@ SVMImageClassificationWithRuleFilter< TInputImage, TOutputImage, TMaskImage >
}
// add allocation for the rule image
- OutputRuleImageType * output = this->GetOutputRule();
- output->SetNumberOfComponentsPerPixel(
- this->GetModel()->GetNumberOfClasses() * ( this->GetModel()->GetNumberOfClasses()-1 ) / 2 );
- output->Allocate();
+ OutputRuleImageType * output = this->GetOutputRule();
+ output->SetNumberOfComponentsPerPixel(
+ this->GetModel()->GetNumberOfClasses() * ( this->GetModel()->GetNumberOfClasses()-1 ) / 2 );
+ output->Allocate();
}
template < class TInputImage, class TOutputImage, class TMaskImage >
@@ -105,7 +105,7 @@ SVMImageClassificationWithRuleFilter< TInputImage, TOutputImage, TMaskImage >
}
bool validPoint = true;
- typename ModelType::DistancesVectorType defaultDistancesVector
+ typename ModelType::DistancesVectorType defaultDistancesVector
( outputRulePtr->GetNumberOfComponentsPerPixel() );
defaultDistancesVector.Fill( itk::NumericTraits< RuleValueType >::ZeroValue() );
diff --git a/Code/Learning/otbSVMImageModelEstimator.txx b/Code/Learning/otbSVMImageModelEstimator.txx
index 08c32d4ab91b957fd0004126262598204672029d..fe406ea4d347a48b13a086d2b510939f6f16121e 100644
--- a/Code/Learning/otbSVMImageModelEstimator.txx
+++ b/Code/Learning/otbSVMImageModelEstimator.txx
@@ -58,7 +58,7 @@ void
SVMImageModelEstimator<TInputImage, TTrainingImage>
::SetInputImage(const TInputImage * inputImage)
{
- this->itk::ProcessObject::SetNthInput(0,const_cast<TInputImage*>(inputImage));
+ this->itk::ProcessObject::SetNthInput(0,const_cast<TInputImage*>(inputImage));
}
diff --git a/Code/Learning/otbSVMModel.txx b/Code/Learning/otbSVMModel.txx
index c986f5447eebb3a34bee35a66667cd1bc4bceb51..da6475407f59d484143a8bde5454d1d9c0f58717 100644
--- a/Code/Learning/otbSVMModel.txx
+++ b/Code/Learning/otbSVMModel.txx
@@ -27,7 +27,7 @@
namespace otb
{
// TODO: Check memory allocation in this class
-template <class TValue,class TLabel>
+template <class TValue,class TLabel>
SVMModel<TValue,TLabel>::SVMModel()
{
// Default parameters
@@ -56,13 +56,13 @@ SVMModel<TValue,TLabel>::SVMModel()
this->Initialize();
}
-template <class TValue,class TLabel>
+template <class TValue,class TLabel>
SVMModel<TValue,TLabel>::~SVMModel()
{
this->DeleteModel();
this->DeleteProblem();
}
-template <class TValue,class TLabel>
+template <class TValue,class TLabel>
void
SVMModel<TValue,TLabel>::Initialize()
{
@@ -90,11 +90,11 @@ SVMModel<TValue,TLabel>::Initialize()
m_Problem.y = NULL;
m_Problem.x = NULL;
- m_ProblemUpToDate = false;
+ m_ProblemUpToDate = false;
}
-template <class TValue,class TLabel>
+template <class TValue,class TLabel>
void
SVMModel<TValue,TLabel>::Reset()
{
@@ -108,17 +108,17 @@ SVMModel<TValue,TLabel>::Reset()
this->Initialize();
}
-template <class TValue,class TLabel>
+template <class TValue,class TLabel>
void
SVMModel<TValue,TLabel>::DeleteModel()
-{
+{
if(m_Model)
{
svm_destroy_model(m_Model);
m_Model = NULL;
}
}
-template <class TValue,class TLabel>
+template <class TValue,class TLabel>
void
SVMModel<TValue,TLabel>::DeleteProblem()
{
@@ -134,9 +134,9 @@ SVMModel<TValue,TLabel>::DeleteProblem()
for(int i = 0; i < m_Problem.l;++i)
{
if(m_Problem.x[i])
- {
- delete [] m_Problem.x[i];
- }
+ {
+ delete [] m_Problem.x[i];
+ }
}
delete [] m_Problem.x;
m_Problem.x = NULL;
@@ -147,7 +147,7 @@ SVMModel<TValue,TLabel>::DeleteProblem()
template <class TValue, class TLabel>
-void
+void
SVMModel<TValue,TLabel>::AddSample(const MeasurementType & measure, const LabelType & label)
{
SampleType newSample(measure,label);
@@ -156,7 +156,7 @@ SVMModel<TValue,TLabel>::AddSample(const MeasurementType & measure, const LabelT
}
template <class TValue, class TLabel>
-void
+void
SVMModel<TValue,TLabel>::ClearSamples()
{
m_Samples.clear();
@@ -164,7 +164,7 @@ SVMModel<TValue,TLabel>::ClearSamples()
}
template <class TValue, class TLabel>
-void
+void
SVMModel<TValue,TLabel>::SetSamples(const SamplesVectorType & samples)
{
m_Samples = samples;
@@ -172,7 +172,7 @@ SVMModel<TValue,TLabel>::SetSamples(const SamplesVectorType & samples)
}
template <class TValue, class TLabel>
-void
+void
SVMModel<TValue,TLabel>::BuildProblem()
{
// Check if problem is up-to-date
@@ -197,7 +197,7 @@ SVMModel<TValue,TLabel>::BuildProblem()
// Deallocate any previous problem
this->DeleteProblem();
- // Allocate the problem
+ // Allocate the problem
m_Problem.l = probl;
m_Problem.y = new double[probl];
m_Problem.x = new struct svm_node*[probl];
@@ -235,7 +235,7 @@ SVMModel<TValue,TLabel>::BuildProblem()
// Populate the svm nodes
for(typename MeasurementType::const_iterator eIt = measure.begin();
- eIt!=measure.end() && elementIndex < elements ;++eIt,++elementIndex)
+ eIt!=measure.end() && elementIndex < elements ;++eIt,++elementIndex)
{
m_Problem.x[sampleIndex][elementIndex].index = elementIndex+1;
m_Problem.x[sampleIndex][elementIndex].value = (*eIt);
@@ -283,11 +283,11 @@ SVMModel<TValue,TLabel>::CrossValidation(unsigned int nbFolders)
double total_correct = 0.;
for(i=0;i<length;i++)
- {
+ {
if(target[i] == m_Problem.y[i])
- {
- ++total_correct;
- }
+ {
+ ++total_correct;
+ }
}
double accuracy = total_correct/length;
@@ -299,7 +299,7 @@ SVMModel<TValue,TLabel>::CrossValidation(unsigned int nbFolders)
}
template <class TValue, class TLabel>
-void
+void
SVMModel<TValue,TLabel>::ConsistencyCheck()
{
if (m_Parameters.svm_type == ONE_CLASS && this->GetDoProbabilityEstimates())
@@ -317,7 +317,7 @@ SVMModel<TValue,TLabel>::ConsistencyCheck()
}
template <class TValue, class TLabel>
-void
+void
SVMModel<TValue,TLabel>::Train()
{
// If the model is already up-to-date, return
@@ -353,7 +353,7 @@ SVMModel<TValue,TLabel>::EvaluateLabel(const MeasurementType & measure) const
if(!m_ModelUpToDate)
{
itkExceptionMacro(<<"Model is not up-to-date, can not predict label");
- }
+ }
// Check probability prediction
bool predict_probability = 1;
@@ -469,7 +469,7 @@ SVMModel<TValue,TLabel>::EvaluateHyperplanesDistances(const MeasurementType & me
return (distances);
}
-template <class TValue,class TLabel>
+template <class TValue,class TLabel>
void
SVMModel<TValue,TLabel>::SetModel(struct svm_model* aModel)
{
@@ -479,7 +479,7 @@ SVMModel<TValue,TLabel>::SetModel(struct svm_model* aModel)
}
-template <class TValue,class TLabel>
+template <class TValue,class TLabel>
void
SVMModel<TValue,TLabel>::SaveModel(const char* model_file_name) const
{
@@ -490,7 +490,7 @@ SVMModel<TValue,TLabel>::SaveModel(const char* model_file_name) const
}
}
-template <class TValue,class TLabel>
+template <class TValue,class TLabel>
void
SVMModel<TValue,TLabel>::LoadModel(const char* model_file_name)
{
@@ -505,8 +505,8 @@ SVMModel<TValue,TLabel>::LoadModel(const char* model_file_name)
m_ModelUpToDate = true;
}
-template <class TValue,class TLabel>
-typename SVMModel<TValue,TLabel>::Pointer
+template <class TValue,class TLabel>
+typename SVMModel<TValue,TLabel>::Pointer
SVMModel<TValue,TLabel>::GetCopy() const
{
Pointer modelCopy = New();
@@ -522,7 +522,7 @@ SVMModel<TValue,TLabel>::PrintSelf(std::ostream& os, itk::Indent indent) const
Superclass::PrintSelf(os,indent);
}
-template <class TValue,class TLabel>
+template <class TValue,class TLabel>
void
SVMModel<TValue,TLabel>::SetSupportVectors(svm_node ** sv, int nbOfSupportVector)
{
@@ -593,7 +593,7 @@ SVMModel<TValue,TLabel>::SetSupportVectors(svm_node ** sv, int nbOfSupportVector
}
}
-template <class TValue,class TLabel>
+template <class TValue,class TLabel>
void
SVMModel<TValue,TLabel>::SetAlpha( double ** alpha, int nbOfSupportVector )
{
diff --git a/Code/Learning/otbSVMModelEstimator.txx b/Code/Learning/otbSVMModelEstimator.txx
index 664117d7db17e1937dee67b334cb53605a95146e..d011a0e524086f4f76f8b94e889f684a6e7f0a1b 100644
--- a/Code/Learning/otbSVMModelEstimator.txx
+++ b/Code/Learning/otbSVMModelEstimator.txx
@@ -131,39 +131,39 @@ SVMModelEstimator<InputPixelType, LabelPixelType>
switch(this->GetModel()->GetKernelType())
{
case LINEAR:
- // C
- initialParameters.SetSize(1);
- initialParameters[0] = this->GetModel()->GetC();
- break;
+ // C
+ initialParameters.SetSize(1);
+ initialParameters[0] = this->GetModel()->GetC();
+ break;
case POLY:
- // C, gamma and coef0
- initialParameters.SetSize(3);
- initialParameters[0] = this->GetModel()->GetC();
- initialParameters[1] = this->GetModel()->GetKernelGamma();
- initialParameters[2] = this->GetModel()->GetKernelCoef0();
- break;
+ // C, gamma and coef0
+ initialParameters.SetSize(3);
+ initialParameters[0] = this->GetModel()->GetC();
+ initialParameters[1] = this->GetModel()->GetKernelGamma();
+ initialParameters[2] = this->GetModel()->GetKernelCoef0();
+ break;
case RBF:
- // C and gamma
- initialParameters.SetSize(2);
- initialParameters[0] = this->GetModel()->GetC();
- initialParameters[1] = this->GetModel()->GetKernelGamma();
- break;
+ // C and gamma
+ initialParameters.SetSize(2);
+ initialParameters[0] = this->GetModel()->GetC();
+ initialParameters[1] = this->GetModel()->GetKernelGamma();
+ break;
case SIGMOID:
- // C, gamma and coef0
- initialParameters.SetSize(3);
- initialParameters[0] = this->GetModel()->GetC();
- initialParameters[1] = this->GetModel()->GetKernelGamma();
- initialParameters[2] = this->GetModel()->GetKernelCoef0();
- break;
+ // C, gamma and coef0
+ initialParameters.SetSize(3);
+ initialParameters[0] = this->GetModel()->GetC();
+ initialParameters[1] = this->GetModel()->GetKernelGamma();
+ initialParameters[2] = this->GetModel()->GetKernelCoef0();
+ break;
default:
- // Only C
- initialParameters.SetSize(1);
- initialParameters[0] = this->GetModel()->GetC();
- break;
+ // Only C
+ initialParameters.SetSize(1);
+ initialParameters[0] = this->GetModel()->GetC();
+ break;
}
m_InitialCrossValidationAccuracy = crossValidationFunction->GetValue(initialParameters);
@@ -212,34 +212,34 @@ SVMModelEstimator<InputPixelType, LabelPixelType>
switch(this->GetModel()->GetKernelType())
{
case LINEAR:
- // C
- this->GetModel()->SetC(fineBestParameters[0]);
- break;
+ // C
+ this->GetModel()->SetC(fineBestParameters[0]);
+ break;
case POLY:
- // C, gamma and coef0
- this->GetModel()->SetC(fineBestParameters[0]);
- this->GetModel()->SetKernelGamma(fineBestParameters[1]);
- this->GetModel()->SetKernelCoef0(fineBestParameters[2]);
- break;
+ // C, gamma and coef0
+ this->GetModel()->SetC(fineBestParameters[0]);
+ this->GetModel()->SetKernelGamma(fineBestParameters[1]);
+ this->GetModel()->SetKernelCoef0(fineBestParameters[2]);
+ break;
case RBF:
- // C and gamma
- this->GetModel()->SetC(fineBestParameters[0]);
- this->GetModel()->SetKernelGamma(fineBestParameters[1]);
- break;
+ // C and gamma
+ this->GetModel()->SetC(fineBestParameters[0]);
+ this->GetModel()->SetKernelGamma(fineBestParameters[1]);
+ break;
case SIGMOID:
- // C, gamma and coef0
- this->GetModel()->SetC(fineBestParameters[0]);
- this->GetModel()->SetKernelGamma(fineBestParameters[1]);
- this->GetModel()->SetKernelCoef0(fineBestParameters[2]);
- break;
+ // C, gamma and coef0
+ this->GetModel()->SetC(fineBestParameters[0]);
+ this->GetModel()->SetKernelGamma(fineBestParameters[1]);
+ this->GetModel()->SetKernelCoef0(fineBestParameters[2]);
+ break;
default:
- // Only C
- this->GetModel()->SetC(fineBestParameters[0]);
- break;
+ // Only C
+ this->GetModel()->SetC(fineBestParameters[0]);
+ break;
}
}
}
diff --git a/Code/Learning/otbSVMPointSetModelEstimator.h b/Code/Learning/otbSVMPointSetModelEstimator.h
index 4cbd6ac44871a59e9d0ada14272a3499702423d1..03acd36ab0d79d381d6d91e0951374ea6205c63f 100644
--- a/Code/Learning/otbSVMPointSetModelEstimator.h
+++ b/Code/Learning/otbSVMPointSetModelEstimator.h
@@ -54,7 +54,7 @@ public:
typedef SVMModelEstimator<typename TInputPointSet::PixelType::value_type, typename TTrainingPointSet::PixelType> Superclass;
typedef itk::SmartPointer<Self> Pointer;
typedef itk::SmartPointer<const Self> ConstPointer;
-
+
/** Method for creation through the object factory. */
itkNewMacro(Self);
diff --git a/Code/Learning/otbSVMPointSetModelEstimator.txx b/Code/Learning/otbSVMPointSetModelEstimator.txx
index f96b0e8b322a37af92e6fbce5910829787592750..9ef4e5a8692e818f7798985607c18c2ae69e10bd 100644
--- a/Code/Learning/otbSVMPointSetModelEstimator.txx
+++ b/Code/Learning/otbSVMPointSetModelEstimator.txx
@@ -57,7 +57,7 @@ void
SVMPointSetModelEstimator<TInputPointSet, TTrainingPointSet>
::SetInputPointSet(const TInputPointSet * inputPointSet)
{
- this->itk::ProcessObject::SetNthInput(0,const_cast<TInputPointSet *>(inputPointSet));
+ this->itk::ProcessObject::SetNthInput(0,const_cast<TInputPointSet *>(inputPointSet));
}
diff --git a/Code/Markov/otbMarkovRandomFieldFilter.txx b/Code/Markov/otbMarkovRandomFieldFilter.txx
index c4b9bebe66d44e9f261b5cb24ff10f4db785d02f..a9718864a1fc34edb647a822487c7f4501519057 100644
--- a/Code/Markov/otbMarkovRandomFieldFilter.txx
+++ b/Code/Markov/otbMarkovRandomFieldFilter.txx
@@ -385,7 +385,7 @@ MarkovRandomFieldFilter<TInputImage, TClassifiedImage>
otbMsgDevMacro(<< "m_ErrorCounter/m_TotalNumberOfPixelsInInputImage: "
<< m_ErrorCounter/((double)(m_TotalNumberOfPixelsInInputImage)));
- otbMsgDevMacro(<< "m_ImageDeltaEnergy: " << m_ImageDeltaEnergy);
+ otbMsgDevMacro(<< "m_ImageDeltaEnergy: " << m_ImageDeltaEnergy);
++m_NumberOfIterations;
diff --git a/Code/MultiScale/otbWaveletFilterBank.h b/Code/MultiScale/otbWaveletFilterBank.h
index 3697323044a1156f2966ab80c4608998c4bc60eb..442b2187e662d7fb13dceafbd410fd193413b360 100644
--- a/Code/MultiScale/otbWaveletFilterBank.h
+++ b/Code/MultiScale/otbWaveletFilterBank.h
@@ -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.
=========================================================================*/
@@ -37,11 +37,11 @@ namespace otb {
* \brief One level stationary wavelet transform
*
* This implementation performs a low-pass / high-pass wavelet transformation
- * of an image. The wavelet transformation is defined by a inner product
+ * of an image. The wavelet transformation is defined by a inner product
* (ie. convolution-like operation).
*
* the inner operator are supposed to be defined through 1D filters. Then, the
- * forward transformation yields \f$ 2^{\test{Dim}} \f$ output images, while the inverse
+ * forward transformation yields \f$ 2^{\test{Dim}} \f$ output images, while the inverse
* transformation requires \f$ 2^{\text{Dim}} \f$ input image for one output.
*
* In case of 1D, GetOutput(0) -> LowPass
@@ -66,7 +66,7 @@ namespace otb {
* Dim (n-1) Dim (n-2) Dim (n-3) ... Dim 1 Dim 0
*
* -> x_(n-1) x_(n-2) x_(n-3) x_1 x_0
- *
+ *
* And conversely in the inverse transformation.
*
* \todo: At present version, there is not consideration on meta data information that can be transmited
@@ -79,7 +79,7 @@ namespace otb {
*
* \ingroup Streamed
*/
-template < class TInputImage, class TOutputImage,
+template < class TInputImage, class TOutputImage,
class TWaveletOperator,
InverseOrForwardTransformationEnum TDirectionOfTransformation >
class ITK_EXPORT WaveletFilterBank
@@ -109,13 +109,13 @@ private:
/** \class FilterBank
* \brief Template specialization of FilterBank for forward transformaiton
- *
+ *
* This implementation performs a low-pass / high-pass wavelet transformation
- * of an image. The wavelet transformation is defined by a inner product
+ * of an image. The wavelet transformation is defined by a inner product
* (ie. convolution-like operation).
*
* The inner operator are supposed to be defined through 1D filters. Then, the
- * forward transformation yields \f$ 2^{\test{Dim}} \f$ output images, while the inverse
+ * forward transformation yields \f$ 2^{\test{Dim}} \f$ output images, while the inverse
* transformation requires \f$ 2^{\text{Dim}} \f$ input image for one output.
*
* In case of 1D, GetOutput(0) -> LowPass
@@ -140,7 +140,7 @@ private:
* Dim (n-1) Dim (n-2) Dim (n-3) ... Dim 1 Dim 0
*
* -> x_(n-1) x_(n-2) x_(n-3) x_1 x_0
- *
+ *
* And conversely in the inverse transformation.
*
* \todo: At present version, there is not consideration on meta data information that can be transmited
@@ -198,7 +198,7 @@ public:
itkSetMacro(UpSampleFilterFactor,unsigned int);
/**
- * Set/Get the level of down sampling of the image used in forward algorithm.
+ * Set/Get the level of down sampling of the image used in forward algorithm.
* (or upsampling in the inverse case)
*
* In this implementation, we are not dealing with M-band decomposition then m_SubsampleImageFactor
@@ -211,7 +211,7 @@ protected:
WaveletFilterBank();
virtual ~WaveletFilterBank() {}
- /** GenerateOutputInformation
+ /** GenerateOutputInformation
* Set the size of the output image depending on the decimation factor
* Copy informations from the input image if existing.
**/
@@ -219,7 +219,7 @@ protected:
/** The forward transformation needs a larger input requested
* region than the output requested region (larger by subsampling
- * but also by the kernel size used in the filter bank).
+ * but also by the kernel size used in the filter bank).
*
* Then, the class needs to provide an implementation
* for GenerateInputRequestedRegion() in order to inform the
@@ -233,9 +233,9 @@ protected:
*/
virtual void BeforeThreadedGenerateData ();
- /** Internal Data Allocation
+ /** Internal Data Allocation
* If m_SubsampleImageFactor != 1, internal data with progressive region size
- * subsampling if required...
+ * subsampling if required...
*/
virtual void AllocateInternalData ( const OutputImageRegionType& outputRegion );
@@ -245,29 +245,29 @@ protected:
virtual void AfterThreadedGenerateData ();
/** CallCopyOutputRegionToInputRegion
- * Since input and output image may be of different size when a
- * subsampling factor has tp be applied, Region estimation
+ * Since input and output image may be of different size when a
+ * subsampling factor has tp be applied, 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 );
/** CallCopyOutputRegionToInputRegion
- * This function is also redefined in order to adapt the shape of the regions with
+ * This function is also redefined in order to adapt the shape of the regions with
* resect to the direction (among the dimensions) of the filtering.
*/
virtual void CallCopyOutputRegionToInputRegion ( unsigned int direction,
InputImageRegionType & destRegion, const OutputImageRegionType & srcRegion );
- virtual void CallCopyInputRegionToOutputRegion ( unsigned int direction,
+ virtual void CallCopyInputRegionToOutputRegion ( unsigned int direction,
OutputImageRegionType & destRegion, const InputImageRegionType & srcRegion );
/** Generate data redefinition */
virtual void ThreadedGenerateData ( const OutputImageRegionType& outputRegionForThread, int threadId );
/** Iterative call to the forward filter bank at each dimension. */
- virtual void ThreadedGenerateDataAtDimensionN ( unsigned int idx, unsigned int direction,
+ virtual void ThreadedGenerateDataAtDimensionN ( unsigned int idx, unsigned int direction,
itk::ProgressReporter & reporter,
const OutputImageRegionType& outputRegionForThread, int threadId );
@@ -279,8 +279,8 @@ private:
unsigned int m_SubsampleImageFactor;
/** the easiest way to store internal images is to keep track of the splits
- * at each direction. Then, std::vector< InternalImagesTabular > is a tab of
- * size ImageDimension-1 and each InternalImagesTabular contains intermediate
+ * at each direction. Then, std::vector< InternalImagesTabular > is a tab of
+ * size ImageDimension-1 and each InternalImagesTabular contains intermediate
* images.
*/
typedef std::vector< OutputImagePointerType > InternalImagesTabular ;
@@ -292,11 +292,11 @@ private:
* \brief Template specialization of FilterBank for inverse transformation
*
* This implementation performs a low-pass / high-pass wavelet transformation
- * of an image. The wavelet transformation is defined by a inner product
+ * of an image. The wavelet transformation is defined by a inner product
* (ie. convolution-like operation).
*
* The inner operator are supposed to be defined through 1D filters. Then, the
- * forward transformation yields \f$ 2^{\test{Dim}} \f$ output images, while the inverse
+ * forward transformation yields \f$ 2^{\test{Dim}} \f$ output images, while the inverse
* transformation requires \f$ 2^{\text{Dim}} \f$ input image for one output.
*
* In case of 1D, GetOutput(0) -> LowPass
@@ -321,7 +321,7 @@ private:
* Dim (n-1) Dim (n-2) Dim (n-3) ... Dim 1 Dim 0
*
* -> x_(n-1) x_(n-2) x_(n-3) x_1 x_0
- *
+ *
* And conversely in the inverse transformation.
*
* \todo: At present version, there is not consideration on meta data information that can be transmited
@@ -379,7 +379,7 @@ public:
itkSetMacro(UpSampleFilterFactor,unsigned int);
/**
- * Set/Get the level of down sampling of the image used in forward algorithm.
+ * Set/Get the level of down sampling of the image used in forward algorithm.
* (or upsampling in the inverse case)
*
* In this implementation, we are dealing with M-band decomposition then m_SubsampleImageFactor
@@ -393,7 +393,7 @@ protected:
WaveletFilterBank();
virtual ~WaveletFilterBank() {}
- /** GenerateOutputInformation
+ /** GenerateOutputInformation
* Set the size of the output image depending on the decimation factor
* Copy informations from the input image if existing.
**/
@@ -401,7 +401,7 @@ protected:
/** The inverse transformation needs larger inputs requested
* region than the output requested region (larger by subsampling
- * but also by the kernel size used in the filter bank).
+ * but also by the kernel size used in the filter bank).
*
* Then, the class needs to provide an implementation
* for GenerateInputRequestedRegion() in order to inform the
@@ -416,9 +416,9 @@ protected:
*/
virtual void BeforeThreadedGenerateData ();
- /** Internal Data Allocation
+ /** Internal Data Allocation
* If m_SubsampleImageFactor != 1, internal data with progressive region size
- * subsampling if required...
+ * subsampling if required...
*/
virtual void AllocateInternalData ( const OutputImageRegionType& outputRegion );
@@ -428,32 +428,32 @@ protected:
virtual void AfterThreadedGenerateData ();
/** CallCopyOutputRegionToInputRegion
- * Since input and output image may be of different size when a
- * subsampling factor has tp be applied, Region estimation
+ * Since input and output image may be of different size when a
+ * subsampling factor has tp be applied, 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 );
/** CallCopyOutputRegionToInputRegion
- * This function is also redefined in order to adapt the shape of the regions with
+ * This function is also redefined in order to adapt the shape of the regions with
* resect to the direction (among the dimensions) of the filtering.
*/
virtual void CallCopyOutputRegionToInputRegion ( unsigned int direction,
InputImageRegionType & destRegion, const OutputImageRegionType & srcRegion );
- virtual void CallCopyInputRegionToOutputRegion ( unsigned int direction,
+ virtual void CallCopyInputRegionToOutputRegion ( unsigned int direction,
OutputImageRegionType & destRegion, const InputImageRegionType & srcRegion );
/** Generate data redefinition */
virtual void ThreadedGenerateData ( const OutputImageRegionType& outputRegionForThread, int threadId );
- /**
- * Iterative call to the forward filter bank at each dimension.
+ /**
+ * Iterative call to the forward filter bank at each dimension.
* Used for the multiresolution case only.
*/
- virtual void ThreadedGenerateDataAtDimensionN ( unsigned int direction,
+ virtual void ThreadedGenerateDataAtDimensionN ( unsigned int direction,
itk::ProgressReporter & reporter,
const OutputImageRegionType& outputRegionForThread, int threadId );
@@ -465,8 +465,8 @@ private:
unsigned int m_SubsampleImageFactor;
/** the easiest way to store internal images is to keep track of the splits
- * at each direction. Then, std::vector< InternalImagesTabular > is a tab of
- * size ImageDimension-1 and each InternalImagesTabular contains intermediate
+ * at each direction. Then, std::vector< InternalImagesTabular > is a tab of
+ * size ImageDimension-1 and each InternalImagesTabular contains intermediate
* images. Internal images are used for multiresolution case only.
*/
typedef std::vector< OutputImagePointerType > InternalImagesTabular ;
diff --git a/Code/MultiScale/otbWaveletFilterBank.txx b/Code/MultiScale/otbWaveletFilterBank.txx
index a520e99c239a9e11139322a6978997961ebc7f97..ce7b811278eb632a1dfd414f8d0ee8d9499a42b5 100644
--- a/Code/MultiScale/otbWaveletFilterBank.txx
+++ b/Code/MultiScale/otbWaveletFilterBank.txx
@@ -954,7 +954,7 @@ WaveletFilterBank< TInputImage, TOutputImage, TWaveletOperator, INVERSE >
outputRegionForThread.GetNumberOfPixels() * this->GetNumberOfInputs() );
InputImageRegionType inputRegionForThread;
- this->CallCopyOutputRegionToInputRegion( inputRegionForThread, outputRegionForThread );
+ this->CallCopyOutputRegionToInputRegion( inputRegionForThread, outputRegionForThread );
unsigned int dir = 0;
diff --git a/Code/MultiScale/otbWaveletForwardTransform.txx b/Code/MultiScale/otbWaveletForwardTransform.txx
index 89ae59636deb5b5cd01b96b7b471ee074507041c..15bc09b7cd375974c7da0ab351a167e3aa375439 100644
--- a/Code/MultiScale/otbWaveletForwardTransform.txx
+++ b/Code/MultiScale/otbWaveletForwardTransform.txx
@@ -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.
=========================================================================*/
@@ -90,7 +90,7 @@ WaveletForwardTransform< TInputImage, TOutputImage, TFilter >
unsigned int subSampleFactor = 0;
while ( nbDecomp > 0 )
- {
+ {
/*
std::cerr << "Doing Decomp " << nbDecomp << "\n";
std::cerr << "outputIdxForGraft = " << outputIdxForGraft << "\n";
diff --git a/Code/MultiScale/otbWaveletGenerator.cxx b/Code/MultiScale/otbWaveletGenerator.cxx
index 6aafa6fa8d204a4eaff5f8ac3ee8d54130fcdcc3..bfe5be5061d26b5d863071cd490a1afa569a6c0c 100644
--- a/Code/MultiScale/otbWaveletGenerator.cxx
+++ b/Code/MultiScale/otbWaveletGenerator.cxx
@@ -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.
=========================================================================*/
@@ -31,7 +31,7 @@ namespace otb {
* Standart (useless) definition for unknown wavelet
*/
template < MotherWaveletOperatorEnum TMotherWaveletOperator >
-const char *
+const char *
WaveletGenerator< TMotherWaveletOperator >
::GetWaveletName () const
{
@@ -90,7 +90,7 @@ WaveletGenerator<HAAR>
coeff.resize(3);
// stands for z^{-1}
- coeff[0] = 0.0;
+ coeff[0] = 0.0;
// stands for z^0
coeff[1] = 0.5 * sqrt2;
// stands for z^1
@@ -362,10 +362,10 @@ WaveletGenerator<DAUBECHIES20>
/**
* Template specialization for the Spline Biorthogonal Wavelet.
*
- * M.Antonini, M.Barlaud, P.Mathieu, I.Daubechies
- * Image Coding Using Wavelet Transform
- * IEEE Transactions on Image Processing,
- * vol 1(2), pp:205-220, April 1992
+ * M.Antonini, M.Barlaud, P.Mathieu, I.Daubechies
+ * Image Coding Using Wavelet Transform
+ * IEEE Transactions on Image Processing,
+ * vol 1(2), pp:205-220, April 1992
*/
template <>
const char * WaveletGenerator<SPLINE_BIORTHOGONAL_2_4>::GetWaveletName () const
@@ -412,15 +412,15 @@ WaveletGenerator<SPLINE_BIORTHOGONAL_2_4>
/**
* Template specialization for the Spline Biorthogonal Wavelet.
*
- * M.Antonini, M.Barlaud, P.Mathieu, I.Daubechies
- * Image Coding Using Wavelet Transform
- * IEEE Transactions on Image Processing,
- * vol 1(2), pp:205-220, April 1992
+ * M.Antonini, M.Barlaud, P.Mathieu, I.Daubechies
+ * Image Coding Using Wavelet Transform
+ * IEEE Transactions on Image Processing,
+ * vol 1(2), pp:205-220, April 1992
*
- * Also in Daubechies's "Ten Lectures on Wavelet": in
- * less disparate filter lengths, pp 278--279.
+ * Also in Daubechies's "Ten Lectures on Wavelet": in
+ * less disparate filter lengths, pp 278--279.
*
- * Also known as 7/9 filter.
+ * Also known as 7/9 filter.
*/
template <>
const char * WaveletGenerator<SPLINE_BIORTHOGONAL_4_4>::GetWaveletName () const
diff --git a/Code/MultiScale/otbWaveletGenerator.h b/Code/MultiScale/otbWaveletGenerator.h
index 73c68b3067826aede2c78fb8a770f4300d1547e0..2556d863690fc9062b5ee27a38e3e9aa939709b3 100644
--- a/Code/MultiScale/otbWaveletGenerator.h
+++ b/Code/MultiScale/otbWaveletGenerator.h
@@ -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.
=========================================================================*/
@@ -38,17 +38,17 @@ typedef enum {
SPLINE_BIORTHOGONAL_2_4, // 6
SPLINE_BIORTHOGONAL_4_4, // 7
SYMLET8, // 8
- TotalNumberOfDefinedMotherWavelets
+ TotalNumberOfDefinedMotherWavelets
} MotherWaveletOperatorEnum;
/** \class WaveletGenerator
* \brief Wavelet coefficient definition
*
- * The wavelet coefficent definitions mainly come from
- * "Ten Lecture on Wavelets", of Ingrid Daubechies,
+ * The wavelet coefficent definitions mainly come from
+ * "Ten Lecture on Wavelets", of Ingrid Daubechies,
* Society for Industrial and Applied Mathematics, 1992.
*
- * The class is templated with the wavelet ID from the
+ * The class is templated with the wavelet ID from the
* MotherWaveletOperatorEnum type. The members throw an
* exception if the template specialisation is not defined
* according to the wavelet ID.
diff --git a/Code/MultiScale/otbWaveletHighPassOperator.h b/Code/MultiScale/otbWaveletHighPassOperator.h
index 0b4b9ad5f72c9a772f8f29c0efc8f774b0cf4bb1..2b8c2ada1bc28a4e1114a8fc401a105368ebf701 100644
--- a/Code/MultiScale/otbWaveletHighPassOperator.h
+++ b/Code/MultiScale/otbWaveletHighPassOperator.h
@@ -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,10 +29,10 @@ namespace otb {
/**
* \class WaveletHighPassOperator
- * \brief Specific implementation of the mother wavelet part of
+ * \brief Specific implementation of the mother wavelet part of
* wavelet transformator
*
- * This class implements the generic construction of the high pass filter
+ * This class implements the generic construction of the high pass filter
* in a wavelet transformation.
*
* \sa WaveletOperator
@@ -43,13 +43,13 @@ template < MotherWaveletOperatorEnum TMotherWaveletOperator,
class TPixel, unsigned int VDimension,
class TAllocator = itk::NeighborhoodAllocator< TPixel > >
class ITK_EXPORT WaveletHighPassOperator
- : public WaveletOperatorBase< TMotherWaveletOperator,
+ : public WaveletOperatorBase< TMotherWaveletOperator,
TPixel, VDimension, TAllocator >
{
public:
/** Standard typedefs */
typedef WaveletHighPassOperator Self;
- typedef WaveletOperatorBase< TMotherWaveletOperator,
+ typedef WaveletOperatorBase< TMotherWaveletOperator,
TPixel, VDimension, TAllocator> Superclass;
itkTypeMacro(WaveletHighPassOperator, WaveletOperatorBase);
@@ -60,8 +60,8 @@ public:
protected:
- virtual void PrintSelf(std::ostream &os, itk::Indent i) const
- {
+ virtual void PrintSelf(std::ostream &os, itk::Indent i) const
+ {
os << i << "WaveletHighPassOperator {this=" << this << "}" << std::endl;
Superclass::PrintSelf(os, i.GetNextIndent());
}
diff --git a/Code/MultiScale/otbWaveletLowPassOperator.h b/Code/MultiScale/otbWaveletLowPassOperator.h
index c73304352ab269fd951cc3c7452b1fc62a9b822e..420fc425b5ec92256494dec31bcec964978ffd6a 100644
--- a/Code/MultiScale/otbWaveletLowPassOperator.h
+++ b/Code/MultiScale/otbWaveletLowPassOperator.h
@@ -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.
=========================================================================*/
@@ -31,7 +31,7 @@ namespace otb {
* \class WaveletLowPassOperator
* \brief Specific implementation of scale part of wavelet transformator
*
- * This class implements the generic construction of the low pass filter
+ * This class implements the generic construction of the low pass filter
* in a wavelet transformation.
*
* \sa WaveletOperatorBase
@@ -42,13 +42,13 @@ template < MotherWaveletOperatorEnum TMotherWaveletOperator,
class TPixel, unsigned int VDimension,
class TAllocator = itk::NeighborhoodAllocator< TPixel > >
class ITK_EXPORT WaveletLowPassOperator
- : public WaveletOperatorBase< TMotherWaveletOperator,
+ : public WaveletOperatorBase< TMotherWaveletOperator,
TPixel, VDimension, TAllocator >
{
public:
/** Standard typedefs */
typedef WaveletLowPassOperator Self;
- typedef WaveletOperatorBase< TMotherWaveletOperator,
+ typedef WaveletOperatorBase< TMotherWaveletOperator,
TPixel, VDimension, TAllocator> Superclass;
itkTypeMacro(WaveletLowPassOperator, WaveletOperatorBase);
@@ -59,8 +59,8 @@ public:
protected:
- virtual void PrintSelf(std::ostream &os, itk::Indent i) const
- {
+ virtual void PrintSelf(std::ostream &os, itk::Indent i) const
+ {
os << i << "WaveletLowPassOperator {this=" << this << "}" << std::endl;
Superclass::PrintSelf(os, i.GetNextIndent());
}
diff --git a/Code/MultiScale/otbWaveletOperator.h b/Code/MultiScale/otbWaveletOperator.h
index 44f0eb27878a3a36cea75caa68f210c2ff1eb227..afeb159da8e06b130fda9cef8dc613f02403e167 100644
--- a/Code/MultiScale/otbWaveletOperator.h
+++ b/Code/MultiScale/otbWaveletOperator.h
@@ -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.
=========================================================================*/
@@ -60,18 +60,18 @@ public:
typedef WaveletOperator Self;
/** Typedefs redirections */
- typedef WaveletLowPassOperator<
+ typedef WaveletLowPassOperator<
TMotherWaveletOperator, TDirectionOfTransformation,
- TPixel, VDimension, TAllocator >
+ TPixel, VDimension, TAllocator >
LowPassOperator;
- typedef WaveletHighPassOperator<
+ typedef WaveletHighPassOperator<
TMotherWaveletOperator, TDirectionOfTransformation,
- TPixel, VDimension, TAllocator >
+ TPixel, VDimension, TAllocator >
HighPassOperator;
private:
/**
- * This class may not be instanciated
+ * This class may not be instanciated
* Intentionally not implemented
*/
WaveletOperator ();
diff --git a/Code/MultiScale/otbWaveletOperatorBase.h b/Code/MultiScale/otbWaveletOperatorBase.h
index 85f011ed638802ce50c645313b5079a51db54751..1f8df3ea399ecef40d37980e9e4e1e814403c61f 100644
--- a/Code/MultiScale/otbWaveletOperatorBase.h
+++ b/Code/MultiScale/otbWaveletOperatorBase.h
@@ -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.
=========================================================================*/
@@ -34,23 +34,23 @@ namespace otb {
* \brief A NeighborhoodOperator wavelet base class
*
* This class is the mother class for any wavelet operator that requires
- * "a-trou" approach for shift-invariant wavelet transform. This class has
- * to be derived, it cannot be used directly since GenerateCoefficients() method
+ * "a-trou" approach for shift-invariant wavelet transform. This class has
+ * to be derived, it cannot be used directly since GenerateCoefficients() method
* is still pure virtual.
*
* Any wavelet operator that inherits from this WaveletOperatorBase is to be used
- * as a NeighborhoodOperator that should be applied to a
+ * as a NeighborhoodOperator that should be applied to a
* NeighborhoodIterator using the NeighborhoodInnerProduct method.
*
* It is assumed that any wavelet definition is directional.
*
- * Set the level of up-sampling though SetUpSampleFactor() before calling
- * CreateDirectional(). Each class that inherits from WaveletOperatorBase has
- * to re-implement GenerateCoefficients().
+ * Set the level of up-sampling though SetUpSampleFactor() before calling
+ * CreateDirectional(). Each class that inherits from WaveletOperatorBase has
+ * to re-implement GenerateCoefficients().
*
* The name of the wavelet is defined here but left pure virtual. It is defined
* with the LowPass and HighPass inheritance.
- *
+ *
* \sa WaveletLowPassOperator
* \sa WaveletHighPassOperator
* \sa NeighborhoodOperator
@@ -78,12 +78,12 @@ public:
/** Construction */
WaveletOperatorBase() :
m_UpSampleFactor( 0 )
- {
+ {
m_WaveletGenerator = WaveletGeneratorType::New();
}
/** Construction by copy */
- WaveletOperatorBase( const Self & other )
+ WaveletOperatorBase( const Self & other )
: itk::NeighborhoodOperator<TPixel, VDimension, TAllocator> (other),
m_UpSampleFactor( other.GetUpSampleFactor() )
{
@@ -103,7 +103,7 @@ public:
/**
* Get the level of up sampling of the filter
*/
- unsigned int GetUpSampleFactor () const
+ unsigned int GetUpSampleFactor () const
{
return this->m_UpSampleFactor;
}
@@ -138,37 +138,37 @@ protected:
typedef typename Superclass::CoefficientVector CoefficientVector;
typedef typename Superclass::PixelType PixelType;
- /**
+ /**
* Perform the "a-trou" algorithm for shift-invariant transformation.
* It transforms the filter \f$ H(z) \f$ into \f$ H(z^2) \f$.
*/
void UpSamplingCoefficients ( CoefficientVector & coeff ) ;
- /**
+ /**
* Performs filter reversion, ie. \f$ H(z^{-1}) \f$.
*/
void RevertFilter ( CoefficientVector & coeff );
- /**
+ /**
* Performs the definition of high pass filter in an orthogonal framework
* It follows conjugate quadrature filter (CQF) of the chapter 5 of
- * "Ten Lecture on Wavelets", of Ingrid Daubechies,
+ * "Ten Lecture on Wavelets", of Ingrid Daubechies,
* Society for Industrial and Applied Mathematics, 1992.
- *
+ *
* It defines filter coefficients as \f$ G(z) = - z H(-z^{-1}) \f$.
- * According to Daubechies'notation, it concerns the synthesis (Inverse)
+ * According to Daubechies'notation, it concerns the synthesis (Inverse)
* part of the filter banc.
*/
void GenerateForwardHighPassFilterFromLowPassFilter ( CoefficientVector & coeff );
- /**
+ /**
* Performs the definition of high pass filter in an orthogonal framework
* It follows conjugate quadrature filter (CQF) of the chapter 5 of
- * "Ten Lecture on Wavelets", of Ingrid Daubechies,
+ * "Ten Lecture on Wavelets", of Ingrid Daubechies,
* Society for Industrial and Applied Mathematics, 1992.
- *
+ *
* It defines filter coefficients as \f$ G(z) = z H(-z^{-1}) \f$.
- * According to Daubechies'notation, it concerns the synthesis (Inverse)
+ * According to Daubechies'notation, it concerns the synthesis (Inverse)
* part of the filter banc.
*/
void GenerateInverseHighPassFilterFromLowPassFilter ( CoefficientVector & coeff );
@@ -188,14 +188,14 @@ protected:
/** Arranges coefficients spatially in the memory buffer. */
void Fill(const CoefficientVector& coeff)
- {
- this->FillCenteredDirectional(coeff);
+ {
+ this->FillCenteredDirectional(coeff);
}
#if 0
- /**
+ /**
* Performs the definition of high pass filter from low pass in a
- * bi-orthogonal framework (ie. Quadrature mirror filter).
+ * bi-orthogonal framework (ie. Quadrature mirror filter).
* It defines filter coefficients as \f$ g_n = (-1)^{n+1} h_{-n} \f$
*/
void GetHighPassFilterFromQuadratureLowPassFilter ( CoefficientVector & coeff )
@@ -219,12 +219,12 @@ protected:
}
- /**
+ /**
* Performs the definition of synthesis filter from analysis one.
* Input is the forward low pass filter coefficients.
* It performs \f$ {\tilde G}(z) = -H(-z) \f$.
*/
- void GetInverseHighPassFilterFromForwardLowPassFilter ( CoefficientVector & coeff )
+ void GetInverseHighPassFilterFromForwardLowPassFilter ( CoefficientVector & coeff )
{
unsigned long length = static_cast<unsigned long>( coeff.size() );
unsigned long medianPosition = length/2;
@@ -238,13 +238,13 @@ protected:
}
}
- /**
+ /**
* Performs the definition of synthesis filter from analysis one.
* Input is the forward high pass filter coefficients. It is valid
* for orthogonal and biorthogonal cases.
* It performs \f$ {\tilde H}(z) = G(-z) \f$.
*/
- void GetInverseLowPassFilterFromForwardHighPassFilter ( CoefficientVector & coeff )
+ void GetInverseLowPassFilterFromForwardHighPassFilter ( CoefficientVector & coeff )
{
unsigned long length = static_cast<unsigned long>( coeff.size() );
unsigned long medianPosition = length/2;
diff --git a/Code/MultiScale/otbWaveletOperatorBase.txx b/Code/MultiScale/otbWaveletOperatorBase.txx
index de4749c5083f0eff33d20aece53d91477e681d1c..7040cd164041a5175da6d2e903c87865169cd41b 100644
--- a/Code/MultiScale/otbWaveletOperatorBase.txx
+++ b/Code/MultiScale/otbWaveletOperatorBase.txx
@@ -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.
=========================================================================*/
@@ -26,16 +26,16 @@ namespace otb {
template < MotherWaveletOperatorEnum TMotherWaveletOperator,
class TPixel, unsigned int VDimension, class TAllocator >
-void
+void
WaveletOperatorBase< TMotherWaveletOperator, TPixel, VDimension, TAllocator >
-::PrintSelf ( std::ostream &os, itk::Indent i ) const
-{
+::PrintSelf ( std::ostream &os, itk::Indent i ) const
+{
os << i << "Wavelet kind : " << GetWaveletName() << "\n";
os << i << "Up-Sampling factor " << GetUpSampleFactor() << "\n";
Superclass::PrintSelf(os, i.GetNextIndent());
os << i << "Wavelet coeff: [ ";
for ( typename Superclass::ConstIterator iter = Superclass::Begin();
- iter != Superclass::End();
+ iter != Superclass::End();
++iter )
{
os << *iter << ' ';
@@ -46,9 +46,9 @@ WaveletOperatorBase< TMotherWaveletOperator, TPixel, VDimension, TAllocator >
template < MotherWaveletOperatorEnum TMotherWaveletOperator,
class TPixel, unsigned int VDimension, class TAllocator >
-void
+void
WaveletOperatorBase< TMotherWaveletOperator, TPixel, VDimension, TAllocator >
-::UpSamplingCoefficients ( CoefficientVector & coeff )
+::UpSamplingCoefficients ( CoefficientVector & coeff )
{
if ( m_UpSampleFactor <= 1 )
return;
@@ -71,7 +71,7 @@ WaveletOperatorBase< TMotherWaveletOperator, TPixel, VDimension, TAllocator >
template < MotherWaveletOperatorEnum TMotherWaveletOperator,
class TPixel, unsigned int VDimension, class TAllocator >
-void
+void
WaveletOperatorBase< TMotherWaveletOperator, TPixel, VDimension, TAllocator >
::RevertFilter ( CoefficientVector & coeff )
{
@@ -91,7 +91,7 @@ WaveletOperatorBase< TMotherWaveletOperator, TPixel, VDimension, TAllocator >
template < MotherWaveletOperatorEnum TMotherWaveletOperator,
class TPixel, unsigned int VDimension, class TAllocator >
-void
+void
WaveletOperatorBase< TMotherWaveletOperator, TPixel, VDimension, TAllocator >
::GenerateForwardHighPassFilterFromLowPassFilter ( CoefficientVector & coeff )
{
@@ -122,7 +122,7 @@ WaveletOperatorBase< TMotherWaveletOperator, TPixel, VDimension, TAllocator >
template < MotherWaveletOperatorEnum TMotherWaveletOperator,
class TPixel, unsigned int VDimension, class TAllocator >
-void
+void
WaveletOperatorBase< TMotherWaveletOperator, TPixel, VDimension, TAllocator >
::GenerateInverseHighPassFilterFromLowPassFilter ( CoefficientVector & coeff )
{
@@ -130,7 +130,7 @@ WaveletOperatorBase< TMotherWaveletOperator, TPixel, VDimension, TAllocator >
CoefficientVector highPassCoeff ( length + 2 );
- double sign = -1;
+ double sign = -1;
for ( unsigned int i = 0; i < length; i++ )
{
highPassCoeff[i] = sign * coeff[i];
@@ -149,7 +149,7 @@ WaveletOperatorBase< TMotherWaveletOperator, TPixel, VDimension, TAllocator >
template < MotherWaveletOperatorEnum TMotherWaveletOperator,
class TPixel, unsigned int VDimension, class TAllocator >
-void
+void
WaveletOperatorBase< TMotherWaveletOperator, TPixel, VDimension, TAllocator >
::GenerateInverseLowPassFilterFromHighPassFilter ( CoefficientVector & coeff )
{
@@ -157,7 +157,7 @@ WaveletOperatorBase< TMotherWaveletOperator, TPixel, VDimension, TAllocator >
CoefficientVector highPassCoeff ( length + 2 );
- double sign = 1;
+ double sign = 1;
for ( unsigned int i = 0; i < length; i++ )
{
highPassCoeff[i] = sign * coeff[i];
@@ -176,7 +176,7 @@ WaveletOperatorBase< TMotherWaveletOperator, TPixel, VDimension, TAllocator >
template < MotherWaveletOperatorEnum TMotherWaveletOperator,
class TPixel, unsigned int VDimension, class TAllocator >
-void
+void
WaveletOperatorBase< TMotherWaveletOperator, TPixel, VDimension, TAllocator >
::ReduceFilterLength ( CoefficientVector & coeff )
{
diff --git a/Code/MultiScale/otbWaveletPacketDecompositionCosts.h b/Code/MultiScale/otbWaveletPacketDecompositionCosts.h
index 2812b773aa425a1a50cc175b52c122837e426ec4..c83221f68d5ae945d3f0f78e06ee7ff1987e508e 100644
--- a/Code/MultiScale/otbWaveletPacketDecompositionCosts.h
+++ b/Code/MultiScale/otbWaveletPacketDecompositionCosts.h
@@ -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 FullyDecomposedWaveletPacketCost
* \brief Cost evaluation to be used into the Wavelet Packet decomposition class.
*
- * This class implements the criteria to perform fully decomposed wavelet packet.
+ * This class implements the criteria to perform fully decomposed wavelet packet.
* It is based on the depth of the decomposition only...
*
* \sa WaveletPacketForwardTransform
@@ -70,7 +70,7 @@ private:
FullyDecomposedWaveletPacketCost ( const Self & ); // not implemented
void operator= ( const Self & );
-}; // end of class
+}; // end of class
template < class TImage >
unsigned int FullyDecomposedWaveletPacketCost< TImage >::NumberOfAllowedDecompositions = 1;
diff --git a/Code/MultiScale/otbWaveletPacketTransform.h b/Code/MultiScale/otbWaveletPacketTransform.h
index 0bd9dfaf2d1dc3e5d11b1afe26ce51f659de626e..a84fc5d89910090fe41cb47f6eebc4a390da5170 100644
--- a/Code/MultiScale/otbWaveletPacketTransform.h
+++ b/Code/MultiScale/otbWaveletPacketTransform.h
@@ -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.
=========================================================================*/
@@ -40,16 +40,16 @@ namespace otb {
* by using a (templated) elementary wavelet transform and (templated)
* cost criteria to stop the decomposition.
*
- * It yields a list of images on the FORWARD decomposition. Conversely,
+ * It yields a list of images on the FORWARD decomposition. Conversely,
* it takes an image list but yield a single list on the INVERSE transformation.
* Hence, the Forward vs Inverse transformation has been splitted into two classes
- * (templated with otb::FORWARD and otb::INVERSE). The Forward class comes from
+ * (templated with otb::FORWARD and otb::INVERSE). The Forward class comes from
* \doxygen{otb}{ImageToImageListFilter} while the latter comes from a
* \doxygen{otb}{ImageListToImageFilter}. Thse two classes have specific declaration
* and implementation.
*
- * The user is supposed to initialize Cost properly (through GetCost() macro)
- * depending on its type before calling an Update(). The Cost class has to contain
+ * The user is supposed to initialize Cost properly (through GetCost() macro)
+ * depending on its type before calling an Update(). The Cost class has to contain
* a New() and Evaluate() function.
*
* \sa FullyDecomposedWaveletPacketCost
@@ -92,16 +92,16 @@ private:
* by using a (templated) elementary wavelet transform and (templated)
* cost criteria to stop the decomposition.
*
- * It yields a list of images on the FORWARD decomposition. Conversely,
+ * It yields a list of images on the FORWARD decomposition. Conversely,
* it takes an image list but yield a single list on the INVERSE transformation.
* Hence, the Forward vs Inverse transformation has been splitted into two classes
- * (templated with otb::FORWARD and otb::INVERSE). The Forward class comes from
+ * (templated with otb::FORWARD and otb::INVERSE). The Forward class comes from
* \doxygen{otb}{ImageToImageListFilter} while the latter comes from a
* \doxygen{otb}{ImageListToImageFilter}. Thse two classes have specific declaration
* and implementation.
*
- * The user is supposed to initialize Cost properly (through GetCost() macro)
- * depending on its type before calling an Update(). The Cost class has to contain
+ * The user is supposed to initialize Cost properly (through GetCost() macro)
+ * depending on its type before calling an Update(). The Cost class has to contain
* a New() and Evaluate() function.
*
* This is the specific declaration of the Forward transformation.
@@ -168,10 +168,10 @@ public:
itkStaticConstMacro(InputImageDimension, unsigned int,TInputImage::ImageDimension);
/**
- * Set/Get the level of down sampling of the image used in forward algorithm.
+ * Set/Get the level of down sampling of the image used in forward algorithm.
* (or upsampling in the inverse case)
*
- * In this implementation, we are not (yet?) dealing with M-band decomposition
+ * In this implementation, we are not (yet?) dealing with M-band decomposition
* then m_SubsampleImageFactor is most likely to be 1 or 2... but in any case integer
* and not real...
*/
@@ -197,9 +197,9 @@ private:
void operator= ( const Self & );
/**
- * For multiscale decomposition, m_SubsampleImageFactor is set to 1.
+ * For multiscale decomposition, m_SubsampleImageFactor is set to 1.
* It yields also a stationnary decomposition.
- * For multiresolution decomposition, most of the time, m_SubsampleImageFactor is
+ * For multiresolution decomposition, most of the time, m_SubsampleImageFactor is
* to be set to 2. This is its default value.
*/
unsigned int m_SubsampleImageFactor;
@@ -222,17 +222,17 @@ private:
* by using a (templated) elementary wavelet transform and (templated)
* cost criteria to stop the decomposition.
*
- * It yields a list of images on the FORWARD decomposition. Conversely,
+ * It yields a list of images on the FORWARD decomposition. Conversely,
* it takes an image list but yield a single list on the INVERSE transformation.
* Hence, the Forward vs Inverse transformation has been splitted into two classes
- * (templated with otb::FORWARD and otb::INVERSE). The Forward class comes from
+ * (templated with otb::FORWARD and otb::INVERSE). The Forward class comes from
* \doxygen{otb}{ImageToImageListFilter} while the latter comes from a
* \doxygen{otb}{ImageListToImageFilter}. Thse two classes have specific declaration
* and implementation.
*
* This is the specific declaration of the Inverse transformation.
*
- * In this specialization, the Cost template class is not usefull and then
+ * In this specialization, the Cost template class is not usefull and then
* declared to as FullyDecomposedWaveletPacketCost.
*
* \sa FullyDecomposedWaveletPacketCost
@@ -240,7 +240,7 @@ private:
* \sa WaveletTransform
*/
template < class TInputImage, class TOutputImage, class TFilter >
-class ITK_EXPORT WaveletPacketTransform< TInputImage, TOutputImage, TFilter,
+class ITK_EXPORT WaveletPacketTransform< TInputImage, TOutputImage, TFilter,
INVERSE, FullyDecomposedWaveletPacketCost< TInputImage > >
: public ImageListToImageFilter< TInputImage, TOutputImage >
{
@@ -289,16 +289,16 @@ public:
/** Get/Set the decomposition rule */
const std::vector<bool> & GetWaveletPacketRule () const {
- return this->m_WaveletPacketRule; }
+ return this->m_WaveletPacketRule; }
void SetWaveletPacketRule ( const std::vector<bool> & rule ) {
- this->m_WaveletPacketRule = rule;
+ this->m_WaveletPacketRule = rule;
this->Modified(); }
/**
- * Set/Get the level of down sampling of the image used in forward algorithm.
+ * Set/Get the level of down sampling of the image used in forward algorithm.
* (or upsampling in the inverse case)
*
- * In this implementation, we are not (yet?) dealing with M-band decomposition
+ * In this implementation, we are not (yet?) dealing with M-band decomposition
* then m_SubsampleImageFactor is most likely to be 1 or 2... but in any case integer
* and not real...
*/
@@ -315,7 +315,7 @@ protected:
WaveletPacketTransform();
virtual ~WaveletPacketTransform() {}
- /** GenerateOutputInformation
+ /** GenerateOutputInformation
* Set the size of the output image depending on the decimation factor
* Copy informations from the input image if existing.
**/
@@ -328,7 +328,7 @@ protected:
virtual void GenerateData ();
/** Performs (if any) the local decomposition (called recursively) */
- virtual unsigned int SetInputFilters ( unsigned int & ruleID, InputImageIterator & inputIter,
+ virtual unsigned int SetInputFilters ( unsigned int & ruleID, InputImageIterator & inputIter,
unsigned int filterID );
/** Get the depth of decomposition and the number of filters from m_WaveletPacketRule */
@@ -340,9 +340,9 @@ private:
void operator= ( const Self & );
/**
- * For multiscale decomposition, m_SubsampleImageFactor is set to 1.
+ * For multiscale decomposition, m_SubsampleImageFactor is set to 1.
* It yields also a stationnary decomposition.
- * For multiresolution decomposition, most of the time, m_SubsampleImageFactor is
+ * For multiresolution decomposition, most of the time, m_SubsampleImageFactor is
* to be set to 2. This is its default value.
*/
unsigned int m_SubsampleImageFactor;
diff --git a/Code/MultiScale/otbWaveletPacketTransform.txx b/Code/MultiScale/otbWaveletPacketTransform.txx
index 844ceb487a7a860f6b7a7c38598b8fbea30e21eb..f6dd644e0019b99f5f307b067af27e1d888b23fd 100644
--- a/Code/MultiScale/otbWaveletPacketTransform.txx
+++ b/Code/MultiScale/otbWaveletPacketTransform.txx
@@ -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.
=========================================================================*/
@@ -66,8 +66,8 @@ WaveletPacketTransform< TInputImage, TOutputImage, TFilter, FORWARD, TCost >
template < class TInputImage, class TOutputImage, class TFilter, class TCost >
void
WaveletPacketTransform< TInputImage, TOutputImage, TFilter, FORWARD, TCost >
-::GenerateData
-( unsigned int depth,
+::GenerateData
+( unsigned int depth,
OutputImageType * outputPtr,
itk::ProgressAccumulator * progress )
{
@@ -117,7 +117,7 @@ WaveletPacketTransform< TInputImage, TOutputImage, TFilter, FORWARD, TCost >
template < class TInputImage, class TOutputImage, class TFilter >
WaveletPacketTransform< TInputImage, TOutputImage, TFilter, INVERSE, FullyDecomposedWaveletPacketCost< TInputImage > >
::WaveletPacketTransform ()
- : m_SubsampleImageFactor(2), m_NumberOfFilters(0), m_DepthOfDecomposition(0)
+ : m_SubsampleImageFactor(2), m_NumberOfFilters(0), m_DepthOfDecomposition(0)
{
this->SetNumberOfRequiredInputs(1);
this->SetNumberOfInputs(1);
@@ -163,9 +163,9 @@ void
WaveletPacketTransform< TInputImage, TOutputImage, TFilter, INVERSE, FullyDecomposedWaveletPacketCost< TInputImage > >
::GenerateData ()
{
- if ( m_WaveletPacketRule[0] != true )
+ if ( m_WaveletPacketRule[0] != true )
{
- throw itk::ExceptionObject( __FILE__, __LINE__,
+ throw itk::ExceptionObject( __FILE__, __LINE__,
"No decomposition to perform in Generic data... Check WaveletPacketRule tab",
ITK_LOCATION );
}
@@ -179,19 +179,19 @@ WaveletPacketTransform< TInputImage, TOutputImage, TFilter, INVERSE, FullyDecomp
if ( m_NumberOfFilters == 0 )
{
- throw itk::ExceptionObject( __FILE__, __LINE__,
+ throw itk::ExceptionObject( __FILE__, __LINE__,
"No filter found in the decomposition tree... Check WaveletPacketRule tab",
ITK_LOCATION );
}
InputImageIterator inputIterator = this->GetInput()->Begin();
- unsigned int pos = 1;
+ unsigned int pos = 1;
SetInputFilters( pos, inputIterator, 0 );
if ( pos != m_WaveletPacketRule.size() || inputIterator != this->GetInput()->End() )
{
- throw itk::ExceptionObject( __FILE__, __LINE__,
+ throw itk::ExceptionObject( __FILE__, __LINE__,
"Bad decomposition tree implementation...",
ITK_LOCATION );
}
@@ -202,7 +202,7 @@ WaveletPacketTransform< TInputImage, TOutputImage, TFilter, INVERSE, FullyDecomp
progress->SetMiniPipelineFilter(this);
for ( pos = m_NumberOfFilters; pos > 0; pos-- )
- {
+ {
FilterPointerType filter = m_FilterList->GetNthElement(pos-1);
progress->RegisterInternalFilter( filter, 1.f/static_cast<float>( m_NumberOfFilters ) );
filter->Update();
@@ -214,7 +214,7 @@ WaveletPacketTransform< TInputImage, TOutputImage, TFilter, INVERSE, FullyDecomp
template < class TInputImage, class TOutputImage, class TFilter >
unsigned int
WaveletPacketTransform< TInputImage, TOutputImage, TFilter, INVERSE, FullyDecomposedWaveletPacketCost< TInputImage > >
-::SetInputFilters
+::SetInputFilters
( unsigned int & ruleID, InputImageIterator & imgIt, unsigned int filterID )
{
unsigned int nextFilterID = filterID+1;
@@ -243,7 +243,7 @@ WaveletPacketTransform< TInputImage, TOutputImage, TFilter, INVERSE, FullyDecomp
template < class TInputImage, class TOutputImage, class TFilter >
void
WaveletPacketTransform< TInputImage, TOutputImage, TFilter, INVERSE, FullyDecomposedWaveletPacketCost< TInputImage > >
-::InterpretRule ()
+::InterpretRule ()
{
if ( m_FilterList && m_FilterList->Size() != 0 )
{
@@ -261,7 +261,7 @@ WaveletPacketTransform< TInputImage, TOutputImage, TFilter, INVERSE, FullyDecomp
template < class TInputImage, class TOutputImage, class TFilter >
void
WaveletPacketTransform< TInputImage, TOutputImage, TFilter, INVERSE, FullyDecomposedWaveletPacketCost< TInputImage > >
-::InterpretRule
+::InterpretRule
( unsigned int & ruleID, unsigned int curDepth )
{
if ( curDepth > m_DepthOfDecomposition )
diff --git a/Code/MultiScale/otbWaveletTransform.h b/Code/MultiScale/otbWaveletTransform.h
index 4b8fb8b5a110a4dad263c83cbb4391a0cf8171aa..32f83c487e8c2620aa24b53c039dfd7006c057df 100644
--- a/Code/MultiScale/otbWaveletTransform.h
+++ b/Code/MultiScale/otbWaveletTransform.h
@@ -37,7 +37,7 @@ namespace otb {
* by using a (templated) elementary wavelet transform.
*
* Here the number of decomposition is given. The output is given
- * in the GetOutput() list of images ranked from the low-pass part to the
+ * in the GetOutput() list of images ranked from the low-pass part to the
* highest frequency part.
*
* Output image organization depends on the number of Dim on the image
@@ -50,7 +50,7 @@ namespace otb {
* \sa WaveletPacketTransform
*
*/
-template < class TInputImage, class TOutputImage, class TFilter,
+template < class TInputImage, class TOutputImage, class TFilter,
InverseOrForwardTransformationEnum TDirectionOfTransformation >
class ITK_EXPORT WaveletTransform
: public itk::ImageSource< TOutputImage >
@@ -85,7 +85,7 @@ private:
* by using a (templated) elementary wavelet transform.
*
* Here the number of decomposition is given. The output is given
- * in the GetOutput() list of images ranked from the low-pass part to the
+ * in the GetOutput() list of images ranked from the low-pass part to the
* highest frequency part.
*
* Output image organization depends on the number of Dim on the image
@@ -142,8 +142,8 @@ public:
{
if ( idx >= m_NumberOfDecompositions )
{
- itkExceptionMacro( << "Impossible to GetNthFilter with the index element "
- << idx << "; this element don't exist, the size of the filter list is "
+ itkExceptionMacro( << "Impossible to GetNthFilter with the index element "
+ << idx << "; this element don't exist, the size of the filter list is "
<< m_FilterList->Size() << "." );
}
return static_cast< FilterType* >( m_FilterList->GetNthElement( idx ) );
@@ -158,10 +158,10 @@ public:
itkStaticConstMacro(InputImageDimension, unsigned int,TInputImage::ImageDimension);
/**
- * Set/Get the level of down sampling of the image used in forward algorithm.
+ * Set/Get the level of down sampling of the image used in forward algorithm.
* (or upsampling in the inverse case)
*
- * In this implementation, we are not (yet?) dealing with M-band decomposition
+ * In this implementation, we are not (yet?) dealing with M-band decomposition
* then m_SubsampleImageFactor is most likely to be 1 or 2... but in any case integer
* and not real...
*/
@@ -185,9 +185,9 @@ private:
unsigned int m_NumberOfDecompositions;
/**
- * For multiscale decomposition, m_SubsampleImageFactor is set to 1.
+ * For multiscale decomposition, m_SubsampleImageFactor is set to 1.
* It yields also a stationnary decomposition.
- * For multiresolution decomposition, most of the time, m_SubsampleImageFactor is
+ * For multiresolution decomposition, most of the time, m_SubsampleImageFactor is
* to be set to 2. This is its default value.
*/
unsigned int m_SubsampleImageFactor;
@@ -205,7 +205,7 @@ private:
* by using a (templated) elementary wavelet transform.
*
* Here the number of decomposition is given. The output is given
- * in the GetOutput() list of images ranked from the low-pass part to the
+ * in the GetOutput() list of images ranked from the low-pass part to the
* highest frequency part.
*
* Output image organization depends on the number of Dim on the image
@@ -217,7 +217,7 @@ private:
* Here is the specialisation of the INVERSE transformation.
*
* The filter should be implemented with TInputImage for input and output image
- * template. Transtyping to TOuputImage is performed by standart C++-style at pixel
+ * template. Transtyping to TOuputImage is performed by standart C++-style at pixel
* level.
*
* \sa WaveletFilterBank
@@ -272,8 +272,8 @@ public:
{
if ( idx >= m_NumberOfDecompositions )
{
- itkExceptionMacro( << "Impossible to GetNthFilter with the index element "
- << idx << "; this element don't exist, the size of the filter list is "
+ itkExceptionMacro( << "Impossible to GetNthFilter with the index element "
+ << idx << "; this element don't exist, the size of the filter list is "
<< m_FilterList->Size() << "." );
}
return static_cast< FilterType* >( m_FilterList->GetNthElement( idx ) );
@@ -287,10 +287,10 @@ public:
itkStaticConstMacro(InputImageDimension, unsigned int,TInputImage::ImageDimension);
/**
- * Set/Get the level of down sampling of the image used in forward algorithm.
+ * Set/Get the level of down sampling of the image used in forward algorithm.
* (or upsampling in the inverse case)
*
- * In this implementation, we are not (yet?) dealing with M-band decomposition
+ * In this implementation, we are not (yet?) dealing with M-band decomposition
* then m_SubsampleImageFactor is most likely to be 1 or 2... but in any case integer
* and not real...
*/
@@ -301,7 +301,7 @@ protected:
WaveletTransform();
virtual ~WaveletTransform() {}
- /** GenerateOutputInformation
+ /** GenerateOutputInformation
* Set the size of the output image depending on the decimation factor
* Copy informations from the input image if existing.
**/
@@ -320,9 +320,9 @@ private:
unsigned int m_NumberOfDecompositions;
/**
- * For multiscale decomposition, m_SubsampleImageFactor is set to 1 (default).
+ * For multiscale decomposition, m_SubsampleImageFactor is set to 1 (default).
* It yields also a stationnary decomposition.
- * For multiresolution decomposition, most of the time, m_SubsampleImageFactor is
+ * For multiresolution decomposition, most of the time, m_SubsampleImageFactor is
* to be set to 2.
*/
unsigned int m_SubsampleImageFactor;
diff --git a/Code/MultiScale/otbWaveletTransform.txx b/Code/MultiScale/otbWaveletTransform.txx
index 615cbe56650781318c92c4fca882dc7ad9f0ece4..d2b0045088c0183379c345810acc5d30ec484fa9 100644
--- a/Code/MultiScale/otbWaveletTransform.txx
+++ b/Code/MultiScale/otbWaveletTransform.txx
@@ -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.
=========================================================================*/
@@ -61,7 +61,7 @@ WaveletTransform< TInputImage, TOutputImage, TFilter, FORWARD >
filter->SetSubsampleImageFactor( GetSubsampleImageFactor() );
std::cerr << "Allocating " << (1 + GetNumberOfDecompositions() * ( filter->GetNumberOfOutputs() - 1 ) ) << " output\n";
- this->GetOutput()->Resize(
+ this->GetOutput()->Resize(
1 + GetNumberOfDecompositions() * ( filter->GetNumberOfOutputs() - 1 ) );
std::cerr << "Using " << this->GetOutput()->Size() << " outputs...\n";
@@ -70,13 +70,13 @@ WaveletTransform< TInputImage, TOutputImage, TFilter, FORWARD >
this->GetOutput()->SetNthElement( idx, OutputImageType::New() );
}
- progress->RegisterInternalFilter( filter,
+ progress->RegisterInternalFilter( filter,
1.f/static_cast<float>( GetNumberOfDecompositions() ) );
filter->Update();
for ( unsigned int idx = 1; idx < filter->GetNumberOfOutputs(); idx++ )
{
- this->GetOutput()->SetNthElement(
+ this->GetOutput()->SetNthElement(
this->GetOutput()->Size() - filter->GetNumberOfOutputs() + idx,
filter->GetOutput( idx ) );
}
@@ -90,13 +90,13 @@ WaveletTransform< TInputImage, TOutputImage, TFilter, FORWARD >
if ( GetSubsampleImageFactor() == 1 )
filter->SetUpSampleFilterFactor( nbDecomp+1 );
- progress->RegisterInternalFilter( filter,
+ progress->RegisterInternalFilter( filter,
1.f/static_cast<float>( GetNumberOfDecompositions() ) );
filter->Update();
for ( unsigned int idx = 1; idx < filter->GetNumberOfOutputs(); idx++ )
{
- this->GetOutput()->SetNthElement(
+ this->GetOutput()->SetNthElement(
this->GetOutput()->Size() - 1 - (nbDecomp+1) * (filter->GetNumberOfOutputs()-1) + idx,
filter->GetOutput( idx ) );
}
@@ -158,7 +158,7 @@ WaveletTransform< TInputImage, TOutputImage, TFilter, INVERSE >
::GenerateData ()
{
FilterPointerType filter = FilterType::New();
- m_NumberOfDecompositions = ( this->GetInput()->Size() - 1 )
+ m_NumberOfDecompositions = ( this->GetInput()->Size() - 1 )
/ ( filter->GetNumberOfInputs() - 1 );
std::cerr << "Found " << m_NumberOfDecompositions << " decompositions\n";
diff --git a/Code/Radiometry/otbAtmosphericCorrectionParameters.cxx b/Code/Radiometry/otbAtmosphericCorrectionParameters.cxx
index bbab60783d5ecfc079f815b430687781df63304b..821aa0ca54105f04e2ea22b2cfbadf172f101831 100644
--- a/Code/Radiometry/otbAtmosphericCorrectionParameters.cxx
+++ b/Code/Radiometry/otbAtmosphericCorrectionParameters.cxx
@@ -133,23 +133,23 @@ AtmosphericCorrectionParameters
while ( std::getline( file, line ) )
{
- ossimString osLine(line);
+ ossimString osLine(line);
std::vector<ossimString> keywordStrings = osLine.split(separatorList);
if(keywordStrings.size() == 2 || keywordStrings.size() == 3)
{
if(bandId != 0)
{
- function->SetFilterFunctionValues(vect);
- m_WavelenghtSpectralBand.push_back(function);
- function = FilterFunctionValues::New();
- vect.clear();
+ function->SetFilterFunctionValues(vect);
+ m_WavelenghtSpectralBand.push_back(function);
+ function = FilterFunctionValues::New();
+ vect.clear();
}
bandId++;
function->SetMinSpectralValue(keywordStrings[0].toDouble());
function->SetMaxSpectralValue(keywordStrings[1].toDouble());
if(keywordStrings.size() == 3)
- function->SetUserStep(keywordStrings[2].toDouble());
+ function->SetUserStep(keywordStrings[2].toDouble());
}
else if(keywordStrings.size()==1)
vect.push_back(keywordStrings[0].toDouble());
diff --git a/Code/Radiometry/otbAtmosphericCorrectionParameters.h b/Code/Radiometry/otbAtmosphericCorrectionParameters.h
index c0f5b578867d1a385ee6d19a568b9958d2c8228a..177a90341f88995129402c4f119d0833997450fd 100644
--- a/Code/Radiometry/otbAtmosphericCorrectionParameters.h
+++ b/Code/Radiometry/otbAtmosphericCorrectionParameters.h
@@ -245,15 +245,15 @@ public:
void UpdateAeronetData( std::string file, int year, int month, int day, int hour, int minute, double epsi );
void UpdateAeronetData( std::string file, int year, int month, int day, int hour, int minute )
{
- this->UpdateAeronetData( file, year, month, day, hour, minute, 0.4 );
+ this->UpdateAeronetData( file, year, month, day, hour, minute, 0.4 );
};
void UpdateAeronetData( std::string file, int year, int hour, int minute, double epsi )
{
- this->UpdateAeronetData( file, year, m_Month, m_Day, hour, minute, epsi );
+ this->UpdateAeronetData( file, year, m_Month, m_Day, hour, minute, epsi );
};
void UpdateAeronetData( std::string file, int year, int hour, int minute )
{
- this->UpdateAeronetData( file, year, m_Month, m_Day, hour, minute, 0.4 );
+ this->UpdateAeronetData( file, year, m_Month, m_Day, hour, minute, 0.4 );
};
/** Read a file that contains filter function values.
diff --git a/Code/Radiometry/otbAtmosphericCorrectionParametersTo6SAtmosphericRadiativeTerms.cxx b/Code/Radiometry/otbAtmosphericCorrectionParametersTo6SAtmosphericRadiativeTerms.cxx
index 05ee358b6fcca626f72d957f47b943f88c3abca0..5a6c92c808ed2a42428d5d675a3c07c65bb43fc0 100644
--- a/Code/Radiometry/otbAtmosphericCorrectionParametersTo6SAtmosphericRadiativeTerms.cxx
+++ b/Code/Radiometry/otbAtmosphericCorrectionParametersTo6SAtmosphericRadiativeTerms.cxx
@@ -158,7 +158,7 @@ AtmosphericCorrectionParametersTo6SAtmosphericRadiativeTerms
for (unsigned int i=0; i<NbBand; ++i)
{
- atmosphericReflectance = 0.;
+ atmosphericReflectance = 0.;
atmosphericSphericalAlbedo = 0.;
totalGaseousTransmission = 0.;
downwardTransmittance = 0.;
diff --git a/Code/Radiometry/otbAtmosphericRadiativeTerms.cxx b/Code/Radiometry/otbAtmosphericRadiativeTerms.cxx
index fc3c7695ab90c7c20e84724ccecfa91feac0703d..1f08b4a5184a2f3d067719c3f76f7dfee4379752 100644
--- a/Code/Radiometry/otbAtmosphericRadiativeTerms.cxx
+++ b/Code/Radiometry/otbAtmosphericRadiativeTerms.cxx
@@ -29,9 +29,9 @@ AtmosphericRadiativeTermsSingleChannel
m_SphericalAlbedo = 0.09;
m_TotalGaseousTransmission = 0.95;
m_DownwardTransmittance = 0.91;
- m_UpwardTransmittance = 0.94;
+ m_UpwardTransmittance = 0.94;
m_UpwardDiffuseTransmittance = 0.09;
- m_UpwardDirectTransmittance = 0.85;
+ m_UpwardDirectTransmittance = 0.85;
m_UpwardDiffuseTransmittanceForRayleigh = 0.05;
m_UpwardDiffuseTransmittanceForAerosol = 0.04;
}
diff --git a/Code/Radiometry/otbRadarFunctors.h b/Code/Radiometry/otbRadarFunctors.h
index c65085f27d9c82aaf869176efe7522dab43f7b80..b57a2029f45174c6cae3079cab4665826b3d640b 100644
--- a/Code/Radiometry/otbRadarFunctors.h
+++ b/Code/Radiometry/otbRadarFunctors.h
@@ -101,7 +101,7 @@ public:
// Beta naught computation, will be the Modulus of the result
double beta = m_BetaNaughtFunctor(static_cast<double>(std::abs(inPix)));
- // Phase
+ // Phase
double phase = std::arg(inPix);
// We retrieve the complex value from the modulus and the phase.
@@ -148,8 +148,8 @@ public:
void SetNoiseRangeValidityRef( double val ) { m_NoiseRangeValidityRef = val; };
double GetNoiseRangeValidityRef() const { return m_NoiseRangeValidityRef; };
void SetLocalIncidentAngle( double val )
- {
- m_LocalIncidentAngle = val;
+ {
+ m_LocalIncidentAngle = val;
m_SinLocalIncidentAngle = vcl_sin(m_LocalIncidentAngle*CONST_PI_180);
};
double GetLocalIncidentAngle() const { return m_LocalIncidentAngle; };
@@ -190,8 +190,8 @@ private:
DoubleVectorVectorType m_NoisePolynomialCoefficientsList;
/** Image Size */
SizeType m_ImageSize;
- /** Fast Calibration Method. If set to trus, will consider only the first noise coefficient else,
- * will use all of them and applied it according to its acquisition UTC time and the coordinates
+ /** Fast Calibration Method. If set to trus, will consider only the first noise coefficient else,
+ * will use all of them and applied it according to its acquisition UTC time and the coordinates
* of the pixel in the image. */
bool m_UseFastCalibrationMethod;
/** TimeUTC for each noise coefficient acquisition (in second). */
@@ -239,8 +239,8 @@ public:
void SetNoiseRangeValidityRef( double val ) { m_NoiseRangeValidityRef = val; };
double GetNoiseRangeValidityRef() const { return m_NoiseRangeValidityRef; };
void SetLocalIncidentAngle( double val )
- {
- m_LocalIncidentAngle = val;
+ {
+ m_LocalIncidentAngle = val;
m_SinLocalIncidentAngle = vcl_sin(m_LocalIncidentAngle*CONST_PI_180);
};
double GetLocalIncidentAngle() const { return m_LocalIncidentAngle; };
@@ -281,8 +281,8 @@ private:
DoubleVectorVectorType m_NoisePolynomialCoefficientsList;
/** Image Size */
SizeType m_ImageSize;
- /** Fast Calibration Method. If set to trus, will consider only the first noise coefficient else,
- * will use all of them and applied it according to its acquisition UTC time and the coordinates
+ /** Fast Calibration Method. If set to trus, will consider only the first noise coefficient else,
+ * will use all of them and applied it according to its acquisition UTC time and the coordinates
* of the pixel in the image. */
bool m_UseFastCalibrationMethod;
/** TimeUTC for each noise coefficient acquisition (in second). */
diff --git a/Code/Radiometry/otbRadarFunctors.txx b/Code/Radiometry/otbRadarFunctors.txx
index 7867e50f6537beeb89a5e371fd2d9dffca37823a..c8652a751064b5d52917a28e9e4f9d38a39cde39 100644
--- a/Code/Radiometry/otbRadarFunctors.txx
+++ b/Code/Radiometry/otbRadarFunctors.txx
@@ -57,11 +57,11 @@ TerraSarCalibrationImageFunctor<TInput, TOutput>
// Use +1 because image start index is 0
if( colId < static_cast<unsigned int>(width_2) )
{
- curRange = m_NoiseRangeValidityMin + ( m_NoiseRangeValidityRef-m_NoiseRangeValidityMin )/width_2 * static_cast<double>(colId+1);
+ curRange = m_NoiseRangeValidityMin + ( m_NoiseRangeValidityRef-m_NoiseRangeValidityMin )/width_2 * static_cast<double>(colId+1);
}
else
{
- curRange = m_NoiseRangeValidityRef + ( m_NoiseRangeValidityMax-m_NoiseRangeValidityRef )/width_2 * (static_cast<double>(colId+1) - width_2 );
+ curRange = m_NoiseRangeValidityRef + ( m_NoiseRangeValidityMax-m_NoiseRangeValidityRef )/width_2 * (static_cast<double>(colId+1) - width_2 );
}
return curRange;
@@ -76,31 +76,31 @@ TerraSarCalibrationImageFunctor<TInput, TOutput>
DoubleVectorType curCoeffs;
if(m_UseFastCalibrationMethod)
{
- curCoeffs = m_NoisePolynomialCoefficientsList[0];
+ curCoeffs = m_NoisePolynomialCoefficientsList[0];
}
else
{
- // m_ImageSize[1]-(lineId+1) because the first acquisition line is the last image one.
- // line+1 because image starts to 0.
- //double interval = static_cast<double>(m_ImageSize[1]) / static_cast<double>(m_NoisePolynomialCoefficientsList.size());
- // compute utc time of the line
- double currTimeUTC = m_TimeUTC[0] + static_cast<double>(m_ImageSize[1]-(lineId-1))*m_InvPRF;
- unsigned int id = 0;
- bool go = true;
- // deduct the corresponding noise acquisition index
- while( id<m_TimeUTC.size() && go)
- {
- if( currTimeUTC < m_TimeUTC[id] )
- go = false;
- id++;
- }
- id--;
-
- double timeCoef = 1. / (m_TimeUTC[id]- m_TimeUTC[id-1]) * (currTimeUTC-m_TimeUTC[id-1]);
- for(unsigned int j=0; j<m_NoisePolynomialCoefficientsList.size(); j++)
- {
- curCoeffs.push_back( m_NoisePolynomialCoefficientsList[id-1][j] + (m_NoisePolynomialCoefficientsList[id][j] - m_NoisePolynomialCoefficientsList[id-1][j]) * timeCoef );
- }
+ // m_ImageSize[1]-(lineId+1) because the first acquisition line is the last image one.
+ // line+1 because image starts to 0.
+ //double interval = static_cast<double>(m_ImageSize[1]) / static_cast<double>(m_NoisePolynomialCoefficientsList.size());
+ // compute utc time of the line
+ double currTimeUTC = m_TimeUTC[0] + static_cast<double>(m_ImageSize[1]-(lineId-1))*m_InvPRF;
+ unsigned int id = 0;
+ bool go = true;
+ // deduct the corresponding noise acquisition index
+ while( id<m_TimeUTC.size() && go)
+ {
+ if( currTimeUTC < m_TimeUTC[id] )
+ go = false;
+ id++;
+ }
+ id--;
+
+ double timeCoef = 1. / (m_TimeUTC[id]- m_TimeUTC[id-1]) * (currTimeUTC-m_TimeUTC[id-1]);
+ for(unsigned int j=0; j<m_NoisePolynomialCoefficientsList.size(); j++)
+ {
+ curCoeffs.push_back( m_NoisePolynomialCoefficientsList[id-1][j] + (m_NoisePolynomialCoefficientsList[id][j] - m_NoisePolynomialCoefficientsList[id-1][j]) * timeCoef );
+ }
}
@@ -157,11 +157,11 @@ TerraSarCalibrationComplexImageFunctor<TInput, TOutput>
// Use +1 because image start index is 0
if( colId < static_cast<unsigned int>(width_2) )
{
- curRange = m_NoiseRangeValidityMin + ( m_NoiseRangeValidityRef-m_NoiseRangeValidityMin )/width_2 * static_cast<double>(colId+1);
+ curRange = m_NoiseRangeValidityMin + ( m_NoiseRangeValidityRef-m_NoiseRangeValidityMin )/width_2 * static_cast<double>(colId+1);
}
else
{
- curRange = m_NoiseRangeValidityRef + ( m_NoiseRangeValidityMax-m_NoiseRangeValidityRef )/width_2 * (static_cast<double>(colId+1) - width_2 );
+ curRange = m_NoiseRangeValidityRef + ( m_NoiseRangeValidityMax-m_NoiseRangeValidityRef )/width_2 * (static_cast<double>(colId+1) - width_2 );
}
return curRange;
@@ -176,31 +176,31 @@ TerraSarCalibrationComplexImageFunctor<TInput, TOutput>
DoubleVectorType curCoeffs;
if(m_UseFastCalibrationMethod)
{
- curCoeffs = m_NoisePolynomialCoefficientsList[0];
+ curCoeffs = m_NoisePolynomialCoefficientsList[0];
}
else
{
- // m_ImageSize[1]-(lineId+1) because the first acquisition line is the last image one.
- // line+1 because image starts to 0.
- double interval = static_cast<double>(m_ImageSize[1]) / static_cast<double>(m_NoisePolynomialCoefficientsList.size());
- // compute utc time of the line
- double currTimeUTC = m_TimeUTC[0] + static_cast<double>(m_ImageSize[1]-(lineId-1))*m_InvPRF;
- unsigned int id = 0;
- bool go = true;
- // deduct the corresponding noise acquisition index
- while( id<m_TimeUTC.size() && go)
- {
- if( currTimeUTC < m_TimeUTC[id] )
- go = false;
- id++;
- }
- id--;
-
- double timeCoef = 1. / (m_TimeUTC[id]- m_TimeUTC[id-1]) * (currTimeUTC-m_TimeUTC[id-1]);
- for(unsigned int j=0; j<m_NoisePolynomialCoefficientsList.size(); j++)
- {
- curCoeffs.push_back( m_NoisePolynomialCoefficientsList[id-1][j] + (m_NoisePolynomialCoefficientsList[id][j] - m_NoisePolynomialCoefficientsList[id-1][j]) * timeCoef );
- }
+ // m_ImageSize[1]-(lineId+1) because the first acquisition line is the last image one.
+ // line+1 because image starts to 0.
+ double interval = static_cast<double>(m_ImageSize[1]) / static_cast<double>(m_NoisePolynomialCoefficientsList.size());
+ // compute utc time of the line
+ double currTimeUTC = m_TimeUTC[0] + static_cast<double>(m_ImageSize[1]-(lineId-1))*m_InvPRF;
+ unsigned int id = 0;
+ bool go = true;
+ // deduct the corresponding noise acquisition index
+ while( id<m_TimeUTC.size() && go)
+ {
+ if( currTimeUTC < m_TimeUTC[id] )
+ go = false;
+ id++;
+ }
+ id--;
+
+ double timeCoef = 1. / (m_TimeUTC[id]- m_TimeUTC[id-1]) * (currTimeUTC-m_TimeUTC[id-1]);
+ for(unsigned int j=0; j<m_NoisePolynomialCoefficientsList.size(); j++)
+ {
+ curCoeffs.push_back( m_NoisePolynomialCoefficientsList[id-1][j] + (m_NoisePolynomialCoefficientsList[id][j] - m_NoisePolynomialCoefficientsList[id-1][j]) * timeCoef );
+ }
}
diff --git a/Code/Radiometry/otbReflectanceToSurfaceReflectanceImageFilter.h b/Code/Radiometry/otbReflectanceToSurfaceReflectanceImageFilter.h
index f76ce5b2c9ff38e696b84f1676a263398f27402e..447eb06c642ea7c0f9db36a8993a1129e1e93206 100644
--- a/Code/Radiometry/otbReflectanceToSurfaceReflectanceImageFilter.h
+++ b/Code/Radiometry/otbReflectanceToSurfaceReflectanceImageFilter.h
@@ -190,12 +190,12 @@ public:
/** Get/Set Filter function coef. */
void SetFilterFunctionCoef( FilterFunctionCoefVectorType vect )
{
- m_FilterFunctionCoef = vect;
- this->Modified();
+ m_FilterFunctionCoef = vect;
+ this->Modified();
}
FilterFunctionCoefVectorType GetFilterFunctionCoef()
{
- return m_FilterFunctionCoef;
+ return m_FilterFunctionCoef;
}
/** Compute radiative terms if necessary and then updtae functors attibuts. */
diff --git a/Code/Radiometry/otbReflectanceToSurfaceReflectanceImageFilter.txx b/Code/Radiometry/otbReflectanceToSurfaceReflectanceImageFilter.txx
index e18c48ff7b2ac83c618ad6934948262eed51e04a..c8c446071348e6acadeb1a71c71f1202e8bc663f 100644
--- a/Code/Radiometry/otbReflectanceToSurfaceReflectanceImageFilter.txx
+++ b/Code/Radiometry/otbReflectanceToSurfaceReflectanceImageFilter.txx
@@ -83,41 +83,41 @@ ReflectanceToSurfaceReflectanceImageFilter<TInputImage,TOutputImage>
}
if(m_AeronetFileName != "")
- m_CorrectionParameters->UpdateAeronetData( m_AeronetFileName,
- imageMetadataInterface->GetYear(dict),
- imageMetadataInterface->GetHour(dict),
- imageMetadataInterface->GetMinute(dict) );
+ m_CorrectionParameters->UpdateAeronetData( m_AeronetFileName,
+ imageMetadataInterface->GetYear(dict),
+ imageMetadataInterface->GetHour(dict),
+ imageMetadataInterface->GetMinute(dict) );
// load fiter function values
if(m_FilterFunctionValuesFileName != "")
{
m_CorrectionParameters->LoadFilterFunctionValue( m_FilterFunctionValuesFileName );
- }
- // the user has set the filter function values
+ }
+ // the user has set the filter function values
else
{
bool ffvfOK = true;
if( m_FilterFunctionCoef.size() == 0 )
- ffvfOK = false;
+ ffvfOK = false;
else if( m_FilterFunctionCoef.size() != this->GetInput()->GetNumberOfComponentsPerPixel() )
- itkExceptionMacro(<<"Function Values and Input image size dismatch");
+ itkExceptionMacro(<<"Function Values and Input image size dismatch");
for(unsigned int i=0; i<this->GetInput()->GetNumberOfComponentsPerPixel(); i++)
- {
- FilterFunctionValuesType::Pointer functionValues = FilterFunctionValuesType::New();
- // if no ffvf set, set 1 as coef
- if(ffvfOK)
- functionValues->SetFilterFunctionValues(m_FilterFunctionCoef[i]);
-
- functionValues->SetMinSpectralValue(imageMetadataInterface->GetFirstWavelengths(dict)[i]);
- functionValues->SetMaxSpectralValue(imageMetadataInterface->GetLastWavelengths(dict)[i]);
-
- // if no ffvf set, compute the step to be sure that the valueswavelength are between min and max
- if(!ffvfOK)
- functionValues->SetUserStep( functionValues->GetMaxSpectralValue()-functionValues->GetMinSpectralValue()/2. );
-
- m_CorrectionParameters->SetWavelenghtSpectralBandWithIndex(i, functionValues);
- }
+ {
+ FilterFunctionValuesType::Pointer functionValues = FilterFunctionValuesType::New();
+ // if no ffvf set, set 1 as coef
+ if(ffvfOK)
+ functionValues->SetFilterFunctionValues(m_FilterFunctionCoef[i]);
+
+ functionValues->SetMinSpectralValue(imageMetadataInterface->GetFirstWavelengths(dict)[i]);
+ functionValues->SetMaxSpectralValue(imageMetadataInterface->GetLastWavelengths(dict)[i]);
+
+ // if no ffvf set, compute the step to be sure that the valueswavelength are between min and max
+ if(!ffvfOK)
+ functionValues->SetUserStep( functionValues->GetMaxSpectralValue()-functionValues->GetMinSpectralValue()/2. );
+
+ m_CorrectionParameters->SetWavelenghtSpectralBandWithIndex(i, functionValues);
+ }
}
Parameters2RadiativeTermsPointerType param2Terms = Parameters2RadiativeTermsType::New();
@@ -142,7 +142,7 @@ template <class TInputImage, class TOutputImage>
void
ReflectanceToSurfaceReflectanceImageFilter<TInputImage,TOutputImage>
::UpdateFunctors()
-{
+{
this->GetFunctorVector().clear();
for (unsigned int i = 0;i<this->GetInput()->GetNumberOfComponentsPerPixel();++i)
diff --git a/Code/Radiometry/otbSIXSTraits.cxx b/Code/Radiometry/otbSIXSTraits.cxx
index 3e137bbc9e08c0ed302d235d6ffc53ef93299108..543cef59d0452e2156edc07fb2b52c946bf69ca5 100644
--- a/Code/Radiometry/otbSIXSTraits.cxx
+++ b/Code/Radiometry/otbSIXSTraits.cxx
@@ -189,28 +189,28 @@ SIXSTraits::ComputeWavelenghtSpectralBandValuesFor6S(
value = i*SIXSStepOfWavelenghtSpectralBandValues;
while (L_min+value <= L_max )
{
- // Search the User interval that surround the StepOfWavelenghtSpectralBandValues current value.
-
- // removed the <= here, might be wrong
- while (j*L_userStep < value)
- {
- ++j;
- }
-
- // Check if we are not out of bound
- if (j>=FilterFunctionValues.size())
- {
- itkGenericExceptionMacro(<<"Index "<<j<<" out of bound for FilterFunctionValues vector (size: "<<FilterFunctionValues.size()<<").");
- }
-
- double valueTemp;
- valueTemp = static_cast<double>(FilterFunctionValues[j-1])
- + ((static_cast<double>(FilterFunctionValues[j])-static_cast<double>(FilterFunctionValues[j-1]))*invStep)
- *(value-L_userStep*(j-1));
- values.push_back(static_cast<WavelenghtSpectralBandType>(valueTemp));
-
- ++i;
- value = i*SIXSStepOfWavelenghtSpectralBandValues;
+ // Search the User interval that surround the StepOfWavelenghtSpectralBandValues current value.
+
+ // removed the <= here, might be wrong
+ while (j*L_userStep < value)
+ {
+ ++j;
+ }
+
+ // Check if we are not out of bound
+ if (j>=FilterFunctionValues.size())
+ {
+ itkGenericExceptionMacro(<<"Index "<<j<<" out of bound for FilterFunctionValues vector (size: "<<FilterFunctionValues.size()<<").");
+ }
+
+ double valueTemp;
+ valueTemp = static_cast<double>(FilterFunctionValues[j-1])
+ + ((static_cast<double>(FilterFunctionValues[j])-static_cast<double>(FilterFunctionValues[j-1]))*invStep)
+ *(value-L_userStep*(j-1));
+ values.push_back(static_cast<WavelenghtSpectralBandType>(valueTemp));
+
+ ++i;
+ value = i*SIXSStepOfWavelenghtSpectralBandValues;
}
if (L_min+(i-1)*SIXSStepOfWavelenghtSpectralBandValues != L_max)
diff --git a/Code/Radiometry/otbSurfaceAdjencyEffect6SCorrectionSchemeFilter.h b/Code/Radiometry/otbSurfaceAdjencyEffect6SCorrectionSchemeFilter.h
index 05e3cdeaf02b9fc978fae5a925b203e97e148077..cd16ee5a37d86ef38548ad5bf9eb4ae6a2ea17df 100644
--- a/Code/Radiometry/otbSurfaceAdjencyEffect6SCorrectionSchemeFilter.h
+++ b/Code/Radiometry/otbSurfaceAdjencyEffect6SCorrectionSchemeFilter.h
@@ -238,12 +238,12 @@ public:
/** Get/Set Filter function coef. */
void SetFilterFunctionCoef( FilterFunctionCoefVectorType vect )
{
- m_FilterFunctionCoef = vect;
- this->Modified();
+ m_FilterFunctionCoef = vect;
+ this->Modified();
}
FilterFunctionCoefVectorType GetFilterFunctionCoef()
{
- return m_FilterFunctionCoef;
+ return m_FilterFunctionCoef;
}
/** Compute the functor parameters */
diff --git a/Code/Radiometry/otbSurfaceAdjencyEffect6SCorrectionSchemeFilter.txx b/Code/Radiometry/otbSurfaceAdjencyEffect6SCorrectionSchemeFilter.txx
index 8602abc5042900c8817af3c014518fb0181ced3e..6b940a27f1d725d0d42be15236d62767fe57a718 100644
--- a/Code/Radiometry/otbSurfaceAdjencyEffect6SCorrectionSchemeFilter.txx
+++ b/Code/Radiometry/otbSurfaceAdjencyEffect6SCorrectionSchemeFilter.txx
@@ -136,33 +136,33 @@ SurfaceAdjencyEffect6SCorrectionSchemeFilter<TInputImage,TOutputImage>
if(m_AeronetFileName != "")
{
- m_CorrectionParameters->UpdateAeronetData( m_AeronetFileName,
- imageMetadataInterface->GetYear(dict),
- imageMetadataInterface->GetHour(dict),
- imageMetadataInterface->GetMinute(dict) );
+ m_CorrectionParameters->UpdateAeronetData( m_AeronetFileName,
+ imageMetadataInterface->GetYear(dict),
+ imageMetadataInterface->GetHour(dict),
+ imageMetadataInterface->GetMinute(dict) );
}
// load fiter function values
if(m_FilterFunctionValuesFileName != "")
{
m_CorrectionParameters->LoadFilterFunctionValue( m_FilterFunctionValuesFileName );
- }
- // the user has set the filter function values
+ }
+ // the user has set the filter function values
else
{
if( m_FilterFunctionCoef.size() != this->GetInput()->GetNumberOfComponentsPerPixel() )
- {
- itkExceptionMacro(<<"Filter Function and image channels mismatch.");
- }
+ {
+ itkExceptionMacro(<<"Filter Function and image channels mismatch.");
+ }
for(unsigned int i=0; i<this->GetInput()->GetNumberOfComponentsPerPixel(); i++)
- {
- FilterFunctionValuesType::Pointer functionValues = FilterFunctionValuesType::New();
- functionValues->SetFilterFunctionValues(m_FilterFunctionCoef[i]);
- functionValues->SetMinSpectralValue(imageMetadataInterface->GetFirstWavelengths(dict)[i]);
- functionValues->SetMaxSpectralValue(imageMetadataInterface->GetLastWavelengths(dict)[i]);
-
- m_CorrectionParameters->SetWavelenghtSpectralBandWithIndex(i, functionValues);
- }
+ {
+ FilterFunctionValuesType::Pointer functionValues = FilterFunctionValuesType::New();
+ functionValues->SetFilterFunctionValues(m_FilterFunctionCoef[i]);
+ functionValues->SetMinSpectralValue(imageMetadataInterface->GetFirstWavelengths(dict)[i]);
+ functionValues->SetMaxSpectralValue(imageMetadataInterface->GetLastWavelengths(dict)[i]);
+
+ m_CorrectionParameters->SetWavelenghtSpectralBandWithIndex(i, functionValues);
+ }
}
Parameters2RadiativeTermsPointerType param2Terms = Parameters2RadiativeTermsType::New();
diff --git a/Code/Radiometry/otbTerraSarCalibrationImageFilter.h b/Code/Radiometry/otbTerraSarCalibrationImageFilter.h
index 81e64fcf6ffabc86820d813a1d2648346ca16e1f..94d8f9c31661f957b511429b2a211675a89d0858 100644
--- a/Code/Radiometry/otbTerraSarCalibrationImageFilter.h
+++ b/Code/Radiometry/otbTerraSarCalibrationImageFilter.h
@@ -37,16 +37,16 @@ namespace otb
* \brief Calculates the calibration of TerraSar sensor images.
*
* For details, please refer to Infoterra documentation : "Radiometric Calibration of TerraSAR-X Data".
- * Using FastCalibration boolean allows to compute the result considering the first noise polygone
- * coeffcients for each line or to use every polygones coefficient given.
- * The code was made considering that the first acquisition point is the lower left one.
+ * Using FastCalibration boolean allows to compute the result considering the first noise polygone
+ * coeffcients for each line or to use every polygones coefficient given.
+ * The code was made considering that the first acquisition point is the lower left one.
*
* \ingroup Radiometry
*/
template<class TInputImage, class TOutputImage >
class ITK_EXPORT TerraSarCalibrationImageFilter :
- public UnaryFunctorWithIndexImageFilter<
+ public UnaryFunctorWithIndexImageFilter<
TInputImage,
TOutputImage,
ITK_TYPENAME Functor::TerraSarCalibrationImageFunctor< ITK_TYPENAME TInputImage::InternalPixelType, ITK_TYPENAME TOutputImage::InternalPixelType > >
@@ -101,8 +101,8 @@ public:
/** Vector of vector that contain noise polinomial coefficient */
void SetNoisePolynomialCoefficientsList( DoubleVectorVectorType vect );
DoubleVectorVectorType GetNoisePolynomialCoefficientsList() const;
- /** Fast Calibration Method. If set to trus, will consider only the first noise coefficient else,
- * will use all of them and applied it according to its acquisition UTC time and the coordinates
+ /** Fast Calibration Method. If set to trus, will consider only the first noise coefficient else,
+ * will use all of them and applied it according to its acquisition UTC time and the coordinates
* of the pixel in the image. */
void SetUseFastCalibrationMethod( bool b );
bool GetUseFastCalibrationMethod() const;
diff --git a/Code/Radiometry/otbTerraSarCalibrationImageFilter.txx b/Code/Radiometry/otbTerraSarCalibrationImageFilter.txx
index 229f626bd17d53a69d96b181ab23af71507f42d1..4ed16f1c14feddbeb30d6896ad2884d34f402d6e 100644
--- a/Code/Radiometry/otbTerraSarCalibrationImageFilter.txx
+++ b/Code/Radiometry/otbTerraSarCalibrationImageFilter.txx
@@ -48,16 +48,16 @@ TerraSarCalibrationImageFilter<TInputImage,TOutputImage>
{
unsigned int size = this->GetFunctor().GetNoisePolynomialCoefficientsList()[0].size();
for(unsigned int i=1; i<this->GetFunctor().GetNoisePolynomialCoefficientsList().size(); i++)
- {
- if( this->GetFunctor().GetNoisePolynomialCoefficientsList()[i].size() != size )
- itkExceptionMacro(<<"Wrong noise polynomial coefficient, degrees mismatch.");
- }
+ {
+ if( this->GetFunctor().GetNoisePolynomialCoefficientsList()[i].size() != size )
+ itkExceptionMacro(<<"Wrong noise polynomial coefficient, degrees mismatch.");
+ }
if( this->GetFunctor().GetTimeUTC().size() != this->GetFunctor().GetNoisePolynomialCoefficientsList().size() )
- itkExceptionMacro(<<"Number of Time UTC and number of noise polygonls mismatch."<<this->GetFunctor().GetTimeUTC().size()<<" "<<this->GetFunctor().GetNoisePolynomialCoefficientsList().size());
+ itkExceptionMacro(<<"Number of Time UTC and number of noise polygonls mismatch."<<this->GetFunctor().GetTimeUTC().size()<<" "<<this->GetFunctor().GetNoisePolynomialCoefficientsList().size());
if(this->GetFunctor().GetPRF() == 0.)
- itkExceptionMacro(<<"PRF can't be null.");
+ itkExceptionMacro(<<"PRF can't be null.");
}
@@ -71,7 +71,7 @@ template <class TInputImage, class TOutputImage>
void
TerraSarCalibrationImageFilter<TInputImage,TOutputImage>
::SetCalFactor( double val )
-{
+{
this->GetFunctor().SetCalFactor( val );
this->Modified();
}
@@ -80,15 +80,15 @@ template <class TInputImage, class TOutputImage>
double
TerraSarCalibrationImageFilter<TInputImage,TOutputImage>
::GetCalFactor() const
-{
- return this->GetFunctor().GetCalFactor();
+{
+ return this->GetFunctor().GetCalFactor();
}
template <class TInputImage, class TOutputImage>
void
TerraSarCalibrationImageFilter<TInputImage,TOutputImage>
-::SetNoiseRangeValidityMin( double val )
-{
+::SetNoiseRangeValidityMin( double val )
+{
this->GetFunctor().SetNoiseRangeValidityMin( val );
this->Modified();
}
@@ -96,16 +96,16 @@ TerraSarCalibrationImageFilter<TInputImage,TOutputImage>
template <class TInputImage, class TOutputImage>
double
TerraSarCalibrationImageFilter<TInputImage,TOutputImage>
-::GetNoiseRangeValidityMin() const
-{
- return this->GetFunctor().GetNoiseRangeValidityMin();
+::GetNoiseRangeValidityMin() const
+{
+ return this->GetFunctor().GetNoiseRangeValidityMin();
}
template <class TInputImage, class TOutputImage>
void
TerraSarCalibrationImageFilter<TInputImage,TOutputImage>
-::SetNoiseRangeValidityMax( double val )
-{
+::SetNoiseRangeValidityMax( double val )
+{
this->GetFunctor().SetNoiseRangeValidityMax( val );
this->Modified();
}
@@ -114,15 +114,15 @@ template <class TInputImage, class TOutputImage>
double
TerraSarCalibrationImageFilter<TInputImage,TOutputImage>
::GetNoiseRangeValidityMax() const
-{
+{
return this->GetFunctor().GetNoiseRangeValidityMax();
}
template <class TInputImage, class TOutputImage>
void
TerraSarCalibrationImageFilter<TInputImage,TOutputImage>
-::SetNoiseRangeValidityRef( double val )
-{
+::SetNoiseRangeValidityRef( double val )
+{
this->GetFunctor().SetNoiseRangeValidityRef( val );
this->Modified();
}
@@ -132,8 +132,8 @@ template <class TInputImage, class TOutputImage>
double
TerraSarCalibrationImageFilter<TInputImage,TOutputImage>
::GetNoiseRangeValidityRef() const
-{
- return this->GetFunctor().GetNoiseRangeValidityRef();
+{
+ return this->GetFunctor().GetNoiseRangeValidityRef();
}
@@ -141,8 +141,8 @@ template <class TInputImage, class TOutputImage>
void
TerraSarCalibrationImageFilter<TInputImage,TOutputImage>
::SetLocalIncidentAngle( double val )
-{
- this->GetFunctor().SetLocalIncidentAngle( val );
+{
+ this->GetFunctor().SetLocalIncidentAngle( val );
this->Modified();
}
@@ -150,7 +150,7 @@ template <class TInputImage, class TOutputImage>
double
TerraSarCalibrationImageFilter<TInputImage,TOutputImage>
::GetLocalIncidentAngle() const
-{
+{
return this->GetFunctor().GetLocalIncidentAngle();
}
@@ -159,7 +159,7 @@ double
TerraSarCalibrationImageFilter<TInputImage,TOutputImage>
::GetSinLocalIncidentAngle() const
{
- return this->GetFunctor().GetSinLocalIncidentAngle();
+ return this->GetFunctor().GetSinLocalIncidentAngle();
}
template <class TInputImage, class TOutputImage>
@@ -176,7 +176,7 @@ template <class TInputImage, class TOutputImage>
typename TerraSarCalibrationImageFilter<TInputImage,TOutputImage>::DoubleVectorVectorType
TerraSarCalibrationImageFilter<TInputImage,TOutputImage>
::GetNoisePolynomialCoefficientsList() const
-{
+{
return this->GetFunctor().GetNoisePolynomialCoefficientsList();
}
@@ -185,15 +185,15 @@ void
TerraSarCalibrationImageFilter<TInputImage,TOutputImage>
::SetUseFastCalibrationMethod( bool b )
{
- this->GetFunctor().SetUseFastCalibrationMethod( b );
+ this->GetFunctor().SetUseFastCalibrationMethod( b );
this->Modified();
}
template <class TInputImage, class TOutputImage>
bool
TerraSarCalibrationImageFilter<TInputImage,TOutputImage>
-::GetUseFastCalibrationMethod() const
-{
+::GetUseFastCalibrationMethod() const
+{
return this->GetFunctor().GetUseFastCalibrationMethod();
}
@@ -201,8 +201,8 @@ TerraSarCalibrationImageFilter<TInputImage,TOutputImage>
template <class TInputImage, class TOutputImage>
void
TerraSarCalibrationImageFilter<TInputImage,TOutputImage>
-::SetTimeUTC( LIntVectorType vect )
-{
+::SetTimeUTC( LIntVectorType vect )
+{
this->GetFunctor().SetTimeUTC( vect );
this->Modified();
}
@@ -212,7 +212,7 @@ template <class TInputImage, class TOutputImage>
typename TerraSarCalibrationImageFilter<TInputImage,TOutputImage>::LIntVectorType
TerraSarCalibrationImageFilter<TInputImage,TOutputImage>
::GetTimeUTC() const
-{
+{
return this->GetFunctor().GetTimeUTC();
}
@@ -220,9 +220,9 @@ TerraSarCalibrationImageFilter<TInputImage,TOutputImage>
template <class TInputImage, class TOutputImage>
void
TerraSarCalibrationImageFilter<TInputImage,TOutputImage>
-::SetPRF( double val )
-{
- this->GetFunctor().SetPRF( val );
+::SetPRF( double val )
+{
+ this->GetFunctor().SetPRF( val );
this->Modified();
}
@@ -231,7 +231,7 @@ template <class TInputImage, class TOutputImage>
double
TerraSarCalibrationImageFilter<TInputImage,TOutputImage>
::GetPRF() const
-{
+{
return this->GetFunctor().GetPRF();
}
@@ -241,7 +241,7 @@ double
TerraSarCalibrationImageFilter<TInputImage,TOutputImage>
::GetInvPRF() const
{
- return this->GetFunctor().GetInvPRF();
+ return this->GetFunctor().GetInvPRF();
}
/**PrintSelf method */
@@ -262,9 +262,9 @@ TerraSarCalibrationImageFilter<TInputImage,TOutputImage>
{
os << "Noise polinomial coefficient: [ ";
for (unsigned int i=0; i<this->GetNoisePolynomialCoefficientsList()[0].size(); ++i)
- {
- os << this->GetNoisePolynomialCoefficientsList()[0][i] << " ";
- }
+ {
+ os << this->GetNoisePolynomialCoefficientsList()[0][i] << " ";
+ }
os << "]" << std::endl;
}
else
@@ -272,17 +272,17 @@ TerraSarCalibrationImageFilter<TInputImage,TOutputImage>
os << "Pulse Repetition Frequency : " << this->GetPRF() << std::endl;
os << "Noise acquisitions : " << this->GetNoisePolynomialCoefficientsList().size() << std::endl;
for (unsigned int i=0; i<this->GetNoisePolynomialCoefficientsList().size(); ++i)
- {
- os << "Noise acquisition "<< i << ":" << std::endl;
- os << "Noise TimeUTC : " << this->GetTimeUTC()[i] << std::endl;
- os << "Noise polinomial coefficient: [ ";
- for (unsigned int j=0; j<this->GetNoisePolynomialCoefficientsList()[j].size(); ++j)
- {
- os << this->GetNoisePolynomialCoefficientsList()[i][j] << " ";
- }
+ {
+ os << "Noise acquisition "<< i << ":" << std::endl;
+ os << "Noise TimeUTC : " << this->GetTimeUTC()[i] << std::endl;
+ os << "Noise polinomial coefficient: [ ";
+ for (unsigned int j=0; j<this->GetNoisePolynomialCoefficientsList()[j].size(); ++j)
+ {
+ os << this->GetNoisePolynomialCoefficientsList()[i][j] << " ";
+ }
os << "]" << std::endl;
- }
- }
+ }
+ }
}
diff --git a/Code/Radiometry/otbTerraSarRadarBrightnessImageFilter.h b/Code/Radiometry/otbTerraSarRadarBrightnessImageFilter.h
index f32d73869fce72ba71c2e11c988ab52ee19ba1f3..45cef271df62d6733176521097ba34a248663c86 100644
--- a/Code/Radiometry/otbTerraSarRadarBrightnessImageFilter.h
+++ b/Code/Radiometry/otbTerraSarRadarBrightnessImageFilter.h
@@ -40,7 +40,7 @@ namespace otb
template <class TInputImage, class TOutputImage >
class ITK_EXPORT TerraSarRadarBrightnessImageFilter :
- public itk::UnaryFunctorImageFilter<
+ public itk::UnaryFunctorImageFilter<
TInputImage,
TOutputImage,
ITK_TYPENAME Functor::TerraSarRadarBrightnessImageFunctor< ITK_TYPENAME TInputImage::InternalPixelType, ITK_TYPENAME TOutputImage::InternalPixelType > >
@@ -57,7 +57,7 @@ public:
ITK_TYPENAME OutputImageType::InternalPixelType> FunctorType;
/** "typedef" for standard classes. */
typedef TerraSarRadarBrightnessImageFilter Self;
- typedef itk::UnaryFunctorImageFilter< InputImageType, OutputImageType, FunctorType >
+ typedef itk::UnaryFunctorImageFilter< InputImageType, OutputImageType, FunctorType >
Superclass;
typedef itk::SmartPointer<Self> Pointer;
typedef itk::SmartPointer<const Self> ConstPointer;
diff --git a/Code/Radiometry/otbVegetationIndicesFunctor.h b/Code/Radiometry/otbVegetationIndicesFunctor.h
index 953abad0074169c5e07764539d369ef711ef6c25..acbb68992e3f38c279691af503d194f3f7e21818 100644
--- a/Code/Radiometry/otbVegetationIndicesFunctor.h
+++ b/Code/Radiometry/otbVegetationIndicesFunctor.h
@@ -594,14 +594,14 @@ public:
typedef WDVI<TInput1, TInput2, TOutput> WDVIFunctorType;
MSAVI() : m_S(0.4)
{
- m_WDVIfunctor.SetS(m_S);
+ m_WDVIfunctor.SetS(m_S);
};
virtual ~MSAVI() {};
/** Set/Get Slop of soil line */
void SetS( const double s)
{
m_S = s;
- m_WDVIfunctor.SetS(m_S);
+ m_WDVIfunctor.SetS(m_S);
}
double GetS(void)const
{
diff --git a/Code/Radiometry/otbWaterSqrtSpectralAngleImageFilter.h b/Code/Radiometry/otbWaterSqrtSpectralAngleImageFilter.h
index 259adc900cfd000a26bb6eac61352fbfe948ffa2..946aaa333543bf9194431dc1c5b0329dd90e98f3 100644
--- a/Code/Radiometry/otbWaterSqrtSpectralAngleImageFilter.h
+++ b/Code/Radiometry/otbWaterSqrtSpectralAngleImageFilter.h
@@ -10,8 +10,8 @@ Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
See OTBCopyright.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.
=========================================================================*/
diff --git a/Code/Visualization/otbCrossGlComponent.cxx b/Code/Visualization/otbCrossGlComponent.cxx
index c41f6e8d58767d5a621b71b44c0293121ce5b265..6b552f73461072939ff310d3bbddfd94a2ebf73a 100644
--- a/Code/Visualization/otbCrossGlComponent.cxx
+++ b/Code/Visualization/otbCrossGlComponent.cxx
@@ -38,18 +38,18 @@ CrossGlComponent
m_Spacing.Fill(1.);
// Create the tesselator
- m_GluTesselator = gluNewTess();
+ m_GluTesselator = gluNewTess();
}
CrossGlComponent
-::~CrossGlComponent()
+::~CrossGlComponent()
{
// Delete the tesselator
gluDeleteTess(m_GluTesselator);
}
-void
+void
CrossGlComponent
::Render(const RegionType& extent,const AffineTransformType * space2ScreenTransform)
{
@@ -90,7 +90,7 @@ CrossGlComponent
}
-void
+void
CrossGlComponent
::Render(unsigned int id, const RegionType & extent, const AffineTransformType * space2ScreenTransform)
{
diff --git a/Code/Visualization/otbCrossGlComponent.h b/Code/Visualization/otbCrossGlComponent.h
index 1c11b6ec39f534a8c80d0476cb041d944b283d5e..1cb5ebcf2b9c533af5639dbe690b2d37bf223215 100644
--- a/Code/Visualization/otbCrossGlComponent.h
+++ b/Code/Visualization/otbCrossGlComponent.h
@@ -119,7 +119,7 @@ public:
/** Clear all*/
void Clear() { m_IndexList.clear(); m_ColorList.clear(); };
void ClearIndex(unsigned int id)
- {
+ {
this->RemoveIndex(id);
this->RemoveColor(id);
};
diff --git a/Code/Visualization/otbCurves2DWidget.cxx b/Code/Visualization/otbCurves2DWidget.cxx
index 4a65831d441ca081e5035943c770f68f1975a06e..668ee4988c05af622ef266d3f67997239446132f 100644
--- a/Code/Visualization/otbCurves2DWidget.cxx
+++ b/Code/Visualization/otbCurves2DWidget.cxx
@@ -153,7 +153,7 @@ void Curves2DWidget::UpdateSpaceToScreenTransform()
RegionType::SizeType extentSize;
// Extent index
- extentIndex[0]=m_Margins[0];
+ extentIndex[0]=m_Margins[0];
extentIndex[1]=m_Margins[1];
// Extent size
@@ -171,7 +171,7 @@ void Curves2DWidget::UpdateSpaceToScreenTransform()
matrix(1,1)=(static_cast<double>(m_Extent.GetSize()[1]))/m_AxisLength[1];
m_SpaceToScreenTransform->SetMatrix(matrix);
- // Set the translation
+ // Set the translation
AffineTransformType::OutputVectorType translation;
translation[0]=m_Extent.GetIndex()[0]-m_AxisOrigin[0];
translation[1]=m_Extent.GetIndex()[1]-m_AxisOrigin[1];
@@ -192,7 +192,7 @@ void Curves2DWidget::RenderAxis()
spaceCenter.Fill(0.);
PointType screenCenter = m_SpaceToScreenTransform->TransformPoint(spaceCenter);
- // Update zero crossing coords
+ // Update zero crossing coords
if(m_ZeroCrossingAxis)
{
diff --git a/Code/Visualization/otbGlWidget.cxx b/Code/Visualization/otbGlWidget.cxx
index 86e7699b2903bca4e99ddff275d686a45b000bad..8ac1302ab6d6425d7259966839d18184672ce792 100644
--- a/Code/Visualization/otbGlWidget.cxx
+++ b/Code/Visualization/otbGlWidget.cxx
@@ -92,7 +92,7 @@ void GlWidget::resize(int x, int y, int w, int h)
{
// Distinguish between resize, move and not changed events
// (The system window manager may generate multiple resizing events,
- // so we'd rather avoid event flooding here)
+ // so we'd rather avoid event flooding here)
bool reportMove = false;
bool reportResize = false;
if(this->x() != x || this->y() != y)
diff --git a/Code/Visualization/otbHistogramActionHandler.h b/Code/Visualization/otbHistogramActionHandler.h
index c82ce28e5089f82e4aade2f57a99c4bb02cf5082..fd9775eef279a0cb493c6a75a8044c1b81301b33 100644
--- a/Code/Visualization/otbHistogramActionHandler.h
+++ b/Code/Visualization/otbHistogramActionHandler.h
@@ -19,7 +19,7 @@
#define __otbHistogramActionHandler_h
#include "otbCurves2DWidget.h"
-#include "otbVerticalAsymptoteCurve.h"
+#include "otbVerticalAsymptoteCurve.h"
namespace otb
@@ -83,7 +83,7 @@ virtual bool HandleWidgetEvent(std::string widgetId, int event)
// Variable declaration
PointType spacePoint, screenPoint;
- // Left screen abcisse
+ // Left screen abcisse
spacePoint[0] = m_LeftAsymptote->GetAbcisse();
double abcisseL = m_Curve->TransformPoint(spacePoint)[0];
@@ -93,69 +93,69 @@ virtual bool HandleWidgetEvent(std::string widgetId, int event)
if(widgetId == m_Curve->GetIdentifier())
{
- switch (event)
- {
- case FL_PUSH:
- {
- // Position Clicked
- double x = Fl::event_x();
-
- if ((vcl_abs(x-abcisseL)<50) || (vcl_abs(x-abcisseR)<50))
- {
- if (vcl_abs(x-abcisseL)<vcl_abs(x-abcisseR))
- {
- m_ModifyLeft = true;
- }
- else
- {
- m_ModifyRight = true;
- }
- }
- return true;
- }
- case FL_RELEASE:
- {
- if(m_ModifyLeft || m_ModifyRight)
- {
- m_Model->Update();
- }
-
- m_ModifyLeft = false;
- m_ModifyRight = false;
- return true;
- }
- case FL_DRAG:
- {
- double x = Fl::event_x();
-
- if(m_ModifyLeft)
- {
- double tx = x - abcisseL;
- m_LeftAsymptote->SetAbcisse(m_LeftAsymptote->GetAbcisse() + tx);
- m_Curve->redraw();
-
- // Update The Rendering Function min and max
- ParametersType param = m_RenderingFunction->GetParameters();
- param.SetElement(2*m_Channel, m_LeftAsymptote->GetAbcisse() + tx);
+ switch (event)
+ {
+ case FL_PUSH:
+ {
+ // Position Clicked
+ double x = Fl::event_x();
+
+ if ((vcl_abs(x-abcisseL)<50) || (vcl_abs(x-abcisseR)<50))
+ {
+ if (vcl_abs(x-abcisseL)<vcl_abs(x-abcisseR))
+ {
+ m_ModifyLeft = true;
+ }
+ else
+ {
+ m_ModifyRight = true;
+ }
+ }
+ return true;
+ }
+ case FL_RELEASE:
+ {
+ if(m_ModifyLeft || m_ModifyRight)
+ {
+ m_Model->Update();
+ }
+
+ m_ModifyLeft = false;
+ m_ModifyRight = false;
+ return true;
+ }
+ case FL_DRAG:
+ {
+ double x = Fl::event_x();
+
+ if(m_ModifyLeft)
+ {
+ double tx = x - abcisseL;
+ m_LeftAsymptote->SetAbcisse(m_LeftAsymptote->GetAbcisse() + tx);
+ m_Curve->redraw();
+
+ // Update The Rendering Function min and max
+ ParametersType param = m_RenderingFunction->GetParameters();
+ param.SetElement(2*m_Channel, m_LeftAsymptote->GetAbcisse() + tx);
param.SetElement(2*m_Channel+1, m_RightAsymptote->GetAbcisse());
- m_RenderingFunction->SetParameters(param);
- }
-
- if(m_ModifyRight)
- {
- double tx = x - abcisseR;
- m_RightAsymptote->SetAbcisse(m_RightAsymptote->GetAbcisse() + tx);
- m_Curve->redraw();
-
- // Update The Rendering Function min and max
- ParametersType param = m_RenderingFunction->GetParameters();
- param.SetElement(2*m_Channel, m_LeftAsymptote->GetAbcisse());
+ m_RenderingFunction->SetParameters(param);
+ }
+
+ if(m_ModifyRight)
+ {
+ double tx = x - abcisseR;
+ m_RightAsymptote->SetAbcisse(m_RightAsymptote->GetAbcisse() + tx);
+ m_Curve->redraw();
+
+ // Update The Rendering Function min and max
+ ParametersType param = m_RenderingFunction->GetParameters();
+ param.SetElement(2*m_Channel, m_LeftAsymptote->GetAbcisse());
param.SetElement(2*m_Channel+1, m_RightAsymptote->GetAbcisse()+tx);
- m_RenderingFunction->SetParameters(param);
- }
- return true;
- }
- }
+ m_RenderingFunction->SetParameters(param);
+ }
+ return true;
+ }
+ }
}
return false;
}
@@ -209,10 +209,10 @@ private:
ModelPointerType m_Model;
// Curve Widget To Handle Events on
- CurveWidgetPointerType m_Curve;
+ CurveWidgetPointerType m_Curve;
// StandardRenderingFunction
- RenderingFunctionPointerType m_RenderingFunction;
+ RenderingFunctionPointerType m_RenderingFunction;
// Left And Rigth Asymptote
VerticalAsymptotePointerType m_LeftAsymptote;
diff --git a/Code/Visualization/otbHistogramCurve.txx b/Code/Visualization/otbHistogramCurve.txx
index 5b8b921ecb04a9f741cb09db46740d4baa847a2d..507ed1c4249dee621737c04234b1982328b96828 100644
--- a/Code/Visualization/otbHistogramCurve.txx
+++ b/Code/Visualization/otbHistogramCurve.txx
@@ -23,7 +23,7 @@
namespace otb
{
-template <class THistogram>
+template <class THistogram>
HistogramCurve<THistogram>
::HistogramCurve() : m_Histogram(), m_HistogramColor()
{
@@ -31,13 +31,13 @@ HistogramCurve<THistogram>
m_HistogramColor.Fill(0.5);
}
-template <class THistogram>
+template <class THistogram>
HistogramCurve<THistogram>
::~HistogramCurve()
{}
-template <class THistogram>
-void
+template <class THistogram>
+void
HistogramCurve<THistogram>
::Render(const RegionType& extent,const AffineTransformType * space2ScreenTransform)
{
@@ -111,7 +111,7 @@ HistogramCurve<THistogram>
glDisable(GL_BLEND);
}
-template <class THistogram>
+template <class THistogram>
void
HistogramCurve<THistogram>
::BeforeRendering()
@@ -154,23 +154,23 @@ HistogramCurve<THistogram>
}
mean/=nbSamples;
squaremean/=nbSamples;
- m_Maximum[1] = mean + 6*vcl_sqrt(squaremean - mean*mean);
+ m_Maximum[1] = mean + 6*vcl_sqrt(squaremean - mean*mean);
m_BinWidth = (last-first)/(nbSamples);
}
-template <class THistogram>
+template <class THistogram>
typename HistogramCurve<THistogram>
-::PointType
+::PointType
HistogramCurve<THistogram>
::GetMinimum()
{
return m_Minimum;
}
-template <class THistogram>
+template <class THistogram>
typename HistogramCurve<THistogram>
-::PointType
+::PointType
HistogramCurve<THistogram>
::GetMaximum()
{
diff --git a/Code/Visualization/otbImageLayerRenderingModel.txx b/Code/Visualization/otbImageLayerRenderingModel.txx
index de2e3237b0635528f2f0b400603e6324cac63435..14bbac91ef9b784495034549e97b743560d74116 100644
--- a/Code/Visualization/otbImageLayerRenderingModel.txx
+++ b/Code/Visualization/otbImageLayerRenderingModel.txx
@@ -27,14 +27,14 @@ namespace otb
template <class TOutputImage, class TLayer>
ImageLayerRenderingModel<TOutputImage, TLayer>
-::ImageLayerRenderingModel() : m_Name("Default"), m_RasterizedQuicklook(),
+::ImageLayerRenderingModel() : m_Name("Default"), m_RasterizedQuicklook(),
m_HasQuicklook(false),m_RasterizedExtract(),m_HasExtract(false),
m_ExtractRegion(), m_RasterizedScaledExtract(), m_HasScaledExtract(false),
- m_ScaledExtractRegion(), m_Updating(false), m_QuicklookBlendingFilterList(),
+ m_ScaledExtractRegion(), m_Updating(false), m_QuicklookBlendingFilterList(),
m_ExtractBlendingFilterList(), m_ScaledExtractBlendingFilterList()
{
- // Initalize the blending filter list
+ // Initalize the blending filter list
m_QuicklookBlendingFilterList = BlendingFilterListType::New();
m_ExtractBlendingFilterList = BlendingFilterListType::New();
m_ScaledExtractBlendingFilterList = BlendingFilterListType::New();
@@ -189,7 +189,7 @@ ImageLayerRenderingModel<TOutputImage, TLayer>
{
itk::TimeProbe probe;
probe.Start();
- // If quicklook is activated and available for this layer
+ // If quicklook is activated and available for this layer
if(m_HasQuicklook && it.Get()->GetHasQuicklook())
{
// Blend it with the current rasterized quicklook
@@ -203,7 +203,7 @@ ImageLayerRenderingModel<TOutputImage, TLayer>
m_RasterizedQuicklook = blender->GetOutput();
}
- // If extract is activated and available for this layer
+ // If extract is activated and available for this layer
if(m_HasExtract && it.Get()->GetHasExtract())
{
// Blend it with the current rasterized extract
@@ -218,7 +218,7 @@ ImageLayerRenderingModel<TOutputImage, TLayer>
m_RasterizedExtract = blender->GetOutput();
}
- // If scaledExtract is activated and available for this layer
+ // If scaledExtract is activated and available for this layer
if(m_HasScaledExtract && it.Get()->GetHasScaledExtract())
{
// Blend it with the current rasterized scaledExtract
@@ -382,4 +382,4 @@ ImageLayerRenderingModel<TOutputImage, TLayer>
} // end namespace otb
-#endif
+#endif
diff --git a/Code/Visualization/otbImageView.txx b/Code/Visualization/otbImageView.txx
index b0ef1beaee2d4732d57046ce1bd04619a3d6efa0..d3011776ba3247067aa37115442b84ad85aa80f5 100644
--- a/Code/Visualization/otbImageView.txx
+++ b/Code/Visualization/otbImageView.txx
@@ -120,7 +120,7 @@ ImageView<TViewerModel>
// Read the buffer
const RegionType qlRegion = m_Model->GetRasterizedQuicklook()
- ->GetLargestPossibleRegion();
+ ->GetLargestPossibleRegion();
m_ScrollWidget->ReadBuffer(m_Model->GetRasterizedQuicklook(),qlRegion);
// Compute the appropriate scale
@@ -159,7 +159,7 @@ ImageView<TViewerModel>
::UpdateFullWidget()
{
if(m_Model->GetHasExtract())
- {
+ {
otbMsgDevMacro(<<"ImageView::UpdateFullWidget(): redrawing full widget");
m_FullWidget->ReadBuffer(m_Model->GetRasterizedExtract(),m_Model->GetRasterizedExtract()
->GetLargestPossibleRegion());
@@ -203,7 +203,7 @@ ImageView<TViewerModel>
m_ZoomWidget->label(label.c_str());
m_ZoomWidget->redraw();
- }
+ }
}
diff --git a/Code/Visualization/otbLayerBasedModel.txx b/Code/Visualization/otbLayerBasedModel.txx
index 5b56533b900ed56a11285d279e60651310de37cc..a7070a68e4c959b104553fb0b462cac9faec8eb8 100644
--- a/Code/Visualization/otbLayerBasedModel.txx
+++ b/Code/Visualization/otbLayerBasedModel.txx
@@ -162,4 +162,4 @@ LayerBasedModel<TLayer>
} // end namespace otb
-#endif
+#endif
diff --git a/Code/Visualization/otbMouseClickActionHandler.h b/Code/Visualization/otbMouseClickActionHandler.h
index fe7e4323183b8c2a22dda54b6bd033341913e2b7..e523be30c8337c8d7ed8e7faa3c3b9b511c2f1b2 100644
--- a/Code/Visualization/otbMouseClickActionHandler.h
+++ b/Code/Visualization/otbMouseClickActionHandler.h
@@ -25,12 +25,12 @@ namespace otb
/** \class MouseClickActionHandler
* \brief Implements clicking on widgets
* Triggers the IndexClicked(); methods on the destination.
-*
+*
* \sa ImageWidgetController
* \sa ImageWidgetActionHandler
*/
-template <class TModel,class TView>
+template <class TModel,class TView>
class MouseClickActionHandler
: public ImageWidgetActionHandler
{
@@ -156,7 +156,7 @@ private:
int m_MouseButton;
-}; // end class
+}; // end class
} // end namespace otb
#endif
diff --git a/Code/Visualization/otbPackedWidgetManager.cxx b/Code/Visualization/otbPackedWidgetManager.cxx
index 561c34b5b093b40e4b342d61f691886756c5de15..4d05b642faaddab53daa951db00d22efb987da63 100644
--- a/Code/Visualization/otbPackedWidgetManager.cxx
+++ b/Code/Visualization/otbPackedWidgetManager.cxx
@@ -21,19 +21,19 @@ namespace otb
{
PackedWidgetManager
-::PackedWidgetManager()
+::PackedWidgetManager()
{
m_PackedWidget = new ImageWidgetPackedManagerType();
}
PackedWidgetManager
-::~PackedWidgetManager()
+::~PackedWidgetManager()
{
delete m_PackedWidget;
}
-void
+void
PackedWidgetManager
::RegisterFullWidget(WidgetType* fullWidget)
{
@@ -45,9 +45,9 @@ PackedWidgetManager
}
-void
+void
PackedWidgetManager
-::RegisterScrollWidget(WidgetType* scrollWidget)
+::RegisterScrollWidget(WidgetType* scrollWidget)
{
m_InternalScrollWidget = scrollWidget;
m_PackedWidget->m_QuicklookGroup->add(scrollWidget);
@@ -57,7 +57,7 @@ PackedWidgetManager
}
-void
+void
PackedWidgetManager
::RegisterZoomWidget(WidgetType* zoomWidget)
{
@@ -67,7 +67,7 @@ PackedWidgetManager
zoomWidget->resize(m_PackedWidget->m_ZoomGroup->x(),m_PackedWidget->m_ZoomGroup->y(),
m_PackedWidget->m_ZoomGroup->w(),m_PackedWidget->m_ZoomGroup->h());
}
-void
+void
PackedWidgetManager
::RegisterPixelDescriptionWidget(Fl_Output * pixelWidget)
{
@@ -79,7 +79,7 @@ PackedWidgetManager
}
-void
+void
PackedWidgetManager
::RegisterHistogramWidget(WidgetType* curveWidget)
{
@@ -90,7 +90,7 @@ PackedWidgetManager
m_PackedWidget->m_HistogramsGroup->w(),m_PackedWidget->m_HistogramsGroup->h());
}
-void
+void
PackedWidgetManager
::Show()
{
@@ -102,14 +102,14 @@ PackedWidgetManager
m_InternalZoomWidget->show();
}
-void
+void
PackedWidgetManager
::Hide()
{
m_PackedWidget->m_Window->hide();
}
-void
+void
PackedWidgetManager
::Refresh()
{
@@ -120,7 +120,7 @@ PackedWidgetManager
m_InternalCurveWidget->redraw();
}
-void
+void
PackedWidgetManager
::UnRegisterAll()
{
@@ -131,7 +131,7 @@ PackedWidgetManager
m_PackedWidget->m_HistogramsGroup->remove(m_InternalCurveWidget);
}
-void
+void
PackedWidgetManager
::SetLabel(const char * label)
{
diff --git a/Code/Visualization/otbPixelDescriptionModel.txx b/Code/Visualization/otbPixelDescriptionModel.txx
index ab412a67fe66300806df8796881db8da67cbce09..683dd95ad7b901b52829e737eeb2333be42e333e 100644
--- a/Code/Visualization/otbPixelDescriptionModel.txx
+++ b/Code/Visualization/otbPixelDescriptionModel.txx
@@ -69,7 +69,7 @@ PixelDescriptionModel<TOutputImage>
}
template <class TOutputImage>
-void
+void
PixelDescriptionModel<TOutputImage>
::PrintSelf(std::ostream& os, itk::Indent indent) const
{
@@ -77,7 +77,7 @@ PixelDescriptionModel<TOutputImage>
}
template <class TOutputImage>
-void
+void
PixelDescriptionModel<TOutputImage>
::NotifyListener(ListenerType * listener)
{
@@ -86,4 +86,4 @@ PixelDescriptionModel<TOutputImage>
} // end namespace otb
-#endif
+#endif
diff --git a/Code/Visualization/otbRenderingFunction.h b/Code/Visualization/otbRenderingFunction.h
index c49d1dcd9d45e010b5cccf05bcfea466bf99208c..f5b634d57002d755c26f74fbd130572f630587e9 100644
--- a/Code/Visualization/otbRenderingFunction.h
+++ b/Code/Visualization/otbRenderingFunction.h
@@ -156,7 +156,7 @@ public:
// REVIEW: I agree, we should not be calling intialize ourselve, it
// would better be seamless
virtual void Initialize(){};//FIXME should disappear and be
- //automatic (IsModified())
+ //automatic (IsModified())
protected:
diff --git a/Code/Visualization/otbSplittedWidgetManager.cxx b/Code/Visualization/otbSplittedWidgetManager.cxx
index e47b6b501ae37be40fd212798097e970a6ee4e85..8e0438fa1389801ed9061ffd999e79cddf0f5101 100644
--- a/Code/Visualization/otbSplittedWidgetManager.cxx
+++ b/Code/Visualization/otbSplittedWidgetManager.cxx
@@ -21,19 +21,19 @@ namespace otb
{
SplittedWidgetManager
-::SplittedWidgetManager()
+::SplittedWidgetManager()
{
m_SplittedWidget = new ImageWidgetSplittedManagerType();
}
SplittedWidgetManager
-::~SplittedWidgetManager()
+::~SplittedWidgetManager()
{
delete m_SplittedWidget;
}
-void
+void
SplittedWidgetManager
::RegisterFullWidget(WidgetType* fullWidget)
{
@@ -44,9 +44,9 @@ SplittedWidgetManager
}
-void
+void
SplittedWidgetManager
-::RegisterScrollWidget(WidgetType* scrollWidget)
+::RegisterScrollWidget(WidgetType* scrollWidget)
{
m_InternalScrollWidget = scrollWidget;
m_SplittedWidget->m_QuicklookGroup->add(scrollWidget);
@@ -55,7 +55,7 @@ SplittedWidgetManager
}
-void
+void
SplittedWidgetManager
::RegisterZoomWidget(WidgetType* zoomWidget)
{
@@ -64,7 +64,7 @@ SplittedWidgetManager
m_SplittedWidget->m_ZoomGroup->resizable(zoomWidget);
zoomWidget->resize(0,0,m_SplittedWidget->m_ZoomGroup->w(),m_SplittedWidget->m_ZoomGroup->h());
}
-void
+void
SplittedWidgetManager
::RegisterPixelDescriptionWidget(Fl_Output * pixelWidget)
{
@@ -75,7 +75,7 @@ SplittedWidgetManager
}
-void
+void
SplittedWidgetManager
::RegisterHistogramWidget(WidgetType* curveWidget)
{
@@ -85,7 +85,7 @@ SplittedWidgetManager
curveWidget->resize(0,0,m_SplittedWidget->m_HistogramsGroup->w(),m_SplittedWidget->m_HistogramsGroup->h());
}
-void
+void
SplittedWidgetManager
::Show()
{
@@ -102,7 +102,7 @@ SplittedWidgetManager
m_InternalZoomWidget->show();
}
-void
+void
SplittedWidgetManager
::Hide()
{
@@ -113,7 +113,7 @@ SplittedWidgetManager
m_SplittedWidget->m_HistogramsGroup->hide();
}
-void
+void
SplittedWidgetManager
::Refresh()
{
@@ -124,7 +124,7 @@ SplittedWidgetManager
m_InternalCurveWidget->redraw();
}
-void
+void
SplittedWidgetManager
::SetLabel(const char * label)
{
@@ -154,7 +154,7 @@ SplittedWidgetManager
m_SplittedWidget->m_HistogramsGroup->copy_label(oss5.str().c_str());
}
-void
+void
SplittedWidgetManager
::UnRegisterAll()
{
diff --git a/Code/Visualization/otbStandardRenderingFunction.h b/Code/Visualization/otbStandardRenderingFunction.h
index c196109b38c5f961e0247e1db8e167826b8d11fd..f4a73e608866eacc84b7b7e6fb72edcaa91ae2b4 100644
--- a/Code/Visualization/otbStandardRenderingFunction.h
+++ b/Code/Visualization/otbStandardRenderingFunction.h
@@ -202,8 +202,8 @@ public:
if (this->GetHistogramList().IsNull())
{
this->RenderHistogram();
- // itkExceptionMacro( << "To Compute min/max automatically, Histogram should be "
- // <<"provided to the rendering function with SetHistogramList()" );
+ // itkExceptionMacro( << "To Compute min/max automatically, Histogram should be "
+ // <<"provided to the rendering function with SetHistogramList()" );
}
for(unsigned int comp = 0; comp < nbComps;++comp)
{
@@ -321,9 +321,9 @@ public:
// Edit the parameters as [minBand0, maxBand0, minBand1, maxBand1,...]
for(unsigned int i = 0; i< nbBands ; i++)
{
- // Min Band
+ // Min Band
param.SetElement(2*i,/*TransferedMinimum*/m_Minimum[i]);
- // Max Band
+ // Max Band
param.SetElement(2*i+1,/*TransferedMaximum*/m_Maximum[i]);
}
return param;
@@ -357,8 +357,8 @@ public:
/** Set/Get the AutoMinMax mode */
virtual void SetAutoMinMax(bool val)
{
- m_AutoMinMax = val;
- this->Modified();
+ m_AutoMinMax = val;
+ this->Modified();
}
itkGetMacro(AutoMinMax,bool);
itkBooleanMacro(AutoMinMax);
diff --git a/Code/Visualization/otbVectorDataGlComponent.txx b/Code/Visualization/otbVectorDataGlComponent.txx
index 99a6b60da410fb236e64c41e9cccc258ea9a886b..3e0f2c62c800b1ab10fbda1fc7dc64f4311d4725 100644
--- a/Code/Visualization/otbVectorDataGlComponent.txx
+++ b/Code/Visualization/otbVectorDataGlComponent.txx
@@ -26,7 +26,7 @@
namespace otb
{
-template <class TVectorData>
+template <class TVectorData>
VectorDataGlComponent<TVectorData>
::VectorDataGlComponent() : m_VectorData(),m_Spacing(), m_Origin(), m_GluTesselator(),
m_Color(), m_LineWidth(1.5),m_CrossWidth(10),m_RenderPolygonBoundariesOnly(false)
@@ -51,16 +51,16 @@ VectorDataGlComponent<TVectorData>
gluTessCallback(m_GluTesselator,GLU_TESS_COMBINE,(FunctionPointerType) TesselationCombineCallback);
}
-template <class TVectorData>
+template <class TVectorData>
VectorDataGlComponent<TVectorData>
-::~VectorDataGlComponent()
+::~VectorDataGlComponent()
{
// Delete the tesselator
gluDeleteTess(m_GluTesselator);
}
-template <class TVectorData>
-void
+template <class TVectorData>
+void
VectorDataGlComponent<TVectorData>
::Render(const RegionType& extent,const AffineTransformType * space2ScreenTransform)
{
@@ -103,8 +103,8 @@ VectorDataGlComponent<TVectorData>
glDisable(GL_BLEND);
glLineWidth(previousWidth);
}
- template <class TVectorData>
-void
+ template <class TVectorData>
+void
VectorDataGlComponent<TVectorData>
::RenderPoint(DataNodePointerType dataNode, const RegionType & /*extent*/, const AffineTransformType * transform)
{
@@ -127,8 +127,8 @@ VectorDataGlComponent<TVectorData>
glEnd();
}
-template <class TVectorData>
-void
+template <class TVectorData>
+void
VectorDataGlComponent<TVectorData>
::RenderLine(DataNodePointerType dataNode, const RegionType & /*extent*/, const AffineTransformType * transform)
{
@@ -157,8 +157,8 @@ VectorDataGlComponent<TVectorData>
glEnd();
}
-template <class TVectorData>
-void
+template <class TVectorData>
+void
VectorDataGlComponent<TVectorData>
::RenderPolygon(DataNodePointerType dataNode, const RegionType & /*extent*/, const AffineTransformType * transform)
{
@@ -179,7 +179,7 @@ VectorDataGlComponent<TVectorData>
typename PolygonType::VertexListType::ConstIterator vIt = extRing->GetVertexList()->Begin();
while(vIt!= extRing->GetVertexList()->End())
- {
+ {
// Take into account pixel spacing and origin
PointType spacePoint = vIt.Value();
spacePoint[0]*= m_Spacing[0];
@@ -218,7 +218,7 @@ VectorDataGlComponent<TVectorData>
// Render each of its vertex
while(vIt!= pIt.Get()->GetVertexList()->End())
- {
+ {
// Take into account pixel spacing and origin
PointType spacePoint = vIt.Value();
spacePoint[0]*= m_Spacing[0];
@@ -257,8 +257,8 @@ VectorDataGlComponent<TVectorData>
}
}
-template <class TVectorData>
-void
+template <class TVectorData>
+void
VectorDataGlComponent<TVectorData>
::Render(InternalTreeNodeType * node, const RegionType & extent, const AffineTransformType * space2ScreenTransform)
{
diff --git a/Code/Visualization/otbVerticalAsymptoteCurve.cxx b/Code/Visualization/otbVerticalAsymptoteCurve.cxx
index f711016c06405fc651aaccd83b7f70f498bb9246..70d650a11a682b426d82b0be59de79d953c2a82a 100644
--- a/Code/Visualization/otbVerticalAsymptoteCurve.cxx
+++ b/Code/Visualization/otbVerticalAsymptoteCurve.cxx
@@ -23,7 +23,7 @@
namespace otb
{
-VerticalAsymptoteCurve::VerticalAsymptoteCurve()
+VerticalAsymptoteCurve::VerticalAsymptoteCurve()
{
// Default histogram color
m_VerticalAsymptoteColor.Fill(0.5);
@@ -47,7 +47,7 @@ void VerticalAsymptoteCurve::Render(const RegionType& extent,const AffineTransf
glVertex2d(screenPoint[0],spacePoint[1]);
// LL
- spacePoint[1] = extent.GetIndex()[1]+ extent.GetSize()[1];
+ spacePoint[1] = extent.GetIndex()[1]+ extent.GetSize()[1];
screenPoint = space2ScreenTransform->TransformPoint(spacePoint);
glVertex2d(screenPoint[0],spacePoint[1]);
glEnd();
@@ -61,18 +61,18 @@ VerticalAsymptoteCurve::BeforeRendering()
m_Minimum[1] = 100;
m_Maximum[1] = -10;
- m_Maximum[0] = -10;
+ m_Maximum[0] = -10;
}
-VerticalAsymptoteCurve::PointType
+VerticalAsymptoteCurve::PointType
VerticalAsymptoteCurve
::GetMinimum()
{
return m_Minimum;
}
-VerticalAsymptoteCurve::PointType
+VerticalAsymptoteCurve::PointType
VerticalAsymptoteCurve
::GetMaximum()
{
diff --git a/Code/Visualization/otbVerticalAsymptoteCurve.h b/Code/Visualization/otbVerticalAsymptoteCurve.h
index 9b1a138135c50a0dcdc937f6bb398b5c4b1c4ed4..2191993cd887bfed911c3f5a1547f786cc29f294 100644
--- a/Code/Visualization/otbVerticalAsymptoteCurve.h
+++ b/Code/Visualization/otbVerticalAsymptoteCurve.h
@@ -65,11 +65,11 @@ public:
/// Get the max for each axis from the data available
virtual PointType GetMaximum();
- /// Set/Get the Asymptote color
+ /// Set/Get the Asymptote color
itkSetMacro(VerticalAsymptoteColor,ColorType);
itkGetMacro(VerticalAsymptoteColor,ColorType);
- /// Set the abcisse
+ /// Set the abcisse
itkSetMacro(Abcisse,double);
itkGetMacro(Abcisse,double);
diff --git a/Examples/FeatureExtraction/EdgeDensityExample.cxx b/Examples/FeatureExtraction/EdgeDensityExample.cxx
index c7f3a91f7688e565a83fcb9a267524b6b919d6fd..6a14440e9232186312322c4a8bb51ea5faa7b34b 100644
--- a/Examples/FeatureExtraction/EdgeDensityExample.cxx
+++ b/Examples/FeatureExtraction/EdgeDensityExample.cxx
@@ -30,7 +30,7 @@ PURPOSE. See the above copyright notices for more information.
// Software Guide : BeginLatex
//
// This example illustrates the use of the
-// \doxygen{otb}{EdgeDensityImageFilter}.
+// \doxygen{otb}{EdgeDensityImageFilter}.
// This filter computes a local density of edges on an image and can
// be useful to detect man made objects or urban areas, for
// instance. The filter has been implemented in a generic way, so that
@@ -156,10 +156,10 @@ int main(int argc, char* argv[] )
// Software Guide : EndLatex
// Software Guide : BeginCodeSnippet
- cannyFilter->SetUpperThreshold(upperThreshold);
+ cannyFilter->SetUpperThreshold(upperThreshold);
cannyFilter->SetLowerThreshold(lowerThreshold);
- cannyFilter->SetVariance(variance);
- cannyFilter->SetMaximumError(maximumError);
+ cannyFilter->SetVariance(variance);
+ cannyFilter->SetMaximumError(maximumError);
// Software Guide : EndCodeSnippet
// Software Guide : BeginLatex
diff --git a/Examples/FeatureExtraction/InnerProductPCAExample.cxx b/Examples/FeatureExtraction/InnerProductPCAExample.cxx
index 602692b72957487094f46db64e3d77f120ce35f8..8b6357b2519636f5154c197d4b2152cff93a8af9 100644
--- a/Examples/FeatureExtraction/InnerProductPCAExample.cxx
+++ b/Examples/FeatureExtraction/InnerProductPCAExample.cxx
@@ -31,7 +31,7 @@
// Software Guide : BeginLatex
//
// This example illustrates the use of the
-// \doxygen{otb}{InnerProductPCAImageFilter}.
+// \doxygen{otb}{InnerProductPCAImageFilter}.
// This filter computes a Principal Component Analysis using an
// efficient method based on the inner product in order to compute the
// covariance matrix.
@@ -143,7 +143,7 @@ int main( int argc, char* argv[] )
// \includegraphics[width=0.25\textwidth]{PrettyInnerProductPCAOutput3.eps}
// \itkcaption[Inner Product PCA Filter]{Result of applying the
// \doxygen{otb}{InnerProductPCAImageFilter} to an image. From left
- // to right and top to bottom:
+ // to right and top to bottom:
// original image, first PC, second PC, third PC.}
// \label{fig:INNERPRODUCTPCA_FILTER}
// \end{figure}
diff --git a/Examples/FeatureExtraction/LineSegmentDetectorExample.cxx b/Examples/FeatureExtraction/LineSegmentDetectorExample.cxx
index 695b31e4edd77c008d534e0839b83aab1e77bd44..3a85f9e3177f9c47eeda1b4e5953afb5a6e873d1 100644
--- a/Examples/FeatureExtraction/LineSegmentDetectorExample.cxx
+++ b/Examples/FeatureExtraction/LineSegmentDetectorExample.cxx
@@ -59,21 +59,21 @@ int main( int argc, char * argv[] )
//
// Software Guide : EndLatex
-// Software Guide : BeginCodeSnippet
+// Software Guide : BeginCodeSnippet
typedef otb::Image< InputPixelType, Dimension > ImageType;
typedef otb::ImageFileReader<ImageType> ReaderType;
-// Software Guide : EndCodeSnippet
+// Software Guide : EndCodeSnippet
// Software Guide : BeginLatex
//
// We instantiate the reader and set the file name for the input image.
//
// Software Guide : EndLatex
-// Software Guide : BeginCodeSnippet
+// Software Guide : BeginCodeSnippet
ReaderType::Pointer reader = ReaderType::New();
reader->SetFileName(infname);
-// Software Guide : EndCodeSnippet
+// Software Guide : EndCodeSnippet
// Software Guide : BeginLatex
//
// We define now the type for the segment detector filter. It is
@@ -84,7 +84,7 @@ int main( int argc, char * argv[] )
//
// Software Guide : EndLatex
-// Software Guide : BeginCodeSnippet
+// Software Guide : BeginCodeSnippet
typedef otb::LineSegmentDetector<ImageType,
PrecisionType> LsdFilterType;
@@ -93,7 +93,7 @@ int main( int argc, char * argv[] )
LsdFilterType::Pointer lsdFilter = LsdFilterType::New();
- // Software Guide : EndCodeSnippet
+ // Software Guide : EndCodeSnippet
// Software Guide : BeginLatex
//
// In order to be able to display the results, we will draw the
@@ -103,7 +103,7 @@ int main( int argc, char * argv[] )
//
// Software Guide : EndLatex
-// Software Guide : BeginCodeSnippet
+// Software Guide : BeginCodeSnippet
typedef otb::DrawLineSpatialObjectListFilter< ImageType,
@@ -111,7 +111,7 @@ int main( int argc, char * argv[] )
DrawLineListType::Pointer drawLineFilter = DrawLineListType::New();
- // Software Guide : EndCodeSnippet
+ // Software Guide : EndCodeSnippet
// Software Guide : BeginLatex
//
// We can now define the type for the writer, instantiate it and set
@@ -119,20 +119,20 @@ int main( int argc, char * argv[] )
//
// Software Guide : EndLatex
-// Software Guide : BeginCodeSnippet
+// Software Guide : BeginCodeSnippet
typedef otb::ImageFileWriter<ImageType> WriterType;
WriterType::Pointer writer = WriterType::New();
writer->SetFileName(outfname);
- // Software Guide : EndCodeSnippet
+ // Software Guide : EndCodeSnippet
// Software Guide : BeginLatex
//
// We plug the pipeline.
//
// Software Guide : EndLatex
-// Software Guide : BeginCodeSnippet
+// Software Guide : BeginCodeSnippet
lsdFilter->SetInput(reader->GetOutput());
writer->SetInput(drawLineFilter->GetOutput());
@@ -140,7 +140,7 @@ int main( int argc, char * argv[] )
drawLineFilter->SetInput(reader->GetOutput());
drawLineFilter->SetInputLineSpatialObjectList(lsdFilter->GetOutput());
- // Software Guide : EndCodeSnippet
+ // Software Guide : EndCodeSnippet
// Software Guide : BeginLatex
//
// Before calling the \code{Update()} method of the writer in order to
@@ -150,12 +150,12 @@ int main( int argc, char * argv[] )
//
// Software Guide : EndLatex
-// Software Guide : BeginCodeSnippet
+// Software Guide : BeginCodeSnippet
reader->GenerateOutputInformation();
writer->Update();
- // Software Guide : EndCodeSnippet
+ // Software Guide : EndCodeSnippet
// Software Guide : BeginLatex
// Figure~\ref{fig:LSD} shows the result of applying the line segment
diff --git a/Examples/FeatureExtraction/PanTexExample.cxx b/Examples/FeatureExtraction/PanTexExample.cxx
index 7dc147edeab153418ed8fdd282a063dc8ce7d9be..bf54f141d074c33ce4ae00da10e8cd06db9b4f2e 100644
--- a/Examples/FeatureExtraction/PanTexExample.cxx
+++ b/Examples/FeatureExtraction/PanTexExample.cxx
@@ -41,7 +41,7 @@
// This example illustrates the use of the
// \doxygen{otb}{PanTexTextureImageFilter}. This texture parameter was
// first introduced in \cite{PanTex} and is very useful for urban area
-// detection.
+// detection.
// \relatedClasses
// \begin{itemize}
// \item \doxygen{otb}{ContrastTextureFunctor}
@@ -113,7 +113,7 @@ int main(int argc, char * argv[])
// the \code{Update} method of the writer.
//
// Software Guide : EndLatex
- // Software Guide : BeginCodeSnippet
+ // Software Guide : BeginCodeSnippet
textureFilter->SetInput(reader->GetOutput());
writer->SetInput(textureFilter->GetOutput());
diff --git a/Examples/FeatureExtraction/RightAngleDetectionExample.cxx b/Examples/FeatureExtraction/RightAngleDetectionExample.cxx
index 8c07359a40d0219253a452b8873cef11b1a026a5..f1c5a91f06b0f5040a8dd7d501a20a6a1e27d92d 100644
--- a/Examples/FeatureExtraction/RightAngleDetectionExample.cxx
+++ b/Examples/FeatureExtraction/RightAngleDetectionExample.cxx
@@ -39,12 +39,12 @@ PURPOSE. See the above copyright notices for more information.
// Software Guide : BeginLatex
//
// This example illustrates the use of the
-// \doxygen{otb}{LineSpatialObjectListToRightAnglePointSetFilter}.
+// \doxygen{otb}{LineSpatialObjectListToRightAnglePointSetFilter}.
// This filter detects the right angles in an image by exploiting the
// output of a line detection algorithm. Typically the
// \doxygen{otb}{LineSegmentDetector} class will be used. The right
// angle detection algorithm is described in detail in
-// \cite{RightAngleDetection}.
+// \cite{RightAngleDetection}.
//
// The first step required to use this filter is to include its header file.
//
@@ -56,7 +56,7 @@ PURPOSE. See the above copyright notices for more information.
int main( int argc, char * argv[] )
{
- const char * infname = argv[1];
+ const char * infname = argv[1];
const char * outfname = argv[2];
const char * inprettyfname = argv[3];
const char * outprettyfname = argv[4];
@@ -97,7 +97,7 @@ int main( int argc, char * argv[] )
//
// Software Guide : EndLatex
- // Software Guide : BeginCodeSnippet
+ // Software Guide : BeginCodeSnippet
typedef LinesListType::LineType LineType;
typedef std::vector<LineType*> LineVectorType;
// Software Guide : EndCodeSnippet
@@ -108,7 +108,7 @@ int main( int argc, char * argv[] )
//
// Software Guide : EndLatex
- // Software Guide : BeginCodeSnippet
+ // Software Guide : BeginCodeSnippet
typedef itk::PointSet<LineVectorType, Dimension> PointSetType;
// Software Guide : EndCodeSnippet
// Software Guide : BeginLatex
@@ -118,7 +118,7 @@ int main( int argc, char * argv[] )
//
// Software Guide : EndLatex
- // Software Guide : BeginCodeSnippet
+ // Software Guide : BeginCodeSnippet
typedef otb::LineSegmentDetector<ImageType , PixelType> LsdFilterType;
// Software Guide : EndCodeSnippet
@@ -133,7 +133,7 @@ int main( int argc, char * argv[] )
typedef itk::MinimumMaximumImageCalculator<ImageType> MinMaxFilterType;
- // Software Guide : BeginCodeSnippet
+ // Software Guide : BeginCodeSnippet
typedef otb::LineSpatialObjectListToRightAnglePointSetFilter<ImageType,
LinesListType, PointSetType>
RightAngleFilterType;
@@ -145,7 +145,7 @@ int main( int argc, char * argv[] )
//
// Software Guide : EndLatex
- // Software Guide : BeginCodeSnippet
+ // Software Guide : BeginCodeSnippet
LsdFilterType::Pointer lsdFilter = LsdFilterType::New();
RightAngleFilterType::Pointer rightAngleFilter = RightAngleFilterType::New();
@@ -160,21 +160,21 @@ int main( int argc, char * argv[] )
//
// Software Guide : EndLatex
- // Software Guide : BeginCodeSnippet
+ // Software Guide : BeginCodeSnippet
- lsdFilter->SetInput(reader->GetOutput());
+ lsdFilter->SetInput(reader->GetOutput());
rightAngleFilter->SetInputImage(reader->GetOutput());
rightAngleFilter->SetInput(lsdFilter->GetOutput());
// Software Guide : EndCodeSnippet
// Software Guide : BeginLatex
//
- // You can choose how far the right angle segments can be, and the tolerance
+ // You can choose how far the right angle segments can be, and the tolerance
// to consider an angle between two segments as an right one.
//
//
// Software Guide : EndLatex
- // Software Guide : BeginCodeSnippet
+ // Software Guide : BeginCodeSnippet
rightAngleFilter->SetThresholdAngle(angleThreshold);
rightAngleFilter->SetThresholdDistance(distanceThreshold);
@@ -188,8 +188,8 @@ int main( int argc, char * argv[] )
//
// Software Guide : EndLatex
- // Software Guide : BeginCodeSnippet
- PointSetType::Pointer segmentOrtho = PointSetType::New();
+ // Software Guide : BeginCodeSnippet
+ PointSetType::Pointer segmentOrtho = PointSetType::New();
segmentOrtho = rightAngleFilter->GetOutput();
// Software Guide : EndCodeSnippet
// Software Guide : BeginLatex
@@ -200,7 +200,7 @@ int main( int argc, char * argv[] )
//
// Software Guide : EndLatex
- // Software Guide : BeginCodeSnippet
+ // Software Guide : BeginCodeSnippet
PointSetType::PointType pRight;
LineVectorType outputVectorLines;
LinesListType::Pointer outputLinesList = LinesListType::New();
@@ -215,7 +215,7 @@ int main( int argc, char * argv[] )
//
// Software Guide : EndLatex
- // Software Guide : BeginCodeSnippet
+ // Software Guide : BeginCodeSnippet
segmentOrtho->GetPoint(i, &pRight);
// Software Guide : EndCodeSnippet
// Software Guide : BeginLatex
@@ -226,7 +226,7 @@ int main( int argc, char * argv[] )
//
// Software Guide : EndLatex
- // Software Guide : BeginCodeSnippet
+ // Software Guide : BeginCodeSnippet
segmentOrtho->GetPointData(i, &outputVectorLines);
outputLinesList->push_back(outputVectorLines[0]);
outputLinesList->push_back(outputVectorLines[1]);
@@ -243,7 +243,7 @@ int main( int argc, char * argv[] )
// The value assigned to the line is the maximum of the input image.
// Software Guide : EndLatex
- // Software Guide : BeginCodeSnippet
+ // Software Guide : BeginCodeSnippet
typedef otb::DrawLineSpatialObjectListFilter< ImageType,
ImageType > DrawLineListType;
DrawLineListType::Pointer drawLineFilter = DrawLineListType::New();
diff --git a/Examples/FeatureExtraction/SFSExample.cxx b/Examples/FeatureExtraction/SFSExample.cxx
index 0b7ed1d58e49b3c3d8262c2e2935ef16c02f2924..70256ff9b2a939ce56fe1c66ae7a6fc541bc4630 100644
--- a/Examples/FeatureExtraction/SFSExample.cxx
+++ b/Examples/FeatureExtraction/SFSExample.cxx
@@ -31,7 +31,7 @@
// Software Guide : BeginLatex
//
// This example illustrates the use of the
-// \doxygen{otb}{SFSTexturesImageFilter}.
+// \doxygen{otb}{SFSTexturesImageFilter}.
// This filter computes the Structural Feature Set as descibed in
// \cite{SFS}. These features are textural parameters which give
// information about the structure of lines passing through each pixel
@@ -67,7 +67,7 @@ int main(int argc, char * argv[])
unsigned int spatialThresh = atoi(argv[15]);
unsigned int dirNb = atoi(argv[16]);
unsigned int maxConsideration = atoi(argv[17]);
- double alpha = atof(argv[18]);
+ double alpha = atof(argv[18]);
// Software Guide : BeginLatex
//
@@ -76,11 +76,11 @@ int main(int argc, char * argv[])
//
// Software Guide : EndLatex
-// Software Guide : BeginCodeSnippet
+// Software Guide : BeginCodeSnippet
typedef otb::Image<PixelType,Dimension> ImageType;
typedef otb::ImageFileReader<ImageType> ReaderType;
typedef otb::ImageFileWriter<ImageType> WriterType;
-// Software Guide : EndCodeSnippet
+// Software Guide : EndCodeSnippet
// Software Guide : BeginLatex
//
// The we can instantiate the type for the SFS filter, which is
@@ -88,9 +88,9 @@ int main(int argc, char * argv[])
//
// Software Guide : EndLatex
-// Software Guide : BeginCodeSnippet
+// Software Guide : BeginCodeSnippet
typedef otb::SFSTexturesImageFilter<ImageType, ImageType> SFSFilterType;
-// Software Guide : EndCodeSnippet
+// Software Guide : EndCodeSnippet
// Software Guide : BeginLatex
//
// After that, we can instantiate the filter. We will also instantiate
@@ -99,8 +99,8 @@ int main(int argc, char * argv[])
//
// Software Guide : EndLatex
-// Software Guide : BeginCodeSnippet
- SFSFilterType::Pointer filter = SFSFilterType::New();
+// Software Guide : BeginCodeSnippet
+ SFSFilterType::Pointer filter = SFSFilterType::New();
ReaderType::Pointer reader = ReaderType::New();
WriterType::Pointer writerLength = WriterType::New();
WriterType::Pointer writerWidth = WriterType::New();
@@ -108,7 +108,7 @@ int main(int argc, char * argv[])
WriterType::Pointer writerRatio = WriterType::New();
WriterType::Pointer writerSD = WriterType::New();
WriterType::Pointer writerPsi = WriterType::New();
-// Software Guide : EndCodeSnippet
+// Software Guide : EndCodeSnippet
reader->SetFileName(inName);
@@ -130,13 +130,13 @@ int main(int argc, char * argv[])
//
// Software Guide : EndLatex
-// Software Guide : BeginCodeSnippet
+// Software Guide : BeginCodeSnippet
filter->SetSpectralThreshold(spectThresh);
filter->SetSpatialThreshold(spatialThresh);
filter->SetNumberOfDirections(dirNb);
filter->SetRatioMaxConsiderationNumber(maxConsideration);
filter->SetAlpha(alpha);
- // Software Guide : EndCodeSnippet
+ // Software Guide : EndCodeSnippet
// Software Guide : BeginLatex
//
// In order to disable the computation of a feature, the
@@ -147,17 +147,17 @@ int main(int argc, char * argv[])
//
// Software Guide : EndLatex
-// Software Guide : BeginCodeSnippet
+// Software Guide : BeginCodeSnippet
filter->SetFeatureStatus(SFSFilterType::PSI, true);
- // Software Guide : EndCodeSnippet
+ // Software Guide : EndCodeSnippet
// Software Guide : BeginLatex
//
// Now, we plug the pipeline using all the writers.
//
// Software Guide : EndLatex
-// Software Guide : BeginCodeSnippet
+// Software Guide : BeginCodeSnippet
filter->SetInput( reader->GetOutput() );
diff --git a/Examples/FeatureExtraction/SIFTDensityExample.cxx b/Examples/FeatureExtraction/SIFTDensityExample.cxx
index 345f209965448aa577362424aa9e2aa186b05038..62222e20e22b16a7f06e0e47169afa5921fe740a 100644
--- a/Examples/FeatureExtraction/SIFTDensityExample.cxx
+++ b/Examples/FeatureExtraction/SIFTDensityExample.cxx
@@ -32,7 +32,7 @@ PURPOSE. See the above copyright notices for more information.
// Software Guide : BeginLatex
//
// This example illustrates the use of the
-// \doxygen{otb}{KeyPointDensityImageFilter}.
+// \doxygen{otb}{KeyPointDensityImageFilter}.
// This filter computes a local density of keypoints (SIFT or SURF,
// for instance) on an image and can
// be useful to detect man made objects or urban areas, for
@@ -179,7 +179,7 @@ int main(int argc, char* argv[] )
// the writer, but before that we run the
// \code{GenerateOutputInformation()} on the reader so the filter
// gets the information about the image size (needed for the SIFT
- // computation).
+ // computation).
//
// Software Guide : EndLatex
@@ -201,7 +201,7 @@ int main(int argc, char* argv[] )
// \includegraphics[width=0.25\textwidth]{PrettySIFTDensityOutput.eps}
// \itkcaption[SIFT Density Filter]{Result of applying the
// \doxygen{otb}{KeypointDensityImageFilter} to an image. From left
- // to right :
+ // to right :
// original image, SIF density.}
// \label{fig:SIFTDENSITY_FILTER}
// \end{figure}
diff --git a/Examples/FeatureExtraction/TextureExample.cxx b/Examples/FeatureExtraction/TextureExample.cxx
index 1146b2f90432dbc6fd03ad391e3fdc471d8357bc..dba124182ea5f1daacf0390b89fc10958a65d0b0 100644
--- a/Examples/FeatureExtraction/TextureExample.cxx
+++ b/Examples/FeatureExtraction/TextureExample.cxx
@@ -41,7 +41,7 @@
//
// This example illustrates the use of the
// \doxygen{otb}{ContrastTextureFunctor}, and more generally it
-// demonstrates how to compute Haralick's textural features.
+// demonstrates how to compute Haralick's textural features.
// \relatedClasses
// \begin{itemize}
// \item \doxygen{otb}{EnergyTextureFunctor}
@@ -189,10 +189,10 @@ int main(int argc, char * argv[])
// any case.
//
// The offset is always an array of N values, where N is the number of
-// dimensions of the image.
+// dimensions of the image.
//
// Software Guide : EndLatex
- // Software Guide : BeginCodeSnippet
+ // Software Guide : BeginCodeSnippet
textureFilter->SetRadius(radius);
typedef ImageType::OffsetType OffsetType;
@@ -209,7 +209,7 @@ int main(int argc, char * argv[])
// the \code{Update} method of the writer.
//
// Software Guide : EndLatex
- // Software Guide : BeginCodeSnippet
+ // Software Guide : BeginCodeSnippet
textureFilter->SetInput(reader->GetOutput());
writer->SetInput(textureFilter->GetOutput());
diff --git a/Examples/OBIA/KeepNObjects.cxx b/Examples/OBIA/KeepNObjects.cxx
index a042dafbac9470e486457dcc3e044eaa55012d8d..c4cdd82790a5680e1d0dc2d25149735f6eddfda6 100644
--- a/Examples/OBIA/KeepNObjects.cxx
+++ b/Examples/OBIA/KeepNObjects.cxx
@@ -24,7 +24,7 @@
// Software Guide : BeginLatex
//
-// This example shows the
+// This example shows the
//
// Software Guide : EndLatex
diff --git a/Examples/OBIA/ShapeAttributeComputation.cxx b/Examples/OBIA/ShapeAttributeComputation.cxx
index bbb94d9763334e18e93d2016e3db26d2b1d76a85..240762ebb33b5aade9e28adaaf1190be91fe7f77 100644
--- a/Examples/OBIA/ShapeAttributeComputation.cxx
+++ b/Examples/OBIA/ShapeAttributeComputation.cxx
@@ -24,7 +24,7 @@
// Software Guide : BeginLatex
//
-// This example shows the
+// This example shows the
//
// Software Guide : EndLatex
diff --git a/Examples/Radiometry/ARVIMultiChannelRAndBAndNIRVegetationIndexImageFilter.cxx b/Examples/Radiometry/ARVIMultiChannelRAndBAndNIRVegetationIndexImageFilter.cxx
index c89121cf732316dab448cb52a2b479e39a8008c8..7e8419ff5448833622e18d69ecca9f5019f2cd20 100644
--- a/Examples/Radiometry/ARVIMultiChannelRAndBAndNIRVegetationIndexImageFilter.cxx
+++ b/Examples/Radiometry/ARVIMultiChannelRAndBAndNIRVegetationIndexImageFilter.cxx
@@ -138,7 +138,7 @@ int main( int argc, char *argv[] )
//
// The ARVI (Atmospherically Resistant Vegetation Index) is
// instantiated using the image pixel types as template parameters.
- // Note that we also can use other functors which operate with the
+ // Note that we also can use other functors which operate with the
// Red, Blue and Nir channels such as EVI, ARVI and TSARVI.
//
// Software Guide : EndLatex
diff --git a/Examples/Radiometry/AVIMultiChannelRAndGAndNIRVegetationIndexImageFilter.cxx b/Examples/Radiometry/AVIMultiChannelRAndGAndNIRVegetationIndexImageFilter.cxx
index a32c5b451acba6e526d273730844628cb523d154..c70541443c47e5e2f4e504338cc97b276ee8f940 100644
--- a/Examples/Radiometry/AVIMultiChannelRAndGAndNIRVegetationIndexImageFilter.cxx
+++ b/Examples/Radiometry/AVIMultiChannelRAndGAndNIRVegetationIndexImageFilter.cxx
@@ -43,7 +43,7 @@
// The following example illustrates the use of the
// otb::MultiChannelRAndGAndNIR VegetationIndexImageFilter with the
// use of the Angular Vegetation Index (AVI).
-// The equation for the Angular Vegetation Index involves the gren, red
+// The equation for the Angular Vegetation Index involves the gren, red
// and near infra-red bands. $\lambda_1$, $\lambda_2$ and $\lambda_3$ are the mid-band
// wavelengths for the green, red and NIR bands and $\tan^{-1}$ is the arctangent function.
//
@@ -182,8 +182,8 @@ int main( int argc, char *argv[] )
//
// The $\lambda$ R,G and NIR parameters are set. The
// \doxygen{otb}{MultiChannelRAndGAndNIRIndexImageFilter}
- // class sets the default values of $\lambda$ to $660$, $560$ and
- // $830$.
+ // class sets the default values of $\lambda$ to $660$, $560$ and
+ // $830$.
//
// Software Guide : EndLatex
diff --git a/Testing/Code/BasicFilters/otbBasicFiltersTests1.cxx b/Testing/Code/BasicFilters/otbBasicFiltersTests1.cxx
index 18151ef1f2b2ccf5c7e9f9e35881551423424586..a771c78e31a4d9f5297a94f2b99e660f59162e41 100644
--- a/Testing/Code/BasicFilters/otbBasicFiltersTests1.cxx
+++ b/Testing/Code/BasicFilters/otbBasicFiltersTests1.cxx
@@ -22,7 +22,7 @@
#pragma warning ( disable : 4786 )
#endif
-//
+//
#include "otbTestMain.h"
void RegisterTests()
diff --git a/Testing/Code/BasicFilters/otbBinaryImageDensityFunction.cxx b/Testing/Code/BasicFilters/otbBinaryImageDensityFunction.cxx
index 1f6151742fc017c4a536711a5c3d6de885352256..8af7e64dd768dc79ffa5d715b62b452dc1a5d1f2 100644
--- a/Testing/Code/BasicFilters/otbBinaryImageDensityFunction.cxx
+++ b/Testing/Code/BasicFilters/otbBinaryImageDensityFunction.cxx
@@ -37,7 +37,7 @@ int otbBinaryImageDensityFunction(int argc, char* argv[] )
/**Instancitation ofa Smart Pointer*/
FunctionType::Pointer filter = FunctionType::New();
- ReaderType::Pointer reader = ReaderType::New();
+ ReaderType::Pointer reader = ReaderType::New();
std::ofstream outfile(outfname);
@@ -54,15 +54,15 @@ int otbBinaryImageDensityFunction(int argc, char* argv[] )
FunctionType::PointType pDst;
IndexType index;
- index[0] = 0;
+ index[0] = 0;
index[1] = 0;
outfile << "Density computed for the point : " << index << " is "<< filter->EvaluateAtIndex(index) << std::endl;
- index[0] = static_cast<unsigned int >(size[0]/2.);
+ index[0] = static_cast<unsigned int >(size[0]/2.);
index[1] = static_cast<unsigned int >(size[1]/4.);
outfile << "Density computed for the point : " << index << " is "<< filter->EvaluateAtIndex(index) << std::endl;
- pDst[0] = static_cast<unsigned int >(size[0]/2.);
+ pDst[0] = static_cast<unsigned int >(size[0]/2.);
pDst[1] = static_cast<unsigned int >(size[1]/4.);
outfile << "Density computed for the point : " << pDst<< " is "<< filter->Evaluate(pDst) << std::endl;
diff --git a/Testing/Code/BasicFilters/otbBinaryImageToDensityImageFilter.cxx b/Testing/Code/BasicFilters/otbBinaryImageToDensityImageFilter.cxx
index 9fffa44a399157a8d717cb4df428105720c8a8f1..df9a19d4fa4400bf12f45eaf818c68a8d31ddf49 100644
--- a/Testing/Code/BasicFilters/otbBinaryImageToDensityImageFilter.cxx
+++ b/Testing/Code/BasicFilters/otbBinaryImageToDensityImageFilter.cxx
@@ -43,7 +43,7 @@ int otbBinaryImageToDensityImageFilter(int argc , char* argv[] )
/** Instancitation of a Smart Pointer*/
FilterType::Pointer filter = FilterType::New();
- ReaderType::Pointer reader = ReaderType::New();
+ ReaderType::Pointer reader = ReaderType::New();
WriterType::Pointer writer = WriterType::New();
/** */
diff --git a/Testing/Code/BasicFilters/otbBoxAndWhiskerImageFilterNew.cxx b/Testing/Code/BasicFilters/otbBoxAndWhiskerImageFilterNew.cxx
index 9261211ec2ff636401a7f044147baeb4c449f34c..996c32820f41ca5555f2b4783447a9ce08eba9e7 100644
--- a/Testing/Code/BasicFilters/otbBoxAndWhiskerImageFilterNew.cxx
+++ b/Testing/Code/BasicFilters/otbBoxAndWhiskerImageFilterNew.cxx
@@ -31,7 +31,7 @@ int otbBoxAndWhiskerImageFilterNew ( int argc, char * argv[] )
typedef otb::VectorImage< PixelType, Dimension > ImageType;
typedef otb::BoxAndWhiskerImageFilter< ImageType > FilterType;
- FilterType::Pointer filter = FilterType::New();
+ FilterType::Pointer filter = FilterType::New();
return EXIT_SUCCESS;
}
diff --git a/Testing/Code/BasicFilters/otbEdgeDetectorImageFilter.cxx b/Testing/Code/BasicFilters/otbEdgeDetectorImageFilter.cxx
index ca1470d5e4ed47ffa39535c4ff16375bddf0b978..323a9abc56fea6a0158cecc0653a3c8a19916489 100644
--- a/Testing/Code/BasicFilters/otbEdgeDetectorImageFilter.cxx
+++ b/Testing/Code/BasicFilters/otbEdgeDetectorImageFilter.cxx
@@ -34,7 +34,7 @@ int otbEdgeDetectorImageFilter(int argc, char* argv[] )
/**Instancitation of an object*/
ReaderType::Pointer reader = ReaderType::New();
- WriterType::Pointer writer = WriterType::New();
+ WriterType::Pointer writer = WriterType::New();
DetectorType::Pointer detector = DetectorType::New();
SobelDetectionType::Pointer sobelFilter = SobelDetectionType::New();
diff --git a/Testing/Code/BasicFilters/otbEstimateInnerProductPCAImageFilterNew.cxx b/Testing/Code/BasicFilters/otbEstimateInnerProductPCAImageFilterNew.cxx
index efec2fb4ebef3b11b30a6ec77438a09ebc4925ce..7e31717f311aeca35f2c6922d4617c05320bb9fd 100644
--- a/Testing/Code/BasicFilters/otbEstimateInnerProductPCAImageFilterNew.cxx
+++ b/Testing/Code/BasicFilters/otbEstimateInnerProductPCAImageFilterNew.cxx
@@ -23,7 +23,7 @@ int otbEstimateInnerProductPCAImageFilterNew( int argc, char* argv[] )
typedef double PixelType;
const unsigned int Dimension = 2;
- // Typedef
+ // Typedef
typedef otb::VectorImage<PixelType,Dimension> ImageType;
typedef otb::EstimateInnerProductPCAImageFilter<ImageType,ImageType> FilterType;
diff --git a/Testing/Code/BasicFilters/otbFunctionWithNeighborhoodToImageFilter.cxx b/Testing/Code/BasicFilters/otbFunctionWithNeighborhoodToImageFilter.cxx
index 3c2f4f84c9e0ba34eb473abecaa7ded955b41e6d..d810dc310f202314d06c19e05d62dfe31f89dbcb 100644
--- a/Testing/Code/BasicFilters/otbFunctionWithNeighborhoodToImageFilter.cxx
+++ b/Testing/Code/BasicFilters/otbFunctionWithNeighborhoodToImageFilter.cxx
@@ -25,7 +25,7 @@
#include "otbTextureImageFunction.h"
template <class TScalarInput, class TScalarOutput>
-class ITK_EXPORT FunctorTest :
+class ITK_EXPORT FunctorTest :
public otb::Functor::TextureFunctorBase<TScalarInput, TScalarOutput>
{
public:
@@ -36,7 +36,7 @@ public:
virtual double ComputeOverSingleChannel(const NeighborhoodType &neigh, const NeighborhoodType &neighOff)
{
- double out = neigh.GetCenterValue();
+ double out = neigh.GetCenterValue();
return out;
}
diff --git a/Testing/Code/BasicFilters/otbFunctionWithNeighborhoodToImageFilterNew.cxx b/Testing/Code/BasicFilters/otbFunctionWithNeighborhoodToImageFilterNew.cxx
index c59bf4b968aa5e75a536ea725c9784b990435a71..36477ac787fcfd218baf621d1d6c1401d97526bd 100644
--- a/Testing/Code/BasicFilters/otbFunctionWithNeighborhoodToImageFilterNew.cxx
+++ b/Testing/Code/BasicFilters/otbFunctionWithNeighborhoodToImageFilterNew.cxx
@@ -41,7 +41,7 @@ public:
void SetOffset(OffsetType off){ m_Offset=off; };
inline TOutputScalarType operator()(const NeighborhoodType &neigh)
- {
+ {
return static_cast<TOutputScalarType>(neigh.GetCenterValue());
}
diff --git a/Testing/Code/BasicFilters/otbInnerProductPCAImageFilterNew.cxx b/Testing/Code/BasicFilters/otbInnerProductPCAImageFilterNew.cxx
index ff8aaf2a5c6f54771f49a413f378d9a14d9ea797..0d976b4815493e18b5653200f997ac8a850e986b 100644
--- a/Testing/Code/BasicFilters/otbInnerProductPCAImageFilterNew.cxx
+++ b/Testing/Code/BasicFilters/otbInnerProductPCAImageFilterNew.cxx
@@ -23,7 +23,7 @@ int otbInnerProductPCAImageFilterNew( int argc, char* argv[] )
typedef double PixelType;
const unsigned int Dimension = 2;
- // Typedef
+ // Typedef
typedef otb::VectorImage<PixelType,Dimension> ImageType;
typedef otb::InnerProductPCAImageFilter<ImageType,ImageType> FilterType;
diff --git a/Testing/Code/BasicFilters/otbMeanFunctorImageTest.cxx b/Testing/Code/BasicFilters/otbMeanFunctorImageTest.cxx
index dfa2f98219fc8bde8d3c90021f96d0f146bc73ce..4bed62290b44de99f673ba525971ca33687228a1 100644
--- a/Testing/Code/BasicFilters/otbMeanFunctorImageTest.cxx
+++ b/Testing/Code/BasicFilters/otbMeanFunctorImageTest.cxx
@@ -36,7 +36,7 @@ int otbMeanFunctorImageTest(int argc, char * argv[])
typedef otb::ImageFileReader<VectorImageType> ReaderType;
typedef otb::ImageFileWriter<ImageType> WriterType;
- typedef otb::Functor::MeanFunctor<VectorImageType::PixelType, ImageType::PixelType >
+ typedef otb::Functor::MeanFunctor<VectorImageType::PixelType, ImageType::PixelType >
MeanFunctorType;
typedef itk::UnaryFunctorImageFilter<VectorImageType, ImageType, MeanFunctorType> MeanFilterType;
diff --git a/Testing/Code/BasicFilters/otbNormalizeInnerProductPCAImageFilterNew.cxx b/Testing/Code/BasicFilters/otbNormalizeInnerProductPCAImageFilterNew.cxx
index ad891229d33e692837fc73e3cd1c044d9fe1858f..8ba7c877a7197ebb7068d5ea715ae48d9d0bdc9a 100644
--- a/Testing/Code/BasicFilters/otbNormalizeInnerProductPCAImageFilterNew.cxx
+++ b/Testing/Code/BasicFilters/otbNormalizeInnerProductPCAImageFilterNew.cxx
@@ -23,7 +23,7 @@ int otbNormalizeInnerProductPCAImageFilterNew( int argc, char* argv[] )
typedef double PixelType;
const unsigned int Dimension = 2;
- // Typedef
+ // Typedef
typedef otb::VectorImage<PixelType,Dimension> ImageType;
typedef otb::NormalizeInnerProductPCAImageFilter<ImageType,ImageType> FilterType;
diff --git a/Testing/Code/BasicFilters/otbPrintableImageFilterWithMask.cxx b/Testing/Code/BasicFilters/otbPrintableImageFilterWithMask.cxx
index 2d2e89af6c955fc10d771cf4c77acceb571faa0b..238041dc410e27430275137dce2b5bfa2b696c2f 100644
--- a/Testing/Code/BasicFilters/otbPrintableImageFilterWithMask.cxx
+++ b/Testing/Code/BasicFilters/otbPrintableImageFilterWithMask.cxx
@@ -39,21 +39,21 @@ int otbPrintableImageFilterWithMask( int argc, char * argv[] )
typedef otb::PrintableImageFilter< InputImageType> FilterType;
typedef FilterType::OutputImageType OutputImageType;
typedef OutputImageType::PixelType OutputPixelType;
- typedef FilterType::MaskImageType MaskImageType;
+ typedef FilterType::MaskImageType MaskImageType;
typedef FilterType::MaskPixelType MaskPixelType;
typedef otb::ImageFileReader< InputImageType > InputReaderType;
- typedef otb::ImageFileReader< MaskImageType > MaskReaderType;
+ typedef otb::ImageFileReader< MaskImageType > MaskReaderType;
typedef otb::StreamingImageFileWriter< OutputImageType > WriterType;
FilterType::Pointer printableImageFilter = FilterType::New();
InputReaderType::Pointer inputReader = InputReaderType::New();
- MaskReaderType::Pointer maskReader = MaskReaderType::New();
+ MaskReaderType::Pointer maskReader = MaskReaderType::New();
WriterType::Pointer writer = WriterType::New();
inputReader->SetFileName( inputFilename );
- maskReader->SetFileName( masktFilename );
+ maskReader->SetFileName( masktFilename );
maskReader->GenerateOutputInformation();
writer->SetFileName( outputFilename );
diff --git a/Testing/Code/BasicFilters/otbStreamingInnerProductVectorImageFilter.cxx b/Testing/Code/BasicFilters/otbStreamingInnerProductVectorImageFilter.cxx
index 4c9407423e6f90e7daf50d63a48f1e30012495b4..2dc736865015488edf173118db24da9bf9d67c4b 100644
--- a/Testing/Code/BasicFilters/otbStreamingInnerProductVectorImageFilter.cxx
+++ b/Testing/Code/BasicFilters/otbStreamingInnerProductVectorImageFilter.cxx
@@ -29,7 +29,7 @@ int otbStreamingInnerProductVectorImageFilter( int argc, char* argv[] )
typedef double PixelType;
const unsigned int Dimension = 2;
- // Typedef
+ // Typedef
typedef otb::VectorImage<PixelType,Dimension> ImageType;
typedef otb::ImageFileReader< ImageType > ReaderType;
typedef otb::StreamingInnerProductVectorImageFilter<ImageType> FilterType;
diff --git a/Testing/Code/BasicFilters/otbStreamingInnerProductVectorImageFilterNew.cxx b/Testing/Code/BasicFilters/otbStreamingInnerProductVectorImageFilterNew.cxx
index 0b7c15c002d3d6f785ca2c79b3a392993030df6b..3802cc22650fb1547fbfcd0fbe5cc899d06e400a 100644
--- a/Testing/Code/BasicFilters/otbStreamingInnerProductVectorImageFilterNew.cxx
+++ b/Testing/Code/BasicFilters/otbStreamingInnerProductVectorImageFilterNew.cxx
@@ -23,7 +23,7 @@ int otbStreamingInnerProductVectorImageFilterNew( int argc, char* argv[] )
typedef double PixelType;
const unsigned int Dimension = 2;
- // Typedef
+ // Typedef
typedef otb::VectorImage<PixelType,Dimension> ImageType;
typedef otb::StreamingInnerProductVectorImageFilter<ImageType> FilterType;
diff --git a/Testing/Code/BasicFilters/otbSubsampleImageFilter.cxx b/Testing/Code/BasicFilters/otbSubsampleImageFilter.cxx
index 05d1ff8618f12ecd1c447aa321ae11440e03703b..c8221cbc38769904a0f49a67a32a1b17453e90d4 100644
--- a/Testing/Code/BasicFilters/otbSubsampleImageFilter.cxx
+++ b/Testing/Code/BasicFilters/otbSubsampleImageFilter.cxx
@@ -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,7 +30,7 @@
int otbSubsampleImageFilter ( int argc, char * argv[] )
{
const char * inputFileName = argv[1];
- const char * outputFileName1 = argv[2];
+ const char * outputFileName1 = argv[2];
const char * outputFileName2 = argv[3];
const unsigned int Dimension = 2;
@@ -41,7 +41,7 @@ int otbSubsampleImageFilter ( int argc, char * argv[] )
ReaderType::Pointer reader = ReaderType::New();
reader->SetFileName( inputFileName );
- typedef otb::SubsampleImageFilter< ImageType, ImageType, otb::INVERSE >
+ typedef otb::SubsampleImageFilter< ImageType, ImageType, otb::INVERSE >
InvFilterType;
InvFilterType::Pointer invFilter = InvFilterType::New();
invFilter->SetInput( reader->GetOutput() );
@@ -55,7 +55,7 @@ int otbSubsampleImageFilter ( int argc, char * argv[] )
writer1->SetInput( invFilter->GetOutput() );
writer1->Update();
- typedef otb::SubsampleImageFilter< ImageType, ImageType, otb::FORWARD >
+ typedef otb::SubsampleImageFilter< ImageType, ImageType, otb::FORWARD >
ForwardFilterType;
ForwardFilterType::Pointer filter = ForwardFilterType::New();
filter->SetInput( invFilter->GetOutput() );
diff --git a/Testing/Code/BasicFilters/otbSubsampleImageFilterNew.cxx b/Testing/Code/BasicFilters/otbSubsampleImageFilterNew.cxx
index 4375bc1d2ff8ef3e956d35defa44df7c531cf526..2161a94a548c243c675a4bfe91e2d6fb1e824191 100644
--- a/Testing/Code/BasicFilters/otbSubsampleImageFilterNew.cxx
+++ b/Testing/Code/BasicFilters/otbSubsampleImageFilterNew.cxx
@@ -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,7 +32,7 @@ int otbSubsampleImageFilterNew ( int argc, char * argv[] )
const unsigned int Dimension = 2;
typedef double PixelType;
typedef otb::Image< PixelType, Dimension > ImageType;
- typedef otb::SubsampleImageFilter< ImageType, ImageType, otb::FORWARD >
+ typedef otb::SubsampleImageFilter< ImageType, ImageType, otb::FORWARD >
FilterType;
FilterType::Pointer filter = FilterType::New();
diff --git a/Testing/Code/ChangeDetection/otbKullbackLeiblerSupervizedDistanceImageFilter.cxx b/Testing/Code/ChangeDetection/otbKullbackLeiblerSupervizedDistanceImageFilter.cxx
index a6d56d8724366d552f959f5688021861514bdb23..55f5d8348735c11df36aeae621a54c8bc800ec64 100644
--- a/Testing/Code/ChangeDetection/otbKullbackLeiblerSupervizedDistanceImageFilter.cxx
+++ b/Testing/Code/ChangeDetection/otbKullbackLeiblerSupervizedDistanceImageFilter.cxx
@@ -85,7 +85,7 @@ int otbKullbackLeiblerSupervizedDistanceImageFilter(int argc, char * argv[])
typedef unsigned char OutputPixelType;
typedef otb::Image< OutputPixelType, Dimension > OutputImageType;
- typedef itk::RescaleIntensityImageFilter< ImageType, OutputImageType >
+ typedef itk::RescaleIntensityImageFilter< ImageType, OutputImageType >
RescalerType;
RescalerType::Pointer rescaler = RescalerType::New();
rescaler->SetOutputMinimum(0);
diff --git a/Testing/Code/Common/otbConfigurationTest.cxx b/Testing/Code/Common/otbConfigurationTest.cxx
index 8953da4e63bb847e7042a1c699f4c4632a70a33e..64818c88aafa3103380561376f8539e10338fae8 100644
--- a/Testing/Code/Common/otbConfigurationTest.cxx
+++ b/Testing/Code/Common/otbConfigurationTest.cxx
@@ -30,7 +30,7 @@ int otbConfigurationTest(int argc, char * argv[])
ConfigurationType::Pointer conf = ConfigurationType::New();
// conf->Load();
- std::string lang = conf->GetLanguage();
+ std::string lang = conf->GetLanguage();
std::cout << "config language " << lang << std::endl;
diff --git a/Testing/Code/Common/otbLabelMapToGISTableFilter.cxx b/Testing/Code/Common/otbLabelMapToGISTableFilter.cxx
index 26481276829740b991f6956683c417fff683ff17..81f9c542874f22f432d94c573f0c18f4cb807f0f 100644
--- a/Testing/Code/Common/otbLabelMapToGISTableFilter.cxx
+++ b/Testing/Code/Common/otbLabelMapToGISTableFilter.cxx
@@ -52,7 +52,7 @@ int otbLabelMapToGISTableFilter(int argc, char * argv[])
typedef otb::Image<LabelType,Dimension> LabeledImageType;
typedef otb::ImageFileReader<LabeledImageType> LabeledReaderType;
- // Label map typedef
+ // Label map typedef
typedef otb::AttributesMapLabelObject<LabelType,Dimension,double> LabelObjectType;
typedef itk::LabelMap<LabelObjectType> LabelMapType;
typedef itk::LabelImageToLabelMapFilter<LabeledImageType,LabelMapType> LabelMapFilterType;
diff --git a/Testing/Code/Common/otbLabelMapToVectorDataFilter.cxx b/Testing/Code/Common/otbLabelMapToVectorDataFilter.cxx
index 657651b7af2099ae86e4a9a2b9a5b0031fe26e74..969dac461e10e1cec5769a5962bcb88ebae5c4e3 100644
--- a/Testing/Code/Common/otbLabelMapToVectorDataFilter.cxx
+++ b/Testing/Code/Common/otbLabelMapToVectorDataFilter.cxx
@@ -48,7 +48,7 @@ int otbLabelMapToVectorDataFilter(int argc, char * argv[])
typedef otb::Image<LabelType,Dimension> LabeledImageType;
typedef otb::ImageFileReader<LabeledImageType> LabeledReaderType;
- // Label map typedef
+ // Label map typedef
typedef otb::AttributesMapLabelObject<LabelType,Dimension,double> LabelObjectType;
typedef itk::LabelMap<LabelObjectType> LabelMapType;
typedef itk::LabelImageToLabelMapFilter<LabeledImageType,LabelMapType> LabelMapFilterType;
diff --git a/Testing/Code/Common/otbLabelObjectMapVectorizer.cxx b/Testing/Code/Common/otbLabelObjectMapVectorizer.cxx
index 4be72127117c589d12b512067e9eb2c688cc0c4b..92fc885940048ba14c74fb0c9f3e3c3b1976289d 100644
--- a/Testing/Code/Common/otbLabelObjectMapVectorizer.cxx
+++ b/Testing/Code/Common/otbLabelObjectMapVectorizer.cxx
@@ -10,8 +10,8 @@
See OTBCopyright.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.
=========================================================================*/
@@ -41,7 +41,7 @@ int otbLabelObjectMapVectorizer(int argc, char * argv[])
typedef otb::Image<LabelType,Dimension> LabeledImageType;
typedef otb::ImageFileReader<LabeledImageType> LabeledReaderType;
- // Label map typedef
+ // Label map typedef
typedef otb::AttributesMapLabelObject<LabelType,Dimension,double> LabelObjectType;
typedef itk::LabelMap<LabelObjectType> LabelMapType;
typedef itk::LabelImageToLabelMapFilter<LabeledImageType,LabelMapType> LabelMapFilterType;
@@ -116,20 +116,20 @@ int otbLabelObjectMapVectorizer(int argc, char * argv[])
for(LabelType label = minMax->GetMinimum(); label <=minMax->GetMaximum(); ++label)
{
if(labelMapFilter->GetOutput()->HasLabel(label) && label != labelMapFilter->GetOutput()->GetBackgroundValue())
- {
- std::cout<<"Vectorizing object "<<label<<std::endl;
- chrono.Start();
- PolygonType::Pointer polygon = functor(labelMapFilter->GetOutput()->GetLabelObject(label));
- chrono.Stop();
+ {
+ std::cout<<"Vectorizing object "<<label<<std::endl;
+ chrono.Start();
+ PolygonType::Pointer polygon = functor(labelMapFilter->GetOutput()->GetLabelObject(label));
+ chrono.Stop();
//correct polygon
PolygonType::Pointer correct_polygon = correctPolygon(polygon);
- DataNodeType::Pointer node = DataNodeType::New();
- node->SetNodeType(otb::FEATURE_POLYGON);
+ DataNodeType::Pointer node = DataNodeType::New();
+ node->SetNodeType(otb::FEATURE_POLYGON);
node->SetPolygonExteriorRing(correct_polygon);
- data->GetDataTree()->Add(node,folder1);
- }
+ data->GetDataTree()->Add(node,folder1);
+ }
}
}
std::cout<<"Average vectorization time: "<<chrono.GetMeanTime()<<" s."<<std::endl;
diff --git a/Testing/Code/Common/otbQuickLookImageGenerator.cxx b/Testing/Code/Common/otbQuickLookImageGenerator.cxx
index e9e21dd553bc41dbbf87d5d606c2fdad8d08732f..8e778213e0e756eeab3805371365c3f3ba375a64 100755
--- a/Testing/Code/Common/otbQuickLookImageGenerator.cxx
+++ b/Testing/Code/Common/otbQuickLookImageGenerator.cxx
@@ -10,8 +10,8 @@
See OTBCopyright.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.
=========================================================================*/
diff --git a/Testing/Code/Common/otbQuickLookImageGeneratorNew.cxx b/Testing/Code/Common/otbQuickLookImageGeneratorNew.cxx
index 91159c44ffd1530a0a5ede8c1a20c19180b63b45..e2cabec1202a96af4252e34a56a7c2bab4177e84 100755
--- a/Testing/Code/Common/otbQuickLookImageGeneratorNew.cxx
+++ b/Testing/Code/Common/otbQuickLookImageGeneratorNew.cxx
@@ -10,8 +10,8 @@
See OTBCopyright.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.
=========================================================================*/
diff --git a/Testing/Code/Common/otbVectorDataToGISTableFilter.cxx b/Testing/Code/Common/otbVectorDataToGISTableFilter.cxx
index f6815f218c1ca20b531644641365161111d9d2ab..c794899675c80626596b630de7926ad3894c2b2c 100644
--- a/Testing/Code/Common/otbVectorDataToGISTableFilter.cxx
+++ b/Testing/Code/Common/otbVectorDataToGISTableFilter.cxx
@@ -72,7 +72,7 @@ int otbVectorDataToGISTableFilter(int argc, char * argv[])
//std::string myTableName = "VectorDataToPostGIS";
//data->SetTableName(myTableName);
//std::cout << "YES" << std::endl;
- //input : the vectordata
+ //input : the vectordata
typedef unsigned short int PixelType;
diff --git a/Testing/Code/Common/otbVectorDataToLabelMapFilter.cxx b/Testing/Code/Common/otbVectorDataToLabelMapFilter.cxx
index 7406bf2742481cb585abbca7d7f41700c326fd4b..05708246ad86fe1d5ad48109c12469e0ef051b81 100644
--- a/Testing/Code/Common/otbVectorDataToLabelMapFilter.cxx
+++ b/Testing/Code/Common/otbVectorDataToLabelMapFilter.cxx
@@ -33,7 +33,7 @@
#include "itkNumericTraits.h"
int otbVectorDataToLabelMapFilter(int argc, char * argv[])
-{
+{
/** Rasterize vectorData to LabelMap (only available for polygon yet)*/
if ( argc != 3 )
@@ -53,7 +53,7 @@ int otbVectorDataToLabelMapFilter(int argc, char * argv[])
typedef otb::Image<LabelType,Dimension> LabeledImageType;
typedef otb::ImageFileWriter<LabeledImageType> WriterType;
- // Label map typedef
+ // Label map typedef
typedef otb::AttributesMapLabelObject<LabelType,Dimension,double> LabelObjectType;
typedef itk::LabelMap<LabelObjectType> LabelMapType;
@@ -65,7 +65,7 @@ int otbVectorDataToLabelMapFilter(int argc, char * argv[])
ReaderType::Pointer reader = ReaderType::New();
reader->SetFileName(infname);
- //Update the reader
+ //Update the reader
reader->Update();
VectorDataToLabelMapFilterType::Pointer myFilter = VectorDataToLabelMapFilterType::New();
diff --git a/Testing/Code/Common/otbVectorDataToLabelMapFilterNew.cxx b/Testing/Code/Common/otbVectorDataToLabelMapFilterNew.cxx
index 58372f59f35fb8ffc4087df1a91061d011d8cfc4..c0eac8eba956777f5cf194dd7a90bee9d3d50b3a 100644
--- a/Testing/Code/Common/otbVectorDataToLabelMapFilterNew.cxx
+++ b/Testing/Code/Common/otbVectorDataToLabelMapFilterNew.cxx
@@ -22,7 +22,7 @@
#include "otbAttributesMapLabelObject.h"
int otbVectorDataToLabelMapFilterNew(int argc, char * argv[])
-{
+{
typedef unsigned short LabelType;
const unsigned int Dimension = 2;
typedef otb::VectorData<double,Dimension> VectorDataType;
diff --git a/Testing/Code/FeatureExtraction/otbFeatureExtractionTests14.cxx b/Testing/Code/FeatureExtraction/otbFeatureExtractionTests14.cxx
index 94f9dfa5243ffe8103ac5e5019839af348ea25fd..f0dd07c1502ab01e7eadf4ad1f3bbc2cae55d5e3 100644
--- a/Testing/Code/FeatureExtraction/otbFeatureExtractionTests14.cxx
+++ b/Testing/Code/FeatureExtraction/otbFeatureExtractionTests14.cxx
@@ -36,5 +36,5 @@ REGISTER_TEST(otbSFSTexturesImageFilterTest);
REGISTER_TEST(otbUrbanAreaDetectionImageFilterNew);
REGISTER_TEST(otbUrbanAreaDetectionImageFilter);
REGISTER_TEST(otbRegionImageToRectangularPathListFilterNew);
-REGISTER_TEST(otbRegionImageToRectangularPathListFilter);
+REGISTER_TEST(otbRegionImageToRectangularPathListFilter);
}
diff --git a/Testing/Code/FeatureExtraction/otbImageToFastSIFTKeyPointSetFilterOutputDescriptorAscii.cxx b/Testing/Code/FeatureExtraction/otbImageToFastSIFTKeyPointSetFilterOutputDescriptorAscii.cxx
index 14cb5a439f4b84914fce401b77e83771133c0f20..0976f854378850d743996fdccbe7d7e1437103b5 100644
--- a/Testing/Code/FeatureExtraction/otbImageToFastSIFTKeyPointSetFilterOutputDescriptorAscii.cxx
+++ b/Testing/Code/FeatureExtraction/otbImageToFastSIFTKeyPointSetFilterOutputDescriptorAscii.cxx
@@ -78,9 +78,9 @@ int otbImageToFastSIFTKeyPointSetFilterOutputDescriptorAscii(int argc, char * ar
outfile << "Number of SIFT key points: " << filter->GetOutput()->GetNumberOfPoints() << std::endl;
if(filter->GetOutput()->GetPointData()->Size() != filter->GetOutput()->GetPoints()->Size() )
- return EXIT_FAILURE;
+ return EXIT_FAILURE;
if(filter->GetOutput()->GetPointData()->Size() == 0 )
- return EXIT_FAILURE;
+ return EXIT_FAILURE;
// Copy the PointSet to std::vector< std::vector >
while ( pIt!=filter->GetOutput()->GetPoints()->End() && pDataIt!=filter->GetOutput()->GetPointData()->End() )
@@ -111,12 +111,12 @@ int otbImageToFastSIFTKeyPointSetFilterOutputDescriptorAscii(int argc, char * ar
while ( itData != imageData.end() )
{
- unsigned int itDescriptor = 0;
- outfile << "[ ";
+ unsigned int itDescriptor = 0;
+ outfile << "[ ";
while (itDescriptor < stopVal )
//while (itDescriptor < static_cast<int>((*itData).size()-2) )
{
- outfile << std::fixed << std::setprecision(5) << (*itData)[itDescriptor+2] << " ";
+ outfile << std::fixed << std::setprecision(5) << (*itData)[itDescriptor+2] << " ";
itDescriptor++;
}
outfile << "]" << std::endl;
diff --git a/Testing/Code/FeatureExtraction/otbLineSpatialObjectListToRightAnglePointSetFilter.cxx b/Testing/Code/FeatureExtraction/otbLineSpatialObjectListToRightAnglePointSetFilter.cxx
index ebecd5775084ed3d71c57c8470fa6b7f8ab35e65..28a7da1dd9acfad066813ce8a530ad3f32dec5ab 100644
--- a/Testing/Code/FeatureExtraction/otbLineSpatialObjectListToRightAnglePointSetFilter.cxx
+++ b/Testing/Code/FeatureExtraction/otbLineSpatialObjectListToRightAnglePointSetFilter.cxx
@@ -29,7 +29,7 @@
int otbLineSpatialObjectListToRightAnglePointSetFilter( int argc, char * argv[] )
{
- const char * infname = argv[1];
+ const char * infname = argv[1];
const char * outfname = argv[2];
const unsigned int Dimension = 2;
@@ -42,13 +42,13 @@ int otbLineSpatialObjectListToRightAnglePointSetFilter( int argc, char * argv[]
typedef LinesListType::LineType LineType;
typedef std::vector<LineType*> VectorLines;
typedef itk::PointSet<VectorLines , Dimension> PointSetType;
- typedef otb::LineSpatialObjectListToRightAnglePointSetFilter<ImageType ,LinesListType,
+ typedef otb::LineSpatialObjectListToRightAnglePointSetFilter<ImageType ,LinesListType,
PointSetType > RightAngleFilterType;
/** Creatop, of an instance of the filters */
RightAngleFilterType::Pointer rightAngleFilter = RightAngleFilterType::New();
ReaderType::Pointer reader = ReaderType::New();
- PointSetType::Pointer segmentOrtho = PointSetType::New();
+ PointSetType::Pointer segmentOrtho = PointSetType::New();
/** Creation of lines */
diff --git a/Testing/Code/FeatureExtraction/otbLineSpatialObjectListToRightAnglePointSetFilterByStepsOutputAscii.cxx b/Testing/Code/FeatureExtraction/otbLineSpatialObjectListToRightAnglePointSetFilterByStepsOutputAscii.cxx
index e2dbeaf6c41997151c52e391d7ddecdab928c12b..27c81639a183def6ce871321cd2417279d5ce843 100644
--- a/Testing/Code/FeatureExtraction/otbLineSpatialObjectListToRightAnglePointSetFilterByStepsOutputAscii.cxx
+++ b/Testing/Code/FeatureExtraction/otbLineSpatialObjectListToRightAnglePointSetFilterByStepsOutputAscii.cxx
@@ -31,7 +31,7 @@
int otbLineSpatialObjectListToRightAnglePointSetFilterByStepsOutputAscii( int argc, char * argv[] )
{
- const char * infname = argv[1];
+ const char * infname = argv[1];
const char * outfname = argv[2];
const unsigned int Dimension = 2;
@@ -46,13 +46,13 @@ int otbLineSpatialObjectListToRightAnglePointSetFilterByStepsOutputAscii( int ar
typedef std::vector<LineType*> VectorLines;
typedef itk::PointSet<VectorLines , Dimension> PointSetType;
typedef otb::LineSegmentDetector<ImageType , PixelType> lsdFilterType;
- typedef otb::LineSpatialObjectListToRightAnglePointSetFilter<ImageType ,LinesListType,
+ typedef otb::LineSpatialObjectListToRightAnglePointSetFilter<ImageType ,LinesListType,
PointSetType > RightAngleFilterType;
/** Creatop, of an instance of the filters */
RightAngleFilterType::Pointer rightAngleFilter = RightAngleFilterType::New();
ReaderType::Pointer reader = ReaderType::New();
- PointSetType::Pointer segmentOrtho = PointSetType::New();
+ PointSetType::Pointer segmentOrtho = PointSetType::New();
lsdFilterType::Pointer lsdFilter = lsdFilterType::New();
@@ -60,7 +60,7 @@ int otbLineSpatialObjectListToRightAnglePointSetFilterByStepsOutputAscii( int ar
// Begin the process
reader->SetFileName(infname);
- lsdFilter->SetInput(reader->GetOutput());
+ lsdFilter->SetInput(reader->GetOutput());
rightAngleFilter->SetInputImage(reader->GetOutput());
rightAngleFilter->SetInput(lsdFilter->GetOutput());
diff --git a/Testing/Code/FeatureExtraction/otbLineSpatialObjectListToRightAnglePointSetFilterNew.cxx b/Testing/Code/FeatureExtraction/otbLineSpatialObjectListToRightAnglePointSetFilterNew.cxx
index db7075ec708a353648bbf3f8a5f7a7e4a14cb126..968def40046591acc556db927232f2b975d072b7 100644
--- a/Testing/Code/FeatureExtraction/otbLineSpatialObjectListToRightAnglePointSetFilterNew.cxx
+++ b/Testing/Code/FeatureExtraction/otbLineSpatialObjectListToRightAnglePointSetFilterNew.cxx
@@ -33,7 +33,7 @@ int otbLineSpatialObjectListToRightAnglePointSetFilterNew( int argc, char * argv
typedef LinesListType::LineType LineType;
typedef std::vector<LineType *> VectorLines;
typedef itk::PointSet<VectorLines , Dimension> PointSetType;
- typedef otb::LineSpatialObjectListToRightAnglePointSetFilter<ImageType ,LinesListType,
+ typedef otb::LineSpatialObjectListToRightAnglePointSetFilter<ImageType ,LinesListType,
PointSetType > RightAngleFilterType;
diff --git a/Testing/Code/FeatureExtraction/otbRegionImageToRectangularPathListFilter.cxx b/Testing/Code/FeatureExtraction/otbRegionImageToRectangularPathListFilter.cxx
index a40416e0cd54ab17ee3348287b89af42083e9dfe..3fcb5a9918f2bce29171ea12d39e5994205830c2 100644
--- a/Testing/Code/FeatureExtraction/otbRegionImageToRectangularPathListFilter.cxx
+++ b/Testing/Code/FeatureExtraction/otbRegionImageToRectangularPathListFilter.cxx
@@ -75,7 +75,7 @@ int otbRegionImageToRectangularPathListFilter(int argc, char * argv[])
exit(-1);
}
- while(listIt != pathList->End())
+ while(listIt != pathList->End())
{
for (PathType::VertexListType::ConstIterator vit = listIt.Get()->GetVertexList()->Begin();
diff --git a/Testing/Code/FeatureExtraction/otbSFSTexturesImageFilterTest.cxx b/Testing/Code/FeatureExtraction/otbSFSTexturesImageFilterTest.cxx
index 74b85d6fecce4f41ce7e5665a00c77fa9d83148f..3d1391add4c21eeb2b8036fe8ce1f7558eb2a348 100644
--- a/Testing/Code/FeatureExtraction/otbSFSTexturesImageFilterTest.cxx
+++ b/Testing/Code/FeatureExtraction/otbSFSTexturesImageFilterTest.cxx
@@ -38,7 +38,7 @@ int otbSFSTexturesImageFilterTest(int argc, char * argv[])
unsigned int spatialThresh = atoi(argv[8]);
unsigned int dirNb = atoi(argv[9]);
unsigned int maxConsideration = atoi(argv[10]);
- double alpha = atof(argv[11]);
+ double alpha = atof(argv[11]);
typedef otb::Image<PixelType,Dimension> ImageType;
@@ -47,7 +47,7 @@ int otbSFSTexturesImageFilterTest(int argc, char * argv[])
typedef otb::ImageFileWriter<ImageType> WriterType;
typedef otb::SFSTexturesImageFilter<ImageType, ImageType> FilterType;
- FilterType::Pointer filter = FilterType::New();
+ FilterType::Pointer filter = FilterType::New();
ReaderType::Pointer reader = ReaderType::New();
WriterType::Pointer writerLength = WriterType::New();
WriterType::Pointer writerWidth = WriterType::New();
diff --git a/Testing/Code/FeatureExtraction/otbTextureFunctorBase.cxx b/Testing/Code/FeatureExtraction/otbTextureFunctorBase.cxx
index ff6e103ff4851d6f73dc268741e2e9b0c0fa6422..edfd6c3c49fb512bb00e58d692c19ed46146cbc0 100644
--- a/Testing/Code/FeatureExtraction/otbTextureFunctorBase.cxx
+++ b/Testing/Code/FeatureExtraction/otbTextureFunctorBase.cxx
@@ -26,7 +26,7 @@
template <class TScalarInput, class TScalarOutput>
-class ITK_EXPORT TextureFunctorTest :
+class ITK_EXPORT TextureFunctorTest :
public otb::Functor::TextureFunctorBase<TScalarInput, TScalarOutput>
{
public:
@@ -38,7 +38,7 @@ public:
virtual double ComputeOverSingleChannel(const NeighborhoodType &neigh, const NeighborhoodType &neighOff)
{
- double out = neigh.GetCenterValue();
+ double out = neigh.GetCenterValue();
return out;
}
diff --git a/Testing/Code/FeatureExtraction/otbTextureImageFunction.cxx b/Testing/Code/FeatureExtraction/otbTextureImageFunction.cxx
index 0540c5eb7cff4814b7000672387624f91a928dc9..8fc440736cc7071441d24e106dcfd1f866746be8 100644
--- a/Testing/Code/FeatureExtraction/otbTextureImageFunction.cxx
+++ b/Testing/Code/FeatureExtraction/otbTextureImageFunction.cxx
@@ -30,7 +30,7 @@
template<class TInputImage, class TOutputImage, class TFunctor>
int generic_TextureImageFunction(int argc, char * argv[])
-{
+{
const char * inputFileName = argv[1];
const char * outputFileName = argv[2];
diff --git a/Testing/Code/IO/otbDEMHandlerTest.cxx b/Testing/Code/IO/otbDEMHandlerTest.cxx
index 139d93f07b9cb9f82b2971ff2d642f979ca4704b..ef7a574a4eb81ab07cbe036ce4302ce6fe53c063 100644
--- a/Testing/Code/IO/otbDEMHandlerTest.cxx
+++ b/Testing/Code/IO/otbDEMHandlerTest.cxx
@@ -47,7 +47,7 @@ int otbDEMHandlerTest(int argc, char * argv[])
geoPoint[1] = atof(argv[5]);//44.08;
height = demHandler->GetHeightAboveMSL(geoPoint);
- height2 = demHandler->GetHeightAboveEllipsoid(geoPoint);
+ height2 = demHandler->GetHeightAboveEllipsoid(geoPoint);
std::ofstream file;
file.open(outputfilename);
diff --git a/Testing/Code/IO/otbImageKeywordlist.cxx b/Testing/Code/IO/otbImageKeywordlist.cxx
index f64a252ca5b004b857e6cc188f8025651a178e40..cc302dfb6be1f9596abf9cb04c81bb1aae79d915 100644
--- a/Testing/Code/IO/otbImageKeywordlist.cxx
+++ b/Testing/Code/IO/otbImageKeywordlist.cxx
@@ -68,7 +68,7 @@ int otbImageKeywordlist( int argc, char* argv[] )
otb::ImageKeywordlist otb_kwl;
otb_kwl.SetKeywordlist( geom_kwl );
- otb_kwl.convertToOSSIMKeywordlist( geom_kwl2 );
+ otb_kwl.convertToOSSIMKeywordlist( geom_kwl2 );
hasMetaData = projection->loadState(geom_kwl2);
hasMetaData = projection->saveState(geom_kwl3);
diff --git a/Testing/Code/IO/otbImageSeriesFileReader.cxx b/Testing/Code/IO/otbImageSeriesFileReader.cxx
index 1a0078f049e5b53833236bda36d95f501c962cc9..a37547908cd1c46429e0af277bfd77cf91369b9a 100644
--- a/Testing/Code/IO/otbImageSeriesFileReader.cxx
+++ b/Testing/Code/IO/otbImageSeriesFileReader.cxx
@@ -64,7 +64,7 @@ int otbImageSeriesFileReader(int argc, char* argv[] )
outputFilenameBase.ext()
);
- WriterType::Pointer writer = WriterType::New();
+ WriterType::Pointer writer = WriterType::New();
writer->SetFileName(outputFilename);
writer->SetInput(reader->GetOutput(i));
writer->Update();
diff --git a/Testing/Code/Learning/otbSOMWithMissingValueNew.cxx b/Testing/Code/Learning/otbSOMWithMissingValueNew.cxx
index 2cea6be2a0871e00e888e5858ea71f144001f459..6d6590cc0614f6503ac8abc8c8dfbfdb768a2e7d 100644
--- a/Testing/Code/Learning/otbSOMWithMissingValueNew.cxx
+++ b/Testing/Code/Learning/otbSOMWithMissingValueNew.cxx
@@ -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.
=========================================================================*/
@@ -35,16 +35,16 @@ int otbSOMWithMissingValueNew ( int argc, char * argv[] )
const unsigned int Dimension = 2;
typedef double PixelType;
typedef otb::VectorImage< PixelType, Dimension > ImageType;
- typedef ImageType::PixelType VectorType;
+ typedef ImageType::PixelType VectorType;
typedef otb::Statistics::FlexibleDistanceWithMissingValue< VectorType > DistanceType;
- typedef otb::SOMMap< VectorType, DistanceType, Dimension > MapType;
- typedef itk::Statistics::ListSample< VectorType > SampleListType;
- typedef otb::Functor::CzihoSOMLearningBehaviorFunctor LearningBehaviorFunctorType;
- typedef otb::Functor::CzihoSOMNeighborhoodBehaviorFunctor NeighborhoodBehaviorFunctorType;
- typedef otb::SOMWithMissingValue< SampleListType, MapType,
- LearningBehaviorFunctorType, NeighborhoodBehaviorFunctorType > SOMType;
+ typedef otb::SOMMap< VectorType, DistanceType, Dimension > MapType;
+ typedef itk::Statistics::ListSample< VectorType > SampleListType;
+ typedef otb::Functor::CzihoSOMLearningBehaviorFunctor LearningBehaviorFunctorType;
+ typedef otb::Functor::CzihoSOMNeighborhoodBehaviorFunctor NeighborhoodBehaviorFunctorType;
+ typedef otb::SOMWithMissingValue< SampleListType, MapType,
+ LearningBehaviorFunctorType, NeighborhoodBehaviorFunctorType > SOMType;
SOMType::Pointer som = SOMType::New();
diff --git a/Testing/Code/Learning/otbSOMbasedImageFilterNew.cxx b/Testing/Code/Learning/otbSOMbasedImageFilterNew.cxx
index bd3143096faec70035b9cc2bd73b5dba65126f5c..ea36c289c16f86fa0241996a9b5fbcb6bbf28e73 100644
--- a/Testing/Code/Learning/otbSOMbasedImageFilterNew.cxx
+++ b/Testing/Code/Learning/otbSOMbasedImageFilterNew.cxx
@@ -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.
=========================================================================*/
@@ -30,13 +30,13 @@ int otbSOMbasedImageFilterNew ( int argc, char * argv[] )
const unsigned int Dimension = 2;
typedef double PixelType;
typedef otb::VectorImage< PixelType, Dimension > ImageType;
- typedef ImageType::PixelType VectorType;
+ typedef ImageType::PixelType VectorType;
typedef otb::Statistics::FlexibleDistanceWithMissingValue< VectorType > DistanceType;
- typedef otb::SOMbasedImageFilter< ImageType, ImageType, DistanceType, ImageType >
+ typedef otb::SOMbasedImageFilter< ImageType, ImageType, DistanceType, ImageType >
FilterType;
- FilterType::Pointer somFilter = FilterType::New();
+ FilterType::Pointer somFilter = FilterType::New();
return EXIT_SUCCESS;
}
diff --git a/Testing/Code/MultiScale/otbWaveletInverseTransformNew.cxx b/Testing/Code/MultiScale/otbWaveletInverseTransformNew.cxx
index 3cc5716cdc769f15b32e5d5176e9b0e700424e54..d7e8036ecf7f3ba12acf8d67d11021ec38f40752 100644
--- a/Testing/Code/MultiScale/otbWaveletInverseTransformNew.cxx
+++ b/Testing/Code/MultiScale/otbWaveletInverseTransformNew.cxx
@@ -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.
=========================================================================*/
@@ -33,11 +33,11 @@ int otbWaveletInverseTransformNew(int argc, char * argv[])
const otb::MotherWaveletOperatorEnum wvltID = otb::SYMLET8;
/* Inverse Transformation */
- typedef otb::WaveletOperator< wvltID, otb::INVERSE, PixelType, Dimension >
+ typedef otb::WaveletOperator< wvltID, otb::INVERSE, PixelType, Dimension >
InverseWaveletOperator;
- typedef otb::WaveletFilterBank< ImageType, ImageType, InverseWaveletOperator, otb::INVERSE >
+ typedef otb::WaveletFilterBank< ImageType, ImageType, InverseWaveletOperator, otb::INVERSE >
InverseFilterBank;
- typedef otb::WaveletTransform< ImageType, ImageType, InverseFilterBank, otb::INVERSE >
+ typedef otb::WaveletTransform< ImageType, ImageType, InverseFilterBank, otb::INVERSE >
InvFilterType;
InvFilterType::Pointer invFilter = InvFilterType::New();
diff --git a/Testing/Code/MultiScale/otbWaveletOperator.cxx b/Testing/Code/MultiScale/otbWaveletOperator.cxx
index 3acd7c2b14b69af2955e4598e3cf98b27e522925..af0d169ff006cd5dd2b828b06c8061865db772f9 100644
--- a/Testing/Code/MultiScale/otbWaveletOperator.cxx
+++ b/Testing/Code/MultiScale/otbWaveletOperator.cxx
@@ -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 @@ int otbWaveletOperator(int argc, char * argv[])
typedef double PixelType;
- typedef otb::WaveletOperator< wvltID, directionID, PixelType, Dimension >
+ typedef otb::WaveletOperator< wvltID, directionID, PixelType, Dimension >
WaveletOperator;
typedef WaveletOperator::LowPassOperator LowPassOperatorType;
typedef WaveletOperator::HighPassOperator HighPassOperatorType;
diff --git a/Testing/Code/MultiScale/otbWaveletOperatorNew.cxx b/Testing/Code/MultiScale/otbWaveletOperatorNew.cxx
index c3fbed7bf786fa66cbda5f2107a5d03fe850b177..d6568cd9e5af14cf4e50c0d42b41246ff6e30ff0 100644
--- a/Testing/Code/MultiScale/otbWaveletOperatorNew.cxx
+++ b/Testing/Code/MultiScale/otbWaveletOperatorNew.cxx
@@ -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 @@ int otbWaveletOperatorNew(int argc, char * argv[])
typedef double PixelType;
- typedef otb::WaveletOperator< wvltID, directionID, PixelType, Dimension >
+ typedef otb::WaveletOperator< wvltID, directionID, PixelType, Dimension >
WaveletOperator;
typedef WaveletOperator::LowPassOperator LowPassOperatorType;
diff --git a/Testing/Code/MultiScale/otbWaveletPacketInverseTransformNew.cxx b/Testing/Code/MultiScale/otbWaveletPacketInverseTransformNew.cxx
index 5abc3068e437557dc99703ef9e7a33839be87eda..04fb136c1a670be6c597412655efce7bb3ea82b7 100644
--- a/Testing/Code/MultiScale/otbWaveletPacketInverseTransformNew.cxx
+++ b/Testing/Code/MultiScale/otbWaveletPacketInverseTransformNew.cxx
@@ -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.
=========================================================================*/
@@ -35,9 +35,9 @@ int otbWaveletPacketInverseTransformNew(int argc, char * argv[])
const otb::MotherWaveletOperatorEnum wvltID = otb::DB8;
/* Inverse Transformation */
- typedef otb::WaveletOperator< wvltID, otb::INVERSE, PixelType, Dimension >
+ typedef otb::WaveletOperator< wvltID, otb::INVERSE, PixelType, Dimension >
InverseWaveletOperator;
- typedef otb::WaveletFilterBank< ImageType, ImageType, InverseWaveletOperator, otb::INVERSE >
+ typedef otb::WaveletFilterBank< ImageType, ImageType, InverseWaveletOperator, otb::INVERSE >
InverseFilterBank;
typedef otb::WaveletPacketTransform< ImageType, ImageType, InverseFilterBank, otb::INVERSE >
InvFilterType;
diff --git a/Testing/Code/MultiScale/otbWaveletPacketTransform.cxx b/Testing/Code/MultiScale/otbWaveletPacketTransform.cxx
index 8e50f7dbba7b0721ca2681c5c18649a535580b9f..915bb185c10e9e2b29e53e6203a5c6680af07fd3 100644
--- a/Testing/Code/MultiScale/otbWaveletPacketTransform.cxx
+++ b/Testing/Code/MultiScale/otbWaveletPacketTransform.cxx
@@ -55,9 +55,9 @@ int otbWaveletPacketTransform( int argc, char * argv[] )
CostType::NumberOfAllowedDecompositions = level;
/* Forward Transformation */
- typedef otb::WaveletOperator< wvltID, otb::FORWARD, PixelType, Dimension >
+ typedef otb::WaveletOperator< wvltID, otb::FORWARD, PixelType, Dimension >
WaveletOperator;
- typedef otb::WaveletFilterBank< ImageType, ImageType, WaveletOperator, otb::FORWARD >
+ typedef otb::WaveletFilterBank< ImageType, ImageType, WaveletOperator, otb::FORWARD >
ForwardFilterBank;
typedef otb::WaveletPacketTransform< ImageType, ImageType, ForwardFilterBank, otb::FORWARD, CostType >
FilterType;
@@ -68,11 +68,11 @@ int otbWaveletPacketTransform( int argc, char * argv[] )
filter->Update();
/* Inverse Transformation */
- typedef otb::WaveletOperator< wvltID, otb::INVERSE, PixelType, Dimension >
+ typedef otb::WaveletOperator< wvltID, otb::INVERSE, PixelType, Dimension >
InverseWaveletOperator;
- typedef otb::WaveletFilterBank< ImageType, ImageType, InverseWaveletOperator, otb::INVERSE >
+ typedef otb::WaveletFilterBank< ImageType, ImageType, InverseWaveletOperator, otb::INVERSE >
InverseFilterBank;
- typedef otb::WaveletPacketTransform< ImageType, ImageType, InverseFilterBank, otb::INVERSE >
+ typedef otb::WaveletPacketTransform< ImageType, ImageType, InverseFilterBank, otb::INVERSE >
InvFilterType;
InvFilterType::Pointer invFilter = InvFilterType::New();
diff --git a/Testing/Code/MultiScale/otbWaveletPacketTransformNew.cxx b/Testing/Code/MultiScale/otbWaveletPacketTransformNew.cxx
index e0329efaf8573eca724ab171fdca533fd81bbd2b..44d6949c48222728195d32b626f8473d6eecc612 100644
--- a/Testing/Code/MultiScale/otbWaveletPacketTransformNew.cxx
+++ b/Testing/Code/MultiScale/otbWaveletPacketTransformNew.cxx
@@ -37,9 +37,9 @@ int otbWaveletPacketTransformNew(int argc, char * argv[])
CostType::NumberOfAllowedDecompositions = 1;
/* Forward Transformation */
- typedef otb::WaveletOperator< wvltID, otb::FORWARD, PixelType, Dimension >
+ typedef otb::WaveletOperator< wvltID, otb::FORWARD, PixelType, Dimension >
WaveletOperator;
- typedef otb::WaveletFilterBank< ImageType, ImageType, WaveletOperator, otb::FORWARD >
+ typedef otb::WaveletFilterBank< ImageType, ImageType, WaveletOperator, otb::FORWARD >
ForwardFilterBank;
typedef otb::WaveletPacketTransform< ImageType, ImageType, ForwardFilterBank, otb::FORWARD, CostType >
FilterType;
diff --git a/Testing/Code/MultiScale/otbWaveletTransform.cxx b/Testing/Code/MultiScale/otbWaveletTransform.cxx
index 840972003a39b3b2f68ebec202ac893130cbf9ce..d00bb6c821d1c8b3302e82cd5bc23aeaba5d2185 100644
--- a/Testing/Code/MultiScale/otbWaveletTransform.cxx
+++ b/Testing/Code/MultiScale/otbWaveletTransform.cxx
@@ -50,11 +50,11 @@ int otbWaveletTransform( int argc, char * argv[] )
const otb::MotherWaveletOperatorEnum wvltID = otb::HAAR;
/* Forward Transformation */
- typedef otb::WaveletOperator< wvltID, otb::FORWARD, PixelType, Dimension >
+ typedef otb::WaveletOperator< wvltID, otb::FORWARD, PixelType, Dimension >
WaveletOperator;
- typedef otb::WaveletFilterBank< ImageType, ImageType, WaveletOperator, otb::FORWARD >
+ typedef otb::WaveletFilterBank< ImageType, ImageType, WaveletOperator, otb::FORWARD >
ForwardFilterBank;
- typedef otb::WaveletTransform< ImageType, ImageType, ForwardFilterBank, otb::FORWARD >
+ typedef otb::WaveletTransform< ImageType, ImageType, ForwardFilterBank, otb::FORWARD >
FilterType;
FilterType::Pointer filter = FilterType::New();
@@ -64,9 +64,9 @@ int otbWaveletTransform( int argc, char * argv[] )
filter->Update();
/* Inverse Transformation */
- typedef otb::WaveletOperator< wvltID, otb::INVERSE, PixelType, Dimension >
+ typedef otb::WaveletOperator< wvltID, otb::INVERSE, PixelType, Dimension >
InverseWaveletOperator;
- typedef otb::WaveletFilterBank< ImageType, ImageType, InverseWaveletOperator, otb::INVERSE >
+ typedef otb::WaveletFilterBank< ImageType, ImageType, InverseWaveletOperator, otb::INVERSE >
InverseFilterBank;
typedef otb::WaveletTransform< ImageType, ImageType, InverseFilterBank, otb::INVERSE >
InvFilterType;
diff --git a/Testing/Code/MultiScale/otbWaveletTransformNew.cxx b/Testing/Code/MultiScale/otbWaveletTransformNew.cxx
index 6543f4ef3e0e83b90f03be7f3770039966ffa008..60f1f0f58b47b073268c647e3bc970b442046725 100644
--- a/Testing/Code/MultiScale/otbWaveletTransformNew.cxx
+++ b/Testing/Code/MultiScale/otbWaveletTransformNew.cxx
@@ -32,9 +32,9 @@ int otbWaveletTransformNew(int argc, char * argv[])
/* Forward Transformation */
typedef otb::WaveletOperator< wvltID, otb::FORWARD, PixelType, Dimension > WaveletOperator;
- typedef otb::WaveletFilterBank< ImageType, ImageType, WaveletOperator, otb::FORWARD >
+ typedef otb::WaveletFilterBank< ImageType, ImageType, WaveletOperator, otb::FORWARD >
ForwardFilterBank;
- typedef otb::WaveletTransform< ImageType, ImageType, ForwardFilterBank, otb::FORWARD >
+ typedef otb::WaveletTransform< ImageType, ImageType, ForwardFilterBank, otb::FORWARD >
FilterType;
FilterType::Pointer filter = FilterType::New();
diff --git a/Testing/Code/Projections/otbSensorModel.cxx b/Testing/Code/Projections/otbSensorModel.cxx
index 731af78e776ffb50d142c7c83b30e221eecdff84..be69def92c43055335372618432fd641b9c2d1bf 100644
--- a/Testing/Code/Projections/otbSensorModel.cxx
+++ b/Testing/Code/Projections/otbSensorModel.cxx
@@ -59,11 +59,13 @@ int otbSensorModel( int argc, char* argv[] )
typedef otb::ForwardSensorModel<double> ForwardSensorModelType;
ForwardSensorModelType::Pointer forwardSensorModel = ForwardSensorModelType::New();
forwardSensorModel->SetImageGeometry(reader->GetOutput()->GetImageKeywordlist());
-
+ forwardSensorModel->SetAverageElevation(16.19688987731934);
itk::Point<double,2> imagePoint;
- imagePoint[0]=10;
- imagePoint[1]=10;
+// imagePoint[0]=10;
+// imagePoint[1]=10;
+ imagePoint[0]=3069;
+ imagePoint[1]=1218;
itk::Point<double,2> geoPoint;
geoPoint = forwardSensorModel->TransformPoint(imagePoint);
@@ -72,7 +74,7 @@ int otbSensorModel( int argc, char* argv[] )
typedef otb::InverseSensorModel<double> InverseSensorModelType;
InverseSensorModelType::Pointer inverseSensorModel = InverseSensorModelType::New();
inverseSensorModel->SetImageGeometry(reader->GetOutput()->GetImageKeywordlist());
-
+ inverseSensorModel->SetAverageElevation(16.19688987731934);
itk::Point<double,2> reversedImagePoint;
reversedImagePoint = inverseSensorModel->TransformPoint(geoPoint);
diff --git a/Testing/Code/Radiometry/otbTerraSarCalibrationCplxImageFilterTest.cxx b/Testing/Code/Radiometry/otbTerraSarCalibrationCplxImageFilterTest.cxx
index e8f24d2a7cbaf58e37e12abfe5dbfe00dbe1f876..6a5445580ebceb741087618d644c4800e7efbef2 100644
--- a/Testing/Code/Radiometry/otbTerraSarCalibrationCplxImageFilterTest.cxx
+++ b/Testing/Code/Radiometry/otbTerraSarCalibrationCplxImageFilterTest.cxx
@@ -86,7 +86,7 @@ int otbTerraSarCalibrationCplxImageFilterTest(int argc, char * argv[])
filter->SetInput(reader->GetOutput());
writer->SetInput(filter->GetOutput());
- writer->Update();
+ writer->Update();
return EXIT_SUCCESS;
diff --git a/Testing/Code/Radiometry/otbTerraSarCalibrationImageFilterTest.cxx b/Testing/Code/Radiometry/otbTerraSarCalibrationImageFilterTest.cxx
index b3159ed76835aec10ec60b0d543ac581675a7662..5f4c236db93e6a645a10ce1a774d3db16e3d6ee9 100644
--- a/Testing/Code/Radiometry/otbTerraSarCalibrationImageFilterTest.cxx
+++ b/Testing/Code/Radiometry/otbTerraSarCalibrationImageFilterTest.cxx
@@ -84,7 +84,7 @@ int otbTerraSarCalibrationImageFilterTest(int argc, char * argv[])
filter->SetInput(reader->GetOutput());
writer->SetInput(filter->GetOutput());
- writer->Update();
+ writer->Update();
return EXIT_SUCCESS;
diff --git a/Testing/Code/Radiometry/otbTerraSarRadarBrightnessImageFilterTest.cxx b/Testing/Code/Radiometry/otbTerraSarRadarBrightnessImageFilterTest.cxx
index d44780da51d2fc97e33ee1badfe588982a7cd3fa..6cb96b3962b79af494efdeabd2bb2f647329cbe5 100644
--- a/Testing/Code/Radiometry/otbTerraSarRadarBrightnessImageFilterTest.cxx
+++ b/Testing/Code/Radiometry/otbTerraSarRadarBrightnessImageFilterTest.cxx
@@ -53,7 +53,7 @@ int otbTerraSarRadarBrightnessImageFilterTest(int argc, char * argv[])
filter->SetInput(reader->GetOutput());
writer->SetInput(filter->GetOutput());
writer->SetNumberOfStreamDivisions(1);
- writer->Update();
+ writer->Update();
return EXIT_SUCCESS;
}
diff --git a/Testing/Code/Visualization/otbImageViewerEndToEndSingleLayer.cxx b/Testing/Code/Visualization/otbImageViewerEndToEndSingleLayer.cxx
index 990c4a18a59800ebdac32622807d9885dbe39d3c..ce1858e4fc8639654a6e39d32efd39cfbcfda6e6 100644
--- a/Testing/Code/Visualization/otbImageViewerEndToEndSingleLayer.cxx
+++ b/Testing/Code/Visualization/otbImageViewerEndToEndSingleLayer.cxx
@@ -43,7 +43,7 @@ int otbImageViewerEndToEndSingleLayer( int argc, char * argv[] )
const double run = atoi(argv[5]);
- // typedefs
+ // typedefs
typedef double PixelType;
typedef itk::RGBPixel<unsigned char> RGBPixelType;
typedef otb::Image<RGBPixelType,2> OutputImageType;
@@ -154,7 +154,7 @@ int otbImageViewerEndToEndSingleLayer( int argc, char * argv[] )
{
fullWindow.add(view->GetFullWidget());
fullWindow.resizable(view->GetFullWidget());
- fullWindow.show();
+ fullWindow.show();
view->GetFullWidget()->show();
view->GetFullWidget()->resize(0,0,fullSize,fullSize);
}
diff --git a/Testing/Code/Visualization/otbImageViewerEndToEndSingleLayerWithSelectAreaHandler.cxx b/Testing/Code/Visualization/otbImageViewerEndToEndSingleLayerWithSelectAreaHandler.cxx
index c61b5f73e569003d4eec4cea6407651c4a24008b..7b7af77db0920ccce642bcb1ee25ea7eb591ed27 100644
--- a/Testing/Code/Visualization/otbImageViewerEndToEndSingleLayerWithSelectAreaHandler.cxx
+++ b/Testing/Code/Visualization/otbImageViewerEndToEndSingleLayerWithSelectAreaHandler.cxx
@@ -43,7 +43,7 @@ int otbImageViewerEndToEndSingleLayerWithSelectAreaHandler( int argc, char * arg
const unsigned int zoomSize = atoi(argv[4]);
const double run = atoi(argv[5]);
- // typedefs
+ // typedefs
typedef double PixelType;
typedef itk::RGBPixel<unsigned char> RGBPixelType;
typedef otb::Image<RGBPixelType,2> OutputImageType;
@@ -157,7 +157,7 @@ int otbImageViewerEndToEndSingleLayerWithSelectAreaHandler( int argc, char * arg
{
fullWindow.add(view->GetFullWidget());
fullWindow.resizable(view->GetFullWidget());
- fullWindow.show();
+ fullWindow.show();
view->GetFullWidget()->show();
view->GetFullWidget()->resize(0,0,fullSize,fullSize);
}
diff --git a/Testing/Code/Visualization/otbImageViewerEndToEndTwoLayers.cxx b/Testing/Code/Visualization/otbImageViewerEndToEndTwoLayers.cxx
index bda5895a6f32906e3686872343dafb8eb0e06026..c809b604328a601e4cdef115cab08c8772f96936 100644
--- a/Testing/Code/Visualization/otbImageViewerEndToEndTwoLayers.cxx
+++ b/Testing/Code/Visualization/otbImageViewerEndToEndTwoLayers.cxx
@@ -45,7 +45,7 @@ int otbImageViewerEndToEndTwoLayers( int argc, char * argv[] )
const double run = atoi(argv[5]);
- // typedefs
+ // typedefs
typedef double PixelType;
typedef itk::RGBAPixel<unsigned char> RGBPixelType;
typedef otb::Image<RGBPixelType,2> OutputImageType;
@@ -171,7 +171,7 @@ int otbImageViewerEndToEndTwoLayers( int argc, char * argv[] )
{
fullWindow.add(view->GetFullWidget());
fullWindow.resizable(view->GetFullWidget());
- fullWindow.show();
+ fullWindow.show();
view->GetFullWidget()->show();
view->GetFullWidget()->resize(0,0,fullSize,fullSize);
}
diff --git a/Testing/Code/Visualization/otbImageViewerEndToEndWithVectorData.cxx b/Testing/Code/Visualization/otbImageViewerEndToEndWithVectorData.cxx
index 0763207eb2ad93e92fa3c085591e1e4ed4102e7b..a45eff7d8ba1c7beaa1aa572550f3ec9c5372c84 100644
--- a/Testing/Code/Visualization/otbImageViewerEndToEndWithVectorData.cxx
+++ b/Testing/Code/Visualization/otbImageViewerEndToEndWithVectorData.cxx
@@ -52,7 +52,7 @@ int otbImageViewerEndToEndWithVectorData( int argc, char * argv[] )
const double run = atoi(argv[7]);
- // typedefs
+ // typedefs
typedef double PixelType;
typedef itk::RGBPixel<unsigned char> RGBPixelType;
typedef otb::Image<RGBPixelType,2> OutputImageType;
@@ -189,7 +189,7 @@ int otbImageViewerEndToEndWithVectorData( int argc, char * argv[] )
{
fullWindow.add(view->GetFullWidget());
fullWindow.resizable(view->GetFullWidget());
- fullWindow.show();
+ fullWindow.show();
view->GetFullWidget()->show();
view->GetFullWidget()->resize(0,0,fullSize,fullSize);
}
diff --git a/Testing/Code/Visualization/otbImageWidgetController.cxx b/Testing/Code/Visualization/otbImageWidgetController.cxx
index 02b8e50269e231500660aae917e070d3f1992525..ab82dce9463959481e5a957308b40b27c951ac2c 100644
--- a/Testing/Code/Visualization/otbImageWidgetController.cxx
+++ b/Testing/Code/Visualization/otbImageWidgetController.cxx
@@ -32,7 +32,7 @@ int otbImageWidgetController( int argc, char * argv[] )
controller->AddActionHandler(ActionHandlerType::New());
controller->AddActionHandler(ActionHandlerType::New());
- // Clearing
+ // Clearing
controller->ClearAllActionHandlers();
// Adding three handlers again