diff --git a/Code/BasicFilters/otbBinaryImageDensityFunction.txx b/Code/BasicFilters/otbBinaryImageDensityFunction.txx
index c7ac76aab57ec88ff46c8ec8070f5b1fa79cea8c..361d03ae423f3f33fcc44a1d523091643f59cc9a 100644
--- a/Code/BasicFilters/otbBinaryImageDensityFunction.txx
+++ b/Code/BasicFilters/otbBinaryImageDensityFunction.txx
@@ -94,7 +94,7 @@ BinaryImageDensityFunction<TInputImage,TCoordRep>
}
const RealType num = static_cast<RealType>( size );
- var = sum/num ;
+ var = sum/num;
return var;
}
diff --git a/Code/BasicFilters/otbBinaryImageMinimalBoundingRegionCalculator.txx b/Code/BasicFilters/otbBinaryImageMinimalBoundingRegionCalculator.txx
index 3bbb3b7a35c149e3c6699c54173ebcda606457f4..d93c6d13c281dd0fd2c06f865e7486fa15b82a77 100644
--- a/Code/BasicFilters/otbBinaryImageMinimalBoundingRegionCalculator.txx
+++ b/Code/BasicFilters/otbBinaryImageMinimalBoundingRegionCalculator.txx
@@ -70,7 +70,7 @@ BinaryImageMinimalBoundingRegionCalculator<TInputImage>
fit.SetFirstDirection( !axis );
fit.SetSecondDirection( axis );
fit.GoToBegin();
- ;
+
// Walk through the two images line by line
while (!fit.IsAtEnd())
{
diff --git a/Code/BasicFilters/otbChangeLabelImageFilter.h b/Code/BasicFilters/otbChangeLabelImageFilter.h
index 02765eaeee467c6b0816add76d1886aada6f1713..b2b6216ecb0aa305ccdab9c1759eed51728f1ebc 100644
--- a/Code/BasicFilters/otbChangeLabelImageFilter.h
+++ b/Code/BasicFilters/otbChangeLabelImageFilter.h
@@ -97,13 +97,13 @@ public:
out.SetSize(m_NumberOfComponentsPerPixel);
if ( m_ChangeMap.find(A) != m_ChangeMap.end() )
- {
- out = m_ChangeMap[A];
- }
+ {
+ out = m_ChangeMap[A];
+ }
else
- {
- out.Fill(static_cast<ValueType>(A));
- }
+ {
+ out.Fill(static_cast<ValueType>(A));
+ }
return out;
}
@@ -246,13 +246,13 @@ public:
out.SetSize(m_NumberOfComponents);
if ( m_ChangeMap.find(A) != m_ChangeMap.end() )
- {
- return m_ChangeMap[A];
- }
+ {
+ return m_ChangeMap[A];
+ }
else
- {
- out.Fill(static_cast<TOutput::ValueType>(A));
- }
+ {
+ out.Fill(static_cast<TOutput::ValueType>(A));
+ }
}
private:
diff --git a/Code/BasicFilters/otbDecimateImageFilter.h b/Code/BasicFilters/otbDecimateImageFilter.h
index 77bd0591c5a8e7ec8cd15cf3f4fe459ec7861138..20b5dce1da7644c567b4e35fc24b4c755c86d808 100644
--- a/Code/BasicFilters/otbDecimateImageFilter.h
+++ b/Code/BasicFilters/otbDecimateImageFilter.h
@@ -83,7 +83,7 @@ protected:
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.
diff --git a/Code/BasicFilters/otbDecimateImageFilter.txx b/Code/BasicFilters/otbDecimateImageFilter.txx
index 5785390a76f743f69558d46c4308e8b74a158968..89c82940accbc4cfc768a75bce4326f98d837b44 100644
--- a/Code/BasicFilters/otbDecimateImageFilter.txx
+++ b/Code/BasicFilters/otbDecimateImageFilter.txx
@@ -90,7 +90,7 @@ template <class TInputImage, class TOutputImage>
void
DecimateImageFilter< TInputImage, TOutputImage >
::CallCopyInputRegionToOutputRegion
-( OutputImageRegionType & destRegion, const InputImageRegionType & srcRegion )
+( OutputImageRegionType & destRegion, const InputImageRegionType & srcRegion )
{
Superclass::CallCopyInputRegionToOutputRegion( destRegion, srcRegion );
@@ -117,7 +117,7 @@ DecimateImageFilter< TInputImage, TOutputImage >
int threadId)
{
InputImageRegionType inputRegionForThread;
- this->CallCopyOutputRegionToInputRegion( inputRegionForThread, outputRegionForThread );
+ this->CallCopyOutputRegionToInputRegion( inputRegionForThread, outputRegionForThread );
SubsampledImageRegionConstIterator< InputImageType > decimationIterator
( this->GetInput(), inputRegionForThread );
diff --git a/Code/BasicFilters/otbEdgeDetectorImageFilter.h b/Code/BasicFilters/otbEdgeDetectorImageFilter.h
index 3ab70edbe444570c757285f67422ed1ede5a425d..4cfb221879df5373d691743f6831c1f4889e8c7b 100644
--- a/Code/BasicFilters/otbEdgeDetectorImageFilter.h
+++ b/Code/BasicFilters/otbEdgeDetectorImageFilter.h
@@ -42,7 +42,7 @@ public:
/** Standard class typedefs. */
typedef EdgeDetectorImageFilter Self;
- typedef itk::ImageToImageFilter<TInputImage,TOutputImage> Superclass ;
+ typedef itk::ImageToImageFilter<TInputImage,TOutputImage> Superclass;
typedef itk::SmartPointer<Self> Pointer;
typedef itk::SmartPointer<const Self> ConstPointer;
diff --git a/Code/BasicFilters/otbEstimateInnerProductPCAImageFilter.txx b/Code/BasicFilters/otbEstimateInnerProductPCAImageFilter.txx
index 3ea3157e6f1e10178d1b1d4b36d8e0d694f27933..774e1b14c5171b0c215ec1fa0867f2ba10e7ef6f 100644
--- a/Code/BasicFilters/otbEstimateInnerProductPCAImageFilter.txx
+++ b/Code/BasicFilters/otbEstimateInnerProductPCAImageFilter.txx
@@ -116,7 +116,7 @@ EstimateInnerProductPCAImageFilter<TInputImage,TOutputImage>
for(unsigned int img_number = 0; img_number < numberOfTrainingImages; img_number++ )
{
unsigned int indexNumberOfTrainingImages = numberOfTrainingImages-1;
- for( unsigned int vec_number = 0 ; vec_number < m_NumberOfPrincipalComponentsRequired; vec_number++, indexNumberOfTrainingImages-- )
+ for( unsigned int vec_number = 0; vec_number < m_NumberOfPrincipalComponentsRequired; vec_number++, indexNumberOfTrainingImages-- )
{
outputPixel[vec_number] += static_cast<OutputInternalPixelType>( static_cast<double>(inputPixel[img_number]) * static_cast<double>(m_EigenVectorsOfInnerProductMatrix[img_number][indexNumberOfTrainingImages]));
}
diff --git a/Code/BasicFilters/otbSubsampleImageFilter.h b/Code/BasicFilters/otbSubsampleImageFilter.h
index d733edb289af2f9d181f4018f3a3f93223a94aaa..bc0fd11078e0b52be6711256feb450c6dc2d5375 100644
--- a/Code/BasicFilters/otbSubsampleImageFilter.h
+++ b/Code/BasicFilters/otbSubsampleImageFilter.h
@@ -109,7 +109,7 @@ protected:
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.
diff --git a/Code/BasicFilters/otbSubsampleImageFilter.txx b/Code/BasicFilters/otbSubsampleImageFilter.txx
index c77d64eb1f58fed629d9730412d2be1e8ffeacfa..9b6c5fbef7123b4c6ba78ff343d19e05617b33de 100644
--- a/Code/BasicFilters/otbSubsampleImageFilter.txx
+++ b/Code/BasicFilters/otbSubsampleImageFilter.txx
@@ -112,7 +112,7 @@ template <class TInputImage, class TOutputImage,
void
SubsampleImageFilter< TInputImage, TOutputImage, TDirectionOfTransformation >
::CallCopyInputRegionToOutputRegion
-( OutputImageRegionType & destRegion, const InputImageRegionType & srcRegion )
+( OutputImageRegionType & destRegion, const InputImageRegionType & srcRegion )
{
Superclass::CallCopyInputRegionToOutputRegion( destRegion, srcRegion );
@@ -148,7 +148,7 @@ SubsampleImageFilter< TInputImage, TOutputImage, TDirectionOfTransformation >
outputIter.GoToBegin();
InputImageRegionType inputRegionForThread;
- this->CallCopyOutputRegionToInputRegion( inputRegionForThread, outputRegionForThread );
+ this->CallCopyOutputRegionToInputRegion( inputRegionForThread, outputRegionForThread );
SubsampledImageRegionConstIterator< InputImageType > inputIter
( this->GetInput(), inputRegionForThread );
diff --git a/Code/ChangeDetection/otbKullbackLeiblerSupervizedDistanceImageFilter.txx b/Code/ChangeDetection/otbKullbackLeiblerSupervizedDistanceImageFilter.txx
index 75eba8ca44f2be48700e08222ffdb947d30e959f..8bdb9dd65f691a9dc65c41063a254836c1535592 100644
--- a/Code/ChangeDetection/otbKullbackLeiblerSupervizedDistanceImageFilter.txx
+++ b/Code/ChangeDetection/otbKullbackLeiblerSupervizedDistanceImageFilter.txx
@@ -105,7 +105,7 @@ KullbackLeiblerSupervizedDistance< TInput1, TInput2, TInputROIImage, TOutput >
/**
* Connect the training area to build the reference pdfs,
* with parameters to be hold by
- * \doxygen{Functor}{KullbackLeiblerSupervizedDistance}.
+ * Functor::KullbackLeiblerSupervizedDistance.
*
* Images 1 & 2 are supposed to be already connected.
*/
diff --git a/Code/Common/otbDrawLineSpatialObjectListFilter.txx b/Code/Common/otbDrawLineSpatialObjectListFilter.txx
index d0937e11599a21e1440cf7ffa0bf2466b56aec9e..166296d9a4749d148f37fb8d9a25ab68a88694b8 100644
--- a/Code/Common/otbDrawLineSpatialObjectListFilter.txx
+++ b/Code/Common/otbDrawLineSpatialObjectListFilter.txx
@@ -83,7 +83,7 @@ DrawLineSpatialObjectListFilter<TInputImage, TOutputImage>
outputIt.GoToBegin();
inputIt.GoToBegin();
- for (outputIt.GoToBegin(); !outputIt.IsAtEnd() ; ++outputIt,++inputIt)
+ for (outputIt.GoToBegin(); !outputIt.IsAtEnd(); ++outputIt,++inputIt)
outputIt.Set( static_cast<OutputPixelType>(inputIt.Get()) );
/** Draw the lines in the output image using lineIterator*/
diff --git a/Code/Common/otbQuickLookImageGenerator.h b/Code/Common/otbQuickLookImageGenerator.h
index 2a42e074ddaeed6b3d6cdde8280b8560e445e4df..59da438d10e0a01baa271664c1a50af45bb29a49 100755
--- a/Code/Common/otbQuickLookImageGenerator.h
+++ b/Code/Common/otbQuickLookImageGenerator.h
@@ -71,9 +71,9 @@ public:
{
m_UseImageSpacing = boo;
if (boo)
- m_GaussianFilter->SetUseImageSpacingOn();
+ m_GaussianFilter->SetUseImageSpacingOn();
else
- m_GaussianFilter->SetUseImageSpacingOff();
+ m_GaussianFilter->SetUseImageSpacingOff();
this->Modified();
}
diff --git a/Code/Common/otbSubsampledImageRegionConstIterator.h b/Code/Common/otbSubsampledImageRegionConstIterator.h
index 2d394d3d037768ce512e0e8fc60061181a627ff5..85e1c827bef57b30816bd284b47535baeaa466ee 100644
--- a/Code/Common/otbSubsampledImageRegionConstIterator.h
+++ b/Code/Common/otbSubsampledImageRegionConstIterator.h
@@ -39,11 +39,11 @@ namespace otb {
*/
template < class TImage >
class ITK_EXPORT SubsampledImageRegionConstIterator
- : public itk::ImageRegionConstIterator< TImage >
+ : public itk::ImageRegionConstIterator< TImage >
{
public:
/** Standard typedef. */
- typedef SubsampledImageRegionConstIterator Self;
+ typedef SubsampledImageRegionConstIterator Self;
typedef itk::ImageRegionConstIterator<TImage> Superclass;
/** Run-time type information (and related methods). */
diff --git a/Code/Common/otbSubsampledImageRegionIterator.h b/Code/Common/otbSubsampledImageRegionIterator.h
index f83a6d81400a3fd478b32ecf0930848cdeccdf24..91a3c611d11525e49c236f57a7e2cbe93fbe4d16 100644
--- a/Code/Common/otbSubsampledImageRegionIterator.h
+++ b/Code/Common/otbSubsampledImageRegionIterator.h
@@ -39,11 +39,11 @@ namespace otb {
*/
template < class TImage >
class ITK_EXPORT SubsampledImageRegionIterator
- : public SubsampledImageRegionConstIterator< TImage >
+ : public SubsampledImageRegionConstIterator< TImage >
{
public:
/** Standard typedef. */
- typedef SubsampledImageRegionIterator Self;
+ typedef SubsampledImageRegionIterator Self;
typedef SubsampledImageRegionConstIterator< TImage > Superclass;
/** Run-time type information (and related methods). */
diff --git a/Code/FeatureExtraction/otbImageFittingPolygonListFilter.h b/Code/FeatureExtraction/otbImageFittingPolygonListFilter.h
index 86345016aa91081e2ab426f7bbdf15e65576d6ec..8303e1826aa5fa06818c65e9518335337be2b43a 100644
--- a/Code/FeatureExtraction/otbImageFittingPolygonListFilter.h
+++ b/Code/FeatureExtraction/otbImageFittingPolygonListFilter.h
@@ -27,7 +27,7 @@ namespace otb
/** \class ImageFittingPolygonListFilter
* \brief Slightly deform polygon to reach higher enery from the image
*
- * <br>Limitations:</br> This filter is currently working with integer position
+ * <b>Limitations:</b> This filter is currently working with integer position
* for the polygon vertices. It should be optimized for continuous positions.
*
*/
diff --git a/Code/FeatureExtraction/otbImageToSIFTKeyPointSetFilter.h b/Code/FeatureExtraction/otbImageToSIFTKeyPointSetFilter.h
index afab59bf63bcc636e259c8f50ef5c508387c98bb..e35c7e5d982036697d7b9f3adab2b81682fd09bf 100644
--- a/Code/FeatureExtraction/otbImageToSIFTKeyPointSetFilter.h
+++ b/Code/FeatureExtraction/otbImageToSIFTKeyPointSetFilter.h
@@ -230,7 +230,7 @@ protected:
/** Compute differenec of gaussian
*
- * \param input, current input in process
+ * \param input current input in process
*/
void ComputeDifferenceOfGaussian(InputImagePointerType input);
@@ -258,7 +258,7 @@ protected:
* \param currentScale iterator
* \param previousScale iterator
* \param nextScale iterator
- * \param offset pixel location
+ * \param solution
*
* \return true if key point is accepted, false otherwise
*/
diff --git a/Code/FeatureExtraction/otbKeyPointSetsMatchingFilter.h b/Code/FeatureExtraction/otbKeyPointSetsMatchingFilter.h
index 0e02157280bbde407f6439eef0f4fbd760670cbb..666861990006d5a2333957362a868013d817ecf5 100644
--- a/Code/FeatureExtraction/otbKeyPointSetsMatchingFilter.h
+++ b/Code/FeatureExtraction/otbKeyPointSetsMatchingFilter.h
@@ -30,7 +30,7 @@ namespace otb
*
* The matching criteria is that the ratio between the distance to the first nearest neighbor and the
* second nearest neighbor is lower than the distance threshold. The distance used can be set via the TDistance
- * template parameters. It has to implement the Evaluate() method (see \doxygen{EuclideanDistance} for more details).
+ * template parameters. It has to implement the Evaluate() method (see EuclideanDistance for more details).
*
* By default, the algorithm tries to match points from pointset 1 to points from pointset 2. If back matching is activated,
* it will aslo try to match points from pointset 2 to points from pointset 2, and discard matches that do not appear both in
diff --git a/Code/FeatureExtraction/otbLineSegmentDetector.txx b/Code/FeatureExtraction/otbLineSegmentDetector.txx
index e56aa7f6005c9483532a4431cbc546492864f4b5..856076bf4fb3811711d7546dbc2320e434b20301 100644
--- a/Code/FeatureExtraction/otbLineSegmentDetector.txx
+++ b/Code/FeatureExtraction/otbLineSegmentDetector.txx
@@ -165,24 +165,24 @@ LineSegmentDetector<TInputImage,TPrecision >
/** Computing the length of the bins*/
unsigned int NbBin = 10;
- double lengthBin = static_cast<double>((max - min))/static_cast<double>(NbBin-1) ;
+ double lengthBin = static_cast<double>((max - min))/static_cast<double>(NbBin-1);
CoordinateHistogramType tempHisto(NbBin); /** Initializing the histogram */
itk::ImageRegionIterator<OutputImageType> it(modulusImage,
- modulusImage->GetRequestedRegion());
+ modulusImage->GetRequestedRegion());
it.GoToBegin();
while(!it.IsAtEnd())
{
OutputIndexType index = it.GetIndex();
if(static_cast<int>(index[0]) > 0 && static_cast<int>(index[0]) < m_Width-1
- && static_cast<int>(index[1]) >0 && static_cast<int>(index[1]) < m_Length-1 )
- {
- unsigned int bin = static_cast<unsigned int> (it.Value()/lengthBin);
- if( it.Value()- m_Threshold >1e-10 )
- tempHisto[NbBin-bin-1].push_back(it.GetIndex());
- }
+ && static_cast<int>(index[1]) >0 && static_cast<int>(index[1]) < m_Length-1 )
+ {
+ unsigned int bin = static_cast<unsigned int> (it.Value()/lengthBin);
+ if( it.Value()- m_Threshold >1e-10 )
+ tempHisto[NbBin-bin-1].push_back(it.GetIndex());
+ }
++it;
}
@@ -207,16 +207,16 @@ LineSegmentDetector<TInputImage, TPrecision>
{
typename IndexVectorType::iterator ItIndexVector = (*ItCoordinateList).begin();
while(ItIndexVector != (*ItCoordinateList).end())
- {
- InputIndexType index = *ItIndexVector;
-
- /** If the point is not yet computed */
- if(!this->IsUsed(index))
- {
- this->GrowRegion(index);
- }
- ++ItIndexVector;
- }
+ {
+ InputIndexType index = *ItIndexVector;
+
+ /** If the point is not yet computed */
+ if(!this->IsUsed(index))
+ {
+ this->GrowRegion(index);
+ }
+ ++ItIndexVector;
+ }
++ItCoordinateList;
}
@@ -260,23 +260,23 @@ LineSegmentDetector<TInputImage, TPrecision>
* Here we start building the OUTPUT :a LineSpatialObjectList.
*/
if(NFA > 0./** eps */)
- {
- //std::cout << (*itRec)[0] << " " << (*itRec)[1] << " " << (*itRec)[2] << " " << (*itRec)[3]<<std::endl;
- PointListType pointList;
- PointType point;
-
- point.SetPosition(static_cast<TPrecision>((*itRec)[0]),static_cast<TPrecision>((*itRec)[1]));
- pointList.push_back(point);
- point.SetPosition(static_cast<TPrecision>((*itRec)[2]),static_cast<TPrecision>((*itRec)[3]));
- pointList.push_back(point);
-
- typename LineSpatialObjectType::Pointer line = LineSpatialObjectType::New();
- line->SetId(0);
- line->SetPoints( pointList );
- line->ComputeBoundingBox();
- m_LineList->push_back(line);
- pointList.clear();
- }
+ {
+ //std::cout << (*itRec)[0] << " " << (*itRec)[1] << " " << (*itRec)[2] << " " << (*itRec)[3]<<std::endl;
+ PointListType pointList;
+ PointType point;
+
+ point.SetPosition(static_cast<TPrecision>((*itRec)[0]),static_cast<TPrecision>((*itRec)[1]));
+ pointList.push_back(point);
+ point.SetPosition(static_cast<TPrecision>((*itRec)[2]),static_cast<TPrecision>((*itRec)[3]));
+ pointList.push_back(point);
+
+ typename LineSpatialObjectType::Pointer line = LineSpatialObjectType::New();
+ line->SetId(0);
+ line->SetPoints( pointList );
+ line->ComputeBoundingBox();
+ m_LineList->push_back(line);
+ pointList.clear();
+ }
++itRec;
}
@@ -333,8 +333,8 @@ LineSegmentDetector<TInputImage, TPrecision>
if( nfa_new > NFA )
{
NFA = nfa_new;
- CopyRectangle(rec ,&r );
- }
+ CopyRectangle(rec ,&r );
+ }
}
@@ -351,8 +351,8 @@ LineSegmentDetector<TInputImage, TPrecision>
if( nfa_new > NFA )
{
NFA = nfa_new;
- CopyRectangle(rec ,&r );
- }
+ CopyRectangle(rec ,&r );
+ }
}
if( NFA > 0. ) return NFA;
@@ -362,19 +362,19 @@ LineSegmentDetector<TInputImage, TPrecision>
{
if( (r[4] - delta) >= 0.5 )
{
- r[0] += -vcl_sin(r[5]) * delta_2;
- r[1] += vcl_cos(r[5])* delta_2;
- r[2] += -vcl_sin(r[5])* delta_2;
- r[3] += vcl_cos(r[5])* delta_2;
- r[4] -= delta;
-
- nfa_new = this->ComputeRectNFA(r);
- if( nfa_new > NFA )
- {
- NFA = nfa_new;
- CopyRectangle(rec ,&r );
- }
- }
+ r[0] += -vcl_sin(r[5]) * delta_2;
+ r[1] += vcl_cos(r[5])* delta_2;
+ r[2] += -vcl_sin(r[5])* delta_2;
+ r[3] += vcl_cos(r[5])* delta_2;
+ r[4] -= delta;
+
+ nfa_new = this->ComputeRectNFA(r);
+ if( nfa_new > NFA )
+ {
+ NFA = nfa_new;
+ CopyRectangle(rec ,&r );
+ }
+ }
}
if( NFA > 0. ) return NFA;
@@ -383,19 +383,19 @@ LineSegmentDetector<TInputImage, TPrecision>
{
if( (r[4] - delta) >= 0.5 )
{
- r[0] -= -vcl_sin(r[5]) * delta_2;
- r[1] -= vcl_cos(r[5])* delta_2;
- r[2] -= -vcl_sin(r[5])* delta_2;
- r[3] -= vcl_cos(r[5])* delta_2;
- r[4] -= delta;
-
- nfa_new = this->ComputeRectNFA(r);
- if( nfa_new > NFA )
- {
- NFA = nfa_new;
- CopyRectangle(rec ,&r );
- }
- }
+ r[0] -= -vcl_sin(r[5]) * delta_2;
+ r[1] -= vcl_cos(r[5])* delta_2;
+ r[2] -= -vcl_sin(r[5])* delta_2;
+ r[3] -= vcl_cos(r[5])* delta_2;
+ r[4] -= delta;
+
+ nfa_new = this->ComputeRectNFA(r);
+ if( nfa_new > NFA )
+ {
+ NFA = nfa_new;
+ CopyRectangle(rec ,&r );
+ }
+ }
}
if( NFA > 0. ) return NFA;
@@ -408,9 +408,9 @@ LineSegmentDetector<TInputImage, TPrecision>
nfa_new = this->ComputeRectNFA(r);
if( nfa_new > NFA )
{
- NFA = nfa_new;
- CopyRectangle(rec ,&r );
- }
+ NFA = nfa_new;
+ CopyRectangle(rec ,&r );
+ }
}
if( NFA > 0. ) return NFA;
@@ -433,7 +433,7 @@ LineSegmentDetector<TInputImage, TPrecision>
typename NeighborhoodLabelIteratorType::SizeType radiusLabel;
radiusLabel.Fill(0);
NeighborhoodLabelIteratorType itLabel(radiusLabel,m_UsedPointImage,
- m_UsedPointImage->GetRequestedRegion());
+ m_UsedPointImage->GetRequestedRegion());
itLabel.SetLocation(index);
if(*(itLabel.GetCenterValue()) == 1)
@@ -456,7 +456,7 @@ LineSegmentDetector<TInputImage, TPrecision>
typename NeighborhoodLabelIteratorType::SizeType radiusLabel;
radiusLabel.Fill(0);
NeighborhoodLabelIteratorType itLabel(radiusLabel,m_UsedPointImage,
- m_UsedPointImage->GetRequestedRegion());
+ m_UsedPointImage->GetRequestedRegion());
itLabel.SetLocation(index);
itLabel.SetCenterPixel(1); // 1 : Set the point status to : Used Point
}
@@ -479,9 +479,9 @@ LineSegmentDetector<TInputImage, TPrecision>
typename NeighborhoodIteratorType::SizeType radius;
radius.Fill(1);
NeighborhoodIteratorType itNeigh(radius,m_MagnitudeFilter->GetOutput(),
- m_MagnitudeFilter->GetOutput()->GetRequestedRegion());
+ m_MagnitudeFilter->GetOutput()->GetRequestedRegion());
NeighborhoodIteratorType itNeighDir(radius,m_OrientationFilter->GetOutput() ,
- m_OrientationFilter->GetOutput()->GetRequestedRegion());
+ m_OrientationFilter->GetOutput()->GetRequestedRegion());
/** Vector where to store the point belonging to the current region*/
unsigned int neighSize = itNeigh.GetSize()[0]*itNeigh.GetSize()[1];
@@ -498,7 +498,7 @@ LineSegmentDetector<TInputImage, TPrecision>
/**
* Loop for searching regions
*/
- for (unsigned int cpt = 0; cpt < reg.size() ; cpt++ )
+ for (unsigned int cpt = 0; cpt < reg.size(); cpt++ )
{
itNeigh.SetLocation(reg[cpt]);
itNeighDir.SetLocation(reg[cpt]);
@@ -508,20 +508,20 @@ LineSegmentDetector<TInputImage, TPrecision>
unsigned int s = 0;
while(s < neighSize )
- {
- InputIndexType NeighIndex = itNeigh.GetIndex(s);
- double angleComp = itNeighDir.GetPixel(s);
-
- if( !this->IsUsed(NeighIndex) && this->IsAligned(angleComp, regionAngle, m_Prec) )
- {
- if(this->GetInput()->GetRequestedRegion().IsInside(NeighIndex)) /** Check if the index is inside the image*/
- {
- this->SetPixelToUsed(NeighIndex);
- reg.push_back(NeighIndex);
- }
- }
- s++;
- }
+ {
+ InputIndexType NeighIndex = itNeigh.GetIndex(s);
+ double angleComp = itNeighDir.GetPixel(s);
+
+ if( !this->IsUsed(NeighIndex) && this->IsAligned(angleComp, regionAngle, m_Prec) )
+ {
+ if(this->GetInput()->GetRequestedRegion().IsInside(NeighIndex)) /** Check if the index is inside the image*/
+ {
+ this->SetPixelToUsed(NeighIndex);
+ reg.push_back(NeighIndex);
+ }
+ }
+ s++;
+ }
}/** End Searching loop*/
/** Store the region*/
@@ -572,7 +572,7 @@ LineSegmentDetector<TInputImage, TPrecision>
typename NeighborhoodIteratorType::SizeType radius;
radius.Fill(0);
NeighborhoodIteratorType itNeigh(radius,m_MagnitudeFilter->GetOutput(),
- m_MagnitudeFilter->GetOutput()->GetRequestedRegion());
+ m_MagnitudeFilter->GetOutput()->GetRequestedRegion());
/** Computing the center of the rectangle*/
IndexVectorIteratorType it = region.begin();
@@ -591,8 +591,8 @@ LineSegmentDetector<TInputImage, TPrecision>
}
else
{
- x/= sumWeight ;
- y/= sumWeight ;
+ x/= sumWeight;
+ y/= sumWeight;
}
/** Compute the orientation of the region*/
@@ -632,7 +632,7 @@ LineSegmentDetector<TInputImage, TPrecision>
double s = 0.;
int i = 0;
- for( s=0.0,i = static_cast<int>(l_min); s<sum_th && i<=static_cast<int>(l_max) ; i++)
+ for( s=0.0,i = static_cast<int>(l_min); s<sum_th && i<=static_cast<int>(l_max); i++)
s += sum_l[ Diagonal + i];
double lb = (static_cast<double>(i-1) - 0.5 );
@@ -703,7 +703,7 @@ LineSegmentDetector<TInputImage, TPrecision>
typename NeighborhoodIteratorType::SizeType radius;
radius.Fill(0);
NeighborhoodIteratorType itNeigh(radius,m_MagnitudeFilter->GetOutput(),
- m_MagnitudeFilter->GetOutput()->GetRequestedRegion());
+ m_MagnitudeFilter->GetOutput()->GetRequestedRegion());
/** Computing the center iof the rectangle*/
IndexVectorIteratorType it = region.begin();
@@ -732,7 +732,7 @@ LineSegmentDetector<TInputImage, TPrecision>
Inertie[1][0] =Ixy;
typedef itk::SymmetricEigenAnalysis<MatrixType,MatrixEigenType> EigenAnalysisType;
- EigenAnalysisType eigenFilter(2) ;
+ EigenAnalysisType eigenFilter(2);
eigenFilter.ComputeEigenValuesAndVectors(Inertie,eigenMatrix,eigenVector );
theta = vcl_atan2(eigenVector[1][1], -eigenVector[1][0]);
@@ -791,14 +791,14 @@ LineSegmentDetector<TInputImage, TPrecision>
// RectangleType X(4,0.) , Y(4,0.);
-// X[0] = rec[0] + dy* halfWidth ;
-// Y[0] = rec[1] - dx* halfWidth ;
-// X[1] = rec[0] - dy* halfWidth ;
-// Y[1] = rec[1] + dx* halfWidth ;
-// X[2] = rec[2] + dy* halfWidth ;
-// Y[2] = rec[3] - dx* halfWidth ;
-// X[3] = rec[2] - dy* halfWidth ;
-// Y[3] = rec[3] + dx* halfWidth ;
+// X[0] = rec[0] + dy* halfWidth;
+// Y[0] = rec[1] - dx* halfWidth;
+// X[1] = rec[0] - dy* halfWidth;
+// Y[1] = rec[1] + dx* halfWidth;
+// X[2] = rec[2] + dy* halfWidth;
+// Y[2] = rec[3] - dx* halfWidth;
+// X[3] = rec[2] - dy* halfWidth;
+// Y[3] = rec[3] + dx* halfWidth;
/** Compute the NFA of the rectangle
@@ -834,12 +834,12 @@ LineSegmentDetector<TInputImage, TPrecision>
while(!it.IsAtEnd())
{
if( rectangle->IsInside( it.GetIndex()) && m_OrientationFilter->GetOutput()->GetRequestedRegion().IsInside( it.GetIndex()) )
- {
- pts++;
+ {
+ pts++;
- if(this->IsAligned(it.Get(), rec[5] /*theta*/ ,rec[6] /*Prec*/))
- NbAligned++;
- }
+ if(this->IsAligned(it.Get(), rec[5] /*theta*/ ,rec[6] /*Prec*/))
+ NbAligned++;
+ }
++it;
}
@@ -946,8 +946,8 @@ LineSegmentDetector<TInputImage, TPrecision>
{
double x,y,tmp,ser;
static double cof[6]={76.18009172947146,-86.50532032941677,
- 24.01409824083091,-1.231739572450155,
- 0.1208650973866179e-2,-0.5395239384953e-5};
+ 24.01409824083091,-1.231739572450155,
+ 0.1208650973866179e-2,-0.5395239384953e-5};
int j;
y=x=xx;
diff --git a/Code/FeatureExtraction/otbRegionImageToRectangularPathListFilter.h b/Code/FeatureExtraction/otbRegionImageToRectangularPathListFilter.h
index c5d321eff7ef534e3ab1e463606f618430796897..dd7e4b3c5b62163e92b589dafe1f2bae8f4bbf5c 100644
--- a/Code/FeatureExtraction/otbRegionImageToRectangularPathListFilter.h
+++ b/Code/FeatureExtraction/otbRegionImageToRectangularPathListFilter.h
@@ -107,9 +107,9 @@ protected:
virtual void GenerateOutputInformation(){}; // do nothing
virtual void GenerateData();
- double m_MinimumFit;
- double m_MinimumSize;
- int m_CrossTermFormula;
+ double m_MinimumFit;
+ double m_MinimumSize;
+ int m_CrossTermFormula;
virtual void PrintSelf(std::ostream& os, itk::Indent indent) const;
diff --git a/Code/FeatureExtraction/otbRegionImageToRectangularPathListFilter.txx b/Code/FeatureExtraction/otbRegionImageToRectangularPathListFilter.txx
index 7be26767d0c3b86f5aba42fa45154c9ec031a3bd..8f03e4d12e89bc60654a4846c98943c7fe89ae7a 100644
--- a/Code/FeatureExtraction/otbRegionImageToRectangularPathListFilter.txx
+++ b/Code/FeatureExtraction/otbRegionImageToRectangularPathListFilter.txx
@@ -140,7 +140,7 @@ RegionImageToRectangularPathListFilter<TInputImage,TOutputPath>
try {
OutputPath->Clear();
- for (nit.GoToBegin(), pixelCount = 0; ! nit.IsAtEnd() ; ++nit) {
+ for (nit.GoToBegin(), pixelCount = 0; ! nit.IsAtEnd(); ++nit) {
pixelCount++;
if (pixelCount <= pixelDebugNumber) {
std::cout << "Pixel #" << pixelCount << " : " << nit.GetCenterPixel() << std::endl;
@@ -159,30 +159,30 @@ RegionImageToRectangularPathListFilter<TInputImage,TOutputPath>
}
// Collect all pixels in same region (same value), reachable in 4-connectivity
for (regionIterator = regionContainer.begin(); regionIterator != /*<*/ regionContainer.end(); ++regionIterator /* regionContainer grows within loop */) {
- // add neighbors not yet processed, until whole region has been collected (no "new" neighbor)
- explorerIndex = *regionIterator;
- nit2.SetLocation(explorerIndex);
- if (pixelCount <= pixelDebugNumber)
- std::cout << "Exploring neighbors of " << explorerIndex << std::endl;
-
- for (neighbor = 1; neighbor <= 7; neighbor += 2)
- if (nit2.GetPixel(neighbor) == regionValue) { // ZZ and not yet processed...
- mit.SetIndex(nit2.GetIndex(neighbor));
- if (mit.Get() == maxValue) { // pixel not yet processed
- mit.Set(zeroValue);
- regionContainer.push_back(nit2.GetIndex(neighbor));
- if (pixelCount <= pixelDebugNumber) {
- std::cout << "Adding " << nit2.GetIndex(neighbor) << std::endl;
- std::cout << "Added " << regionContainer.back() << std::endl;
- }
- }
- }
+ // add neighbors not yet processed, until whole region has been collected (no "new" neighbor)
+ explorerIndex = *regionIterator;
+ nit2.SetLocation(explorerIndex);
+ if (pixelCount <= pixelDebugNumber)
+ std::cout << "Exploring neighbors of " << explorerIndex << std::endl;
+
+ for (neighbor = 1; neighbor <= 7; neighbor += 2)
+ if (nit2.GetPixel(neighbor) == regionValue) { // ZZ and not yet processed...
+ mit.SetIndex(nit2.GetIndex(neighbor));
+ if (mit.Get() == maxValue) { // pixel not yet processed
+ mit.Set(zeroValue);
+ regionContainer.push_back(nit2.GetIndex(neighbor));
+ if (pixelCount <= pixelDebugNumber) {
+ std::cout << "Adding " << nit2.GetIndex(neighbor) << std::endl;
+ std::cout << "Added " << regionContainer.back() << std::endl;
+ }
+ }
+ }
}
if (pixelCount <= pixelDebugNumber) {
std::cout << "Region queue (" << regionContainer.size() << " elements) : " << std::endl;
- for (regionIterator = regionContainer.begin(); regionIterator != regionContainer.end(); ++regionIterator)
- std::cout << *regionIterator;
- std::cout << std::endl;
+ for (regionIterator = regionContainer.begin(); regionIterator != regionContainer.end(); ++regionIterator)
+ std::cout << *regionIterator;
+ std::cout << std::endl;
}
// Compute variance-covariance matrix of x-y coordinates of region pixels
@@ -221,61 +221,61 @@ RegionImageToRectangularPathListFilter<TInputImage,TOutputPath>
// Compute eigenvalues and eigenvectors of variance-covariance matrix (for DIRECTION)
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 */
- alpha /* main direction */ ;
+ 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 */
+ alpha /* main direction */;
delta = (varX - varY) * (varX - varY) + 4 * covarXY * covarXY;
l1 = (varX + varY + vcl_sqrt(delta)) / 2;
l2 = (varX + varY - vcl_sqrt(delta)) / 2;
- if (covarXY != 0.0) { // ZZ or larger than a small epsilon ? (eg 10^(-15)...)
+ if (covarXY != 0.0) { // ZZ or larger than a small epsilon ? (eg 10^(-15)...)
y1 = (l1 - varX) / covarXY; // for x1 = 1
y2 = (l2 - varX) / covarXY; // for x2 = 1
} else { // matrix was already diagonal
- y1 = 0;
- x2 = 0;
- y2 = 1;
+ y1 = 0;
+ x2 = 0;
+ y2 = 1;
}
// Compute eigenvalues and eigenvectors of absolute mean deviation matrix (for PROPORTIONS)
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 */
+ 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 */
adelta = (adevX - adevY) * (adevX - adevY) + 4 * adevXY * adevXY;
al1 = (adevX + adevY + vcl_sqrt(adelta)) / 2;
al2 = (adevX + adevY - vcl_sqrt(adelta)) / 2;
- if (adevXY != 0.0) { // ZZ or larger than a small epsilon ? (eg 10^(-15)...)
+ if (adevXY != 0.0) { // ZZ or larger than a small epsilon ? (eg 10^(-15)...)
ay1 = (al1 - adevX) / adevXY; // for x1 = 1
ay2 = (al2 - adevX) / adevXY; // for x2 = 1
} else { // matrix was already diagonal
- ay1 = 0;
- ax2 = 0;
- ay2 = 1;
+ ay1 = 0;
+ ax2 = 0;
+ ay2 = 1;
}
if (y1 != 0)
alpha = vcl_atan(1 / y1) * 180 / vnl_math::pi;
else
- alpha = 90;
+ alpha = 90;
if (alpha < 0)
- alpha += 180; // Conventionnaly given as a value between 0 and 180�
+ alpha += 180; // Conventionnaly given as a value between 0 and 180�
// Compute equivalent length and width (based on equal area criterion)
double length, width;
if (al2 != 0) {
- length = vcl_sqrt(vcl_fabs(al1 / al2) * n);
- //length = vcl_sqrt(l1 / l2 * n);
+ length = vcl_sqrt(vcl_fabs(al1 / al2) * n);
+ //length = vcl_sqrt(l1 / l2 * n);
if (al1 != 0)
- width = vcl_fabs(al2 / al1) * length;
- else { // l1 == 0 and l2 == 0
- length = width = vcl_sqrt(n); // should happen only when n == 1 anyway
- }
+ width = vcl_fabs(al2 / al1) * length;
+ else { // l1 == 0 and l2 == 0
+ length = width = vcl_sqrt(n); // should happen only when n == 1 anyway
+ }
} else {
- length = n; // Arbitrary representation for degenerate case
- width = 1;
+ length = n; // Arbitrary representation for degenerate case
+ width = 1;
}
// Normalize eigenvectors (for following tests)
@@ -314,27 +314,27 @@ RegionImageToRectangularPathListFilter<TInputImage,TOutputPath>
int countWithin = 0; // number of pixels contained within rectangle
for (regionIterator = regionContainer.begin(); regionIterator != regionContainer.end(); ++regionIterator) {
explorerIndex = *regionIterator;
- vx = explorerIndex[0] - avgX;
- vy = explorerIndex[1] - avgY;
- if (vcl_fabs(vx * x1 + vy * y1) <= halfLength
- && vcl_fabs(vx * x2 + vy * y2) <= halfWidth)
- countWithin ++;
+ vx = explorerIndex[0] - avgX;
+ vy = explorerIndex[1] - avgY;
+ if (vcl_fabs(vx * x1 + vy * y1) <= halfLength
+ && vcl_fabs(vx * x2 + vy * y2) <= halfWidth)
+ countWithin ++;
}
if (regionCount <= regionDebugNumber) {
- std::cout << std::endl << "Region " << regionCount << " (area = " << n << " pixels)" << std::endl;
- std::cout << "sumX = " << sumX << " ; sumY = " << sumY << " ; sumX2 = " << sumX2 << " ; sumY2 = " << sumY2 << " ; sumXY = " << sumXY << std::endl;
- std::cout << "avgX = " << avgX << " ; avgY = " << avgY << std::endl;
- std::cout << "varX = " << varX << " ; varY = " << varY << " ; covarXY = " << covarXY << std::endl;
- std::cout << "adevX = " << adevX << " ; adevY = " << adevY << " ; adevXY = " << adevXY << std::endl;
+ std::cout << std::endl << "Region " << regionCount << " (area = " << n << " pixels)" << std::endl;
+ std::cout << "sumX = " << sumX << "; sumY = " << sumY << "; sumX2 = " << sumX2 << "; sumY2 = " << sumY2 << "; sumXY = " << sumXY << std::endl;
+ std::cout << "avgX = " << avgX << "; avgY = " << avgY << std::endl;
+ std::cout << "varX = " << varX << "; varY = " << varY << "; covarXY = " << covarXY << std::endl;
+ std::cout << "adevX = " << adevX << "; adevY = " << adevY << "; adevXY = " << adevXY << std::endl;
std::cout << "crossTermAXY = " << crossTermAXY << std::endl;
- std::cout << "eigenvalue 1 = " << l1 << " ; eigenvalue 2 = " << l2 << std::endl;
- std::cout << "eigenvector 1 = [" << x1 << ", " << y1 << "] ; eigenvector 2 = [" << x2 << ", " << y2 << "]" << std::endl;
- std::cout << "A-eigenvalue 1 = " << al1 << " ; A-eigenvalue 2 = " << al2 << std::endl;
- std::cout << "A-eigenvector 1 = [" << ax1 << ", " << ay1 << "] ; A-eigenvector 2 = [" << ax2 << ", " << ay2 << "]" << std::endl;
- std::cout << "length = " << length << " ; width = " << width << std::endl;
- std::cout << "main direction = " << alpha << "�" << std::endl;
- std::cout << "rectangular fit = " << (float) countWithin / n << std::endl;
+ std::cout << "eigenvalue 1 = " << l1 << "; eigenvalue 2 = " << l2 << std::endl;
+ std::cout << "eigenvector 1 = [" << x1 << ", " << y1 << "]; eigenvector 2 = [" << x2 << ", " << y2 << "]" << std::endl;
+ std::cout << "A-eigenvalue 1 = " << al1 << "; A-eigenvalue 2 = " << al2 << std::endl;
+ std::cout << "A-eigenvector 1 = [" << ax1 << ", " << ay1 << "]; A-eigenvector 2 = [" << ax2 << ", " << ay2 << "]" << std::endl;
+ std::cout << "length = " << length << "; width = " << width << std::endl;
+ std::cout << "main direction = " << alpha << "�" << std::endl;
+ std::cout << "rectangular fit = " << (float) countWithin / n << std::endl;
}
@@ -350,22 +350,22 @@ RegionImageToRectangularPathListFilter<TInputImage,TOutputPath>
point[1] = (avgY + y1 * halfLength + y2 * halfWidth) * spacing[1] + origin[1];
path->AddVertex(point);
if (regionCount <= regionDebugNumber)
- std::cout << "corner 1 : [" << point[0] << ", " << point[1] << "]" << std::endl;
+ std::cout << "corner 1 : [" << point[0] << ", " << point[1] << "]" << std::endl;
point[0] = (avgX - x1 * halfLength + x2 * halfWidth) * spacing[0] + origin[0];
point[1] = (avgY - y1 * halfLength + y2 * halfWidth) * spacing[1] + origin[1];
path->AddVertex(point);
if (regionCount <= regionDebugNumber)
- std::cout << "corner 2 : [" << point[0] << ", " << point[1] << "]" << std::endl;
+ std::cout << "corner 2 : [" << point[0] << ", " << point[1] << "]" << std::endl;
point[0] = (avgX - x1 * halfLength - x2 * halfWidth) * spacing[0] + origin[0];
point[1] = (avgY - y1 * halfLength - y2 * halfWidth) * spacing[1] + origin[1];
path->AddVertex(point);
if (regionCount <= regionDebugNumber)
- std::cout << "corner 3 : [" << point[0] << ", " << point[1] << "]" << std::endl;
+ std::cout << "corner 3 : [" << point[0] << ", " << point[1] << "]" << std::endl;
point[0] = (avgX + x1 * halfLength - x2 * halfWidth) * spacing[0] + origin[0];
point[1] = (avgY + y1 * halfLength - y2 * halfWidth) * spacing[1] + origin[1];
path->AddVertex(point);
if (regionCount <= regionDebugNumber)
- std::cout << "corner 4 : [" << point[0] << ", " << point[1] << "]" << std::endl;
+ std::cout << "corner 4 : [" << point[0] << ", " << point[1] << "]" << std::endl;
point[0] = (avgX + x1 * halfLength + x2 * halfWidth) * spacing[0] + origin[0];
point[1] = (avgY + y1 * halfLength + y2 * halfWidth) * spacing[1] + origin[1];
path->AddVertex(point);
@@ -373,9 +373,9 @@ RegionImageToRectangularPathListFilter<TInputImage,TOutputPath>
path->SetValue((double) countWithin / n);
if ((float) countWithin / n >= m_MinimumFit // keep only rectangles with fit larger than minimumFit
- && n >= m_MinimumSize) { // and size larger than minimumSize
+ && n >= m_MinimumSize) { // and size larger than minimumSize
OutputPath->PushBack(path);
- selectedRegionCount ++;
+ selectedRegionCount ++;
}
}
}
diff --git a/Code/FeatureExtraction/otbSFSTexturesFunctor.h b/Code/FeatureExtraction/otbSFSTexturesFunctor.h
index b21ad5cd9b4251b32cb698dbb583eb58a2c3fc09..eb5b6c5e727fe9bb6e0e910c59a8de4517b25af5 100644
--- a/Code/FeatureExtraction/otbSFSTexturesFunctor.h
+++ b/Code/FeatureExtraction/otbSFSTexturesFunctor.h
@@ -29,16 +29,16 @@ namespace otb
* \brief This functor computes textures based on line direction analysis through the central pixel.
*
* Directions are computed using NumberOfDirection, used to compute a constant step angle.
- * A direction is defined as : $\mathit{d_{i} = \sqrt{(m^{e1}-m{e2})^{2}+(n^{e1}-n{e2})^{2}}}$
- * From $\mathit{d_{i}}, histograms are defined :
- * $\mathit{H(c) : \{c \in I \mid \lbrack d_{1}(c), \ldots , d_{i}(c), \ldots , d_{D}(c)\rbrack \}}$
+ * A direction is defined as : \f$ \mathit{d_{i} = \sqrt{(m^{e1}-m{e2})^{2}+(n^{e1}-n{e2})^{2}}} \f$
+ * From \f$ \mathit{d_{i}} \f$, histograms are defined :
+ * \f$ \mathit{H(c) : \{c \in I \mid \lbrack d_{1}(c), \ldots , d_{i}(c), \ldots , d_{D}(c)\rbrack \}} \f$
* Thus, 6 textures are defined :
- * $\mathit{length = \max_{i \in \lbrack1;D\rbrack}(d_{i}(c)}$
- * $\mathit{width = \min_{i \in \lbrack1;D\rbrack}(d_{i}(c)}$
- * $\mathit{PSI = \frac{1}{D}\sum_{1=1}^{D}d_{i}(c)}$
- * $\mathit{\omega-mean = \frac{1}{D}\sum_{1=1}^{D}\frac{\alpha.(k_{i}-1)}{st_{i}}d_{i}(c)}$
- * $\mathit{ratio = \arctan{\frac{\sum_{j=1}^{n}{sort_{min}^{j}(H(c))}}{\sum_{j=1}^{n}{sort_{max}^{j}(H(c))}}}}$
- * $\mathit{SD = \frac{1}{D-1}\sqrt{\sum_{1=1}^{D}(d_{i}(c)-PSI)^{2}}}$
+ * \f$ \mathit{length = \max_{i \in \lbrack1;D\rbrack}(d_{i}(c)} \f$
+ * \f$ \mathit{width = \min_{i \in \lbrack1;D\rbrack}(d_{i}(c)} \f$
+ * \f$ \mathit{PSI = \frac{1}{D}\sum_{1=1}^{D}d_{i}(c)} \f$
+ * \f$ \mathit{\omega-mean = \frac{1}{D}\sum_{1=1}^{D}\frac{\alpha.(k_{i}-1)}{st_{i}}d_{i}(c)} \f$
+ * \f$ \mathit{ratio = \arctan{\frac{\sum_{j=1}^{n}{sort_{min}^{j}(H(c))}}{\sum_{j=1}^{n}{sort_{max}^{j}(H(c))}}}} \f$
+ * \f$ \mathit{SD = \frac{1}{D-1}\sqrt{\sum_{1=1}^{D}(d_{i}(c)-PSI)^{2}}} \f$
*
* For more details, please refer to refer to Xin Huang, Liangpei Zhang and Pingxiang Li publication,
* Classification and Extraction of Spatial Features in Urban Areas
@@ -46,7 +46,7 @@ namespace otb
* IEEE Geoscience and Remote Sensing Letters,
* vol. 4, n. 2, 2007, pp 260-264
*
- * \ingroup Textures
+ * \ingroup Textures
*/
diff --git a/Code/FeatureExtraction/otbSFSTexturesImageFilter.h b/Code/FeatureExtraction/otbSFSTexturesImageFilter.h
index 4db2d0766688b626173557b12754a67abd7cb178..524cd0f95a15d6072b128642e6a0dc64b0b41ce4 100644
--- a/Code/FeatureExtraction/otbSFSTexturesImageFilter.h
+++ b/Code/FeatureExtraction/otbSFSTexturesImageFilter.h
@@ -38,10 +38,10 @@ namespace otb
* vol. 4, n. 2, 2007, pp 260-264
*
* The texture is computated for each pixel using its neighborhood.
- * User can set the spatial threshold taht is the max line length, the spectral threshold
+ * User can set the spatial threshold that is the max line length, the spectral threshold
* that is the max difference authorized between a pixel of the line and the center pixel
- * of the current neighborhood. Alpha and RationMaxConsideration are used to compute
- * the \omega -mean value. Finally, The number of direction can be precised with
+ * of the current neighborhood. Alpha and RatioMaxConsideration are used to compute
+ * the \f$ \omega \f$ - mean value. Finally, The number of direction can be precised with
* NumberOfDirections.
* You can choose the computed textures using SetTextureStatus method (1:length, 2:width,
* 3:PSI, 4:w-mean, 5:ratio, 6:SD).
diff --git a/Code/IO/otbSHPVectorDataIO.txx b/Code/IO/otbSHPVectorDataIO.txx
index 8314a1e6d3f5a5eb29fe8e704a1c4268a4abd9e2..e9df00f9c85c9af7f14d63d6d746bfcaba91a8f7 100644
--- a/Code/IO/otbSHPVectorDataIO.txx
+++ b/Code/IO/otbSHPVectorDataIO.txx
@@ -773,9 +773,9 @@ void SHPVectorDataIO<TData>::Write(const VectorDataConstPointerType data)
// while (fIt!=ogrFeatures.end())
// {
// if (ogrCurrentLayer->CreateFeature(*fIt) != OGRERR_NONE)
-// {
+// {
// itkExceptionMacro(<<"Failed to create ogr feature in file "<<this->m_FileName);
-// }
+// }
// OGRFeature::DestroyFeature(*fIt);
// ++fIt;
// }
diff --git a/Code/Learning/otbSpectralAngleKernelFunctor.h b/Code/Learning/otbSpectralAngleKernelFunctor.h
index e997d1060a6e57081e1ad681bffef660ad394e47..ce292d5e328e6a34a029712630a0c5f6e3e7ab51 100644
--- a/Code/Learning/otbSpectralAngleKernelFunctor.h
+++ b/Code/Learning/otbSpectralAngleKernelFunctor.h
@@ -35,7 +35,7 @@ namespace otb
*
* \f$ frac{1}{\sqrt{ c_0 + \cos\textrm{SAM(x,y)} }} \f$ where \f$ \textrm{SAM(x,y)} \f$ is
* Spectral Angle Measure:
- * \f$ \textrm{SAM}(x,y) = \acos\left( \frac{x \cdot y}{\|x\| \|y\|} \right) \f$.
+ * \f$ \textrm{SAM}(x,y) = \cos^{-1}\left( \frac{x \cdot y}{\|x\| \|y\|} \right) \f$.
*
* The only parameter \f$ c_0 \f$ is to be fixed by the \code SetValue \endcode
* interface with keyword Coef (def 2.0).
diff --git a/Code/MultiScale/otbSplineBiOrthogonalOperator.h b/Code/MultiScale/otbSplineBiOrthogonalOperator.h
index 99dc9d354cb0202c64af48c459a0561c0dac1b32..d268a46f9b2de6a1bf7f95c7a24d6a0d687bbba9 100644
--- a/Code/MultiScale/otbSplineBiOrthogonalOperator.h
+++ b/Code/MultiScale/otbSplineBiOrthogonalOperator.h
@@ -69,7 +69,7 @@ public:
typedef InverseOrForwardTransformationEnum DirectionOfTransformationEnumType;
itkStaticConstMacro(DirectionOfTransformation,DirectionOfTransformationEnumType,TDirectionOfTransformation);
- LowPassSplineBiOrthogonalOperator() ;
+ LowPassSplineBiOrthogonalOperator();
LowPassSplineBiOrthogonalOperator(const Self& other);
/**
@@ -80,7 +80,7 @@ public:
/**
* Prints some debugging information
*/
- virtual void PrintSelf(std::ostream &os, itk::Indent i) const ;
+ virtual void PrintSelf(std::ostream &os, itk::Indent i) const;
protected:
/**
@@ -137,7 +137,7 @@ public:
typedef InverseOrForwardTransformationEnum DirectionOfTransformationEnumType;
itkStaticConstMacro(DirectionOfTransformation,DirectionOfTransformationEnumType,TDirectionOfTransformation);
- HighPassSplineBiOrthogonalOperator () ;
+ HighPassSplineBiOrthogonalOperator ();
HighPassSplineBiOrthogonalOperator(const Self& other);
/**
@@ -148,7 +148,7 @@ public:
/**
* Prints some debugging information
*/
- virtual void PrintSelf(std::ostream &os, itk::Indent i) const ;
+ virtual void PrintSelf(std::ostream &os, itk::Indent i) const;
protected:
/**
diff --git a/Code/MultiScale/otbWaveletFilterBank.h b/Code/MultiScale/otbWaveletFilterBank.h
index 98a3810ccf80d7dfc700ed3e98b40360a40b9052..d96864d5d6f70d3d8f545db76641acf7c122ded7 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.
=========================================================================*/
@@ -38,11 +38,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^{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
@@ -67,15 +67,15 @@ 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
+ * \todo: At present version, there is not consideration on meta data information that can be transmited
* from the input(s) to the output(s)...
*
* At this step, it would have been interesting to implements a DirectionalInnerProductImageFilter to synchronize
* the pipeline through a composite filter
- *
+ *
* The two choice (FORWARD/INVERSE) yield specific implementation of the templates (header redeclaration
* is given at bottom of of otbFilterBank.h
*
@@ -86,8 +86,8 @@ namespace otb {
*
* \ingroup Streamed
*/
-template < class TInputImage, class TOutputImage,
- class TLowPassOperator, class THighPassOperator,
+template < class TInputImage, class TOutputImage,
+ class TLowPassOperator, class THighPassOperator,
InverseOrForwardTransformationEnum TDirectionOfTransformation >
class ITK_EXPORT WaveletFilterBank
: public itk::ImageToImageFilter< TInputImage, TOutputImage >
@@ -137,7 +137,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
@@ -154,13 +154,13 @@ private:
WaveletFilterBank( const Self & );
void operator=( const Self & );
}; // end of class
-
+
/** \class FilterBank
* \brief Template specialization of FilterBank for forward transformaiton
*/
-template < class TInputImage, class TOutputImage,
+template < class TInputImage, class TOutputImage,
class TLowPassOperator, class THighPassOperator >
- class ITK_EXPORT WaveletFilterBank< TInputImage, TOutputImage,
+ class ITK_EXPORT WaveletFilterBank< TInputImage, TOutputImage,
TLowPassOperator, THighPassOperator, FORWARD >
: public itk::ImageToImageFilter< TInputImage, TOutputImage >
{
@@ -209,7 +209,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
@@ -222,11 +222,11 @@ protected:
WaveletFilterBank();
virtual ~WaveletFilterBank() {}
- /** GenerateOutputInformation
- * Set the size of the output image depending on the decimation factor
- * Copy informations from the input image if existing.
- **/
- virtual void GenerateOutputInformation();
+ /** GenerateOutputInformation
+ * Set the size of the output image depending on the decimation factor
+ * Copy informations from the input image if existing.
+ **/
+ virtual void GenerateOutputInformation();
/** BeforeThreadedGenerateData.
@@ -234,9 +234,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 );
@@ -246,29 +246,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 );
@@ -280,20 +280,20 @@ 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 ;
+ typedef std::vector< OutputImagePointerType > InternalImagesTabular;
std::vector< InternalImagesTabular > m_InternalImages;
}; // end of class
-
+
#if 0
/** \class FilterBank
* \brief Template specialization of FilterBank for inverse transformation
*/
-template < class TInputImage, class TOutputImage,
+template < class TInputImage, class TOutputImage,
class TLowPassOperator, class THighPassOperator >
class ITK_EXPORT WaveletFilterBank< TInputImage, TOutputImage, TLowPassOperator, THighPassOperator, INVERSE >
: public itk::ImageToImageFilter< TInputImage, TOutputImage >
@@ -343,7 +343,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
@@ -357,21 +357,21 @@ protected:
WaveletFilterBank();
virtual ~WaveletFilterBank();
- /** GenerateOutputInformation
- * Set the size of the output image depending on the decimation factor
- * Copy informations from the input image if existing.
- **/
- virtual void GenerateOutputInformation();
+ /** GenerateOutputInformation
+ * Set the size of the output image depending on the decimation factor
+ * Copy informations from the input image if existing.
+ **/
+ virtual void GenerateOutputInformation();
/** 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 );
virtual void EnlargeRegion ( InputImageRegionType & destRegion, const OutputImageRegionType & srcRegion );
virtual void ReduceRegion ( InputImageRegionType & destRegion, const OutputImageRegionType & srcRegion );
@@ -385,11 +385,11 @@ protected:
virtual void ThreadedGenerateData ( const OutputImageRegionType& outputRegionForThread, int threadId );
/** Iterative call to the inverse filter bank at each dimension */
- virtual void ThreadedGenerateData ( unsigned int idx, unsigned int direction,
+ virtual void ThreadedGenerateData ( unsigned int idx, unsigned int direction,
InputImagePointerType & outputImage,
itk::ProgressReporter & reporter,
const InputImageRegionType& inputRegionForThread, int threadId );
-
+
/** Specific case applied on the last reconstruction in inverse transformation */
virtual void ThreadedGenerateData ( itk::ProgressReporter & reporter,
const OutputImageRegionType& outputRegionForThread, int threadId );
@@ -398,7 +398,7 @@ protected:
typedef itk::ConstNeighborhoodIterator< InputImageType > NeighborhoodIteratorType;
typedef itk::NeighborhoodInnerProduct< InputImageType > InnerProductType;
typedef itk::ImageRegionIterator< InputImageType > IteratorType;
- typedef typename itk::NeighborhoodAlgorithm
+ typedef typename itk::NeighborhoodAlgorithm
::ImageBoundaryFacesCalculator< InputImageType > FaceCalculatorType;
typedef typename FaceCalculatorType::FaceListType FaceListType;
typedef typename FaceListType::iterator FaceListIterator;
@@ -421,7 +421,7 @@ private:
}; // end of class
#endif // Dbg
-
+
} // end of namespace otb
#ifndef OTB_MANUAL_INSTANTIATION
diff --git a/Code/MultiScale/otbWaveletFilterBank.txx b/Code/MultiScale/otbWaveletFilterBank.txx
index 98a1fac5c04e48e5411148f234fba1a4e9faa11b..e814638ad1961e884870f4aaa8f9c1eceb094cbb 100644
--- a/Code/MultiScale/otbWaveletFilterBank.txx
+++ b/Code/MultiScale/otbWaveletFilterBank.txx
@@ -219,8 +219,8 @@ WaveletFilterBank< TInputImage, TOutputImage,
}
else
{
- destIndex[i] = srcIndex[i] ;
- destSize[i] = srcSize[i] ;
+ destIndex[i] = srcIndex[i];
+ destSize[i] = srcSize[i];
}
}
@@ -236,7 +236,7 @@ WaveletFilterBank< TInputImage, TOutputImage,
TLowPassOperator, THighPassOperator,
FORWARD >
::CallCopyInputRegionToOutputRegion
-( OutputImageRegionType & destRegion, const InputImageRegionType & srcRegion )
+( OutputImageRegionType & destRegion, const InputImageRegionType & srcRegion )
{
Superclass::CallCopyInputRegionToOutputRegion( destRegion, srcRegion );
@@ -267,7 +267,7 @@ WaveletFilterBank< TInputImage, TOutputImage,
FORWARD >
::CallCopyInputRegionToOutputRegion
( unsigned int direction,
- OutputImageRegionType & destRegion, const InputImageRegionType & srcRegion )
+ OutputImageRegionType & destRegion, const InputImageRegionType & srcRegion )
{
Superclass::CallCopyInputRegionToOutputRegion( destRegion, srcRegion );
@@ -288,8 +288,8 @@ WaveletFilterBank< TInputImage, TOutputImage,
}
else
{
- destIndex[i] = srcIndex[i] ;
- destSize[i] = srcSize[i] ;
+ destIndex[i] = srcIndex[i];
+ destSize[i] = srcSize[i];
}
}
@@ -783,7 +783,7 @@ WaveletFilterBank< TInputImage, TOutputImage,
TLowPassOperator, THighPassOperator,
TDirectionOfTransformation >
::CallCopyInputRegionToOutputRegion
-( OutputImageRegionType & destRegion, const InputImageRegionType & srcRegion )
+( OutputImageRegionType & destRegion, const InputImageRegionType & srcRegion )
{
Superclass::CallCopyInputRegionToOutputRegion( destRegion, srcRegion );
@@ -845,7 +845,7 @@ WaveletFilterBank< TInputImage, TOutputImage,
TLowPassOperator, THighPassOperator,
TDirectionOfTransformation >
::CallCopyInputRegionToOutputRegion
-( OutputImageRegionType & destRegion, const InputImageRegionType & srcRegion )
+( OutputImageRegionType & destRegion, const InputImageRegionType & srcRegion )
{
Superclass::CallCopyInputRegionToOutputRegion( destRegion, srcRegion );
@@ -1160,7 +1160,7 @@ WaveletFilterBank< TInputImage, TOutputImage,
const OutputImageRegionType& outputRegionForThread, int threadId )
{
InputImageRegionType inputRegionForThread;
- this->CallCopyOutputRegionToInputRegion( inputRegionForThread, outputRegionForThread );
+ this->CallCopyOutputRegionToInputRegion( inputRegionForThread, outputRegionForThread );
unsigned int idx = InputImageType::ImageDimension-1;
diff --git a/Code/Projections/otbGenericRSTransform.h b/Code/Projections/otbGenericRSTransform.h
index 47f5282934f80504a7aace52b406f0fc62bb6c17..59428aa07afc0bf58e0c2545b056c6bc89cd3496 100644
--- a/Code/Projections/otbGenericRSTransform.h
+++ b/Code/Projections/otbGenericRSTransform.h
@@ -204,10 +204,10 @@ namespace otb
void PrintSelf(std::ostream& os, itk::Indent indent) const
{
- Superclass::PrintSelf(os,indent);
- os<<indent<<"Up to date: "<<m_TransformUpToDate<<std::endl;
- os<<indent<<"Input transform: "<<m_InputTransform<<std::endl;
- os<<indent<<"Output transform: "<<m_OutputTransform<<std::endl;
+ Superclass::PrintSelf(os,indent);
+ os<<indent<<"Up to date: "<<m_TransformUpToDate<<std::endl;
+ os<<indent<<"Input transform: "<<m_InputTransform<<std::endl;
+ os<<indent<<"Output transform: "<<m_OutputTransform<<std::endl;
}
private :
diff --git a/Code/Projections/otbGenericRSTransform.txx b/Code/Projections/otbGenericRSTransform.txx
index 190a3122cad6599eb189c9dfaf4a76991bd7bd35..f93761da863e61ff85d8ef868b754b35d24a94f9 100644
--- a/Code/Projections/otbGenericRSTransform.txx
+++ b/Code/Projections/otbGenericRSTransform.txx
@@ -259,9 +259,9 @@ GenericRSTransform<TScalarType, NInputDimensions, NOutputDimensions>
ForwardSensorModelType::Pointer sensorModel = ForwardSensorModelType::New();
sensorModel->SetImageGeometry(m_InputKeywordList);
if ( !m_DEMDirectory.empty())
- {
- sensorModel->SetDEMDirectory(m_DEMDirectory);
- }
+ {
+ sensorModel->SetDEMDirectory(m_DEMDirectory);
+ }
m_InputTransform = sensorModel.GetPointer();
otbMsgDevMacro(<< "Input projection set to sensor model.");
}
@@ -303,9 +303,9 @@ GenericRSTransform<TScalarType, NInputDimensions, NOutputDimensions>
InverseSensorModelType::Pointer sensorModel = InverseSensorModelType::New();
sensorModel->SetImageGeometry(m_OutputKeywordList);
if ( !m_DEMDirectory.empty())
- {
- sensorModel->SetDEMDirectory(m_DEMDirectory);
- }
+ {
+ sensorModel->SetDEMDirectory(m_DEMDirectory);
+ }
m_OutputTransform = sensorModel.GetPointer();
otbMsgDevMacro(<< "Output projection set to sensor model");
}
diff --git a/Code/SARPolarimetry/otbPolarimetricSynthesisFilter.h b/Code/SARPolarimetry/otbPolarimetricSynthesisFilter.h
index e89eab8a69a242e8b07461186b5087901d73cf0e..084b3ad7ebcee2b7cf9c3c4dd333d955d03967f8 100644
--- a/Code/SARPolarimetry/otbPolarimetricSynthesisFilter.h
+++ b/Code/SARPolarimetry/otbPolarimetricSynthesisFilter.h
@@ -33,22 +33,22 @@ namespace otb
* This class compute the polarimetric synthesis from two to four radar images,
* depening on the polarimetric architecture:
*
- * - HH_HV : two channels are available: $S_{HH}$ and $S_{HV}$.
- * Emit polarisation is fixed to horizontal orientation: $\psi_{i}=0$ and $\chi_{i}=0$.
- * - VV_VH : two channels are available: $S_{VV}$ and $S_{VH}$.
- * Emit polarisation is fixed to vertical orientation: $\psi_{i}=90^\circ$ and $\chi_{i}=0$.
- * - HH_HV_VV : three channels are available: $S_{HH}$, $S_{HV}$ and $S_{VV}$.
- * we make the assumption that cross polarisation are reciprocal ($S_{HV} = S_{VH}$).
- * - HH_HV_VH_VV: four channels are available $S_{HH}$, $S_{HV}$, $S_{VH}$ and $S_{VV}$.
+ * - HH_HV : two channels are available: \f$ S_{HH} \f$ and \f$ S_{HV} \f$ .
+ * Emit polarisation is fixed to horizontal orientation: \f$ \psi_{i}=0 \f$ and \f$ \chi_{i}=0 \f$ .
+ * - VV_VH : two channels are available: \f$ S_{VV} \f$ and \f$ S_{VH} \f$ .
+ * Emit polarisation is fixed to vertical orientation: \f$ \psi_{i}=90^\circ \f$ and \f$ \chi_{i}=0 \f$ .
+ * - HH_HV_VV : three channels are available: \f$ S_{HH} \f$ , \f$ S_{HV} \f$ and \f$ S_{VV} \f$ .
+ * we make the assumption that cross polarisation are reciprocal ( \f$ S_{HV} = S_{VH} \f$ ).
+ * - HH_HV_VH_VV: four channels are available \f$ S_{HH} \f$ , \f$ S_{HV} \f$ , \f$ S_{VH} \f$ and \f$ S_{VV} \f$ .
*
- * To resolve the synthesis, four parameters are required: $\psi_{i}$ , $\chi_{i}$, $\psi_{r}$ and $\chi_{r}$.
+ * To resolve the synthesis, four parameters are required: \f$ \psi_{i} \f$ , \f$ \chi_{i} \f$ , \f$ \psi_{r} \f$ and \f$ \chi_{r} \f$ .
* These parameters depend on the polarimetric architecture describe below.
*
* The result of the synthesis is a scalar image. Three modes are available:
*
* - none: set the four parameters;
- * - co: $\psi_{r} = \psi_{i}$ and $\chi_{r} = \chi_{i}$
- * - cross: $\psi_{r} = \psi_{i} + 90^\circ$ and $\chi_{r} = -\chi_{i}$
+ * - co: \f$ \psi_{r} = \psi_{i} \f$ and \f$ \chi_{r} = \chi_{i} \f$
+ * - cross: \f$ \psi_{r} = \psi_{i} + 90^\circ \f$ and \f$ \chi_{r} = -\chi_{i} \f$
*
* This class is parameterized over the type of the input images and
* the type of the output image. It is also parameterized by the
diff --git a/Code/SARPolarimetry/otbPolarimetricSynthesisFunctor.h b/Code/SARPolarimetry/otbPolarimetricSynthesisFunctor.h
index 7fc7085fcbc9ff6943310c2c2636be569acc38f6..baa7bea959e10d39a1e87ae5a3d02e3b0192d48a 100644
--- a/Code/SARPolarimetry/otbPolarimetricSynthesisFunctor.h
+++ b/Code/SARPolarimetry/otbPolarimetricSynthesisFunctor.h
@@ -29,7 +29,7 @@ namespace Functor
* This functor calculate the polarimetric synthesis
* using the electroMagneticField vectors as follow:
* \f$ \sigma(\psi_{i},\chi_{i},\psi_{r},\chi_{r}) = \\
- \vec(E_{r}}\cdot\left[ S \right] \vec(E_{i}} \f$
+ \vec(E_{r})\cdot\left[ S \right] \vec(E_{i}) \f$
*
* \ingroup Functor
*/
diff --git a/Code/Visualization/otbChangeExtractRegionActionHandler.h b/Code/Visualization/otbChangeExtractRegionActionHandler.h
index 30596df495c2a4b52ca0498341fe11e4800dbe92..3e6146223d3b708e0ac6e1de5cdce8c0186382ea 100644
--- a/Code/Visualization/otbChangeExtractRegionActionHandler.h
+++ b/Code/Visualization/otbChangeExtractRegionActionHandler.h
@@ -84,8 +84,8 @@ public:
index[0]=static_cast<int>(imagePoint[0]);
index[1]=static_cast<int>(imagePoint[1]);
- //Add Offset
- index += m_Offset;
+ //Add Offset
+ index += m_Offset;
// Change scaled extract region center
m_Model->SetExtractRegionCenter(index);
diff --git a/Code/Visualization/otbChangeScaledExtractRegionActionHandler.h b/Code/Visualization/otbChangeScaledExtractRegionActionHandler.h
index d5a8c795f21593c175df358445e8aee195f9f259..b6b93c69cf3956caa7c5b4dea93bc13524ebe511 100644
--- a/Code/Visualization/otbChangeScaledExtractRegionActionHandler.h
+++ b/Code/Visualization/otbChangeScaledExtractRegionActionHandler.h
@@ -82,8 +82,8 @@ public:
index[0]=static_cast<int>(imagePoint[0]);
index[1]=static_cast<int>(imagePoint[1]);
- //Add an offset if any
- index += m_Offset;
+ //Add an offset if any
+ index += m_Offset;
// Change scaled extract region center
m_Model->SetScaledExtractRegionCenter(index);
diff --git a/Code/Visualization/otbImageLayerRenderingModel.txx b/Code/Visualization/otbImageLayerRenderingModel.txx
index bbe0335b4bac1e5288b5494667fa2040736e4f97..ceeca9568648ee5212d7c5b92719b70b595d2a93 100644
--- a/Code/Visualization/otbImageLayerRenderingModel.txx
+++ b/Code/Visualization/otbImageLayerRenderingModel.txx
@@ -28,10 +28,10 @@ namespace otb
template <class TOutputImage>
ImageLayerRenderingModel<TOutputImage>
::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_ExtractBlendingFilterList(), m_ScaledExtractBlendingFilterList()
+ m_HasQuicklook(false),m_RasterizedExtract(),m_HasExtract(false),
+ m_ExtractRegion(), m_RasterizedScaledExtract(), m_HasScaledExtract(false),
+ m_ScaledExtractRegion(), m_Updating(false), m_QuicklookBlendingFilterList(),
+ m_ExtractBlendingFilterList(), m_ScaledExtractBlendingFilterList()
{
// Initalize the blending filter list
@@ -92,15 +92,15 @@ ImageLayerRenderingModel<TOutputImage>
// If the layer is visible
if(it.Get()->GetVisible())
{
- // Set the extracted region
- m_ExtractRegion = this->ConstrainRegion(m_ExtractRegion,it.Get()->GetExtent());
- it.Get()->SetExtractRegion(m_ExtractRegion);
- // Set the scaled extracted region
- m_ScaledExtractRegion = this->ConstrainRegion(m_ScaledExtractRegion,m_ExtractRegion);
- it.Get()->SetScaledExtractRegion(m_ScaledExtractRegion);
- // Render it
- otbMsgDevMacro(<<"ImageLayerRenderingModel::RenderVisibleLayers(): Rendering layer "<<it.Get()->GetName()<<" with regions ("<<m_ExtractRegion.GetIndex()<<" "<<m_ExtractRegion.GetSize()<<") ("<<m_ScaledExtractRegion.GetIndex()<<" "<<m_ScaledExtractRegion.GetSize()<<")");
- it.Get()->Render();
+ // Set the extracted region
+ m_ExtractRegion = this->ConstrainRegion(m_ExtractRegion,it.Get()->GetExtent());
+ it.Get()->SetExtractRegion(m_ExtractRegion);
+ // Set the scaled extracted region
+ m_ScaledExtractRegion = this->ConstrainRegion(m_ScaledExtractRegion,m_ExtractRegion);
+ it.Get()->SetScaledExtractRegion(m_ScaledExtractRegion);
+ // Render it
+ otbMsgDevMacro(<<"ImageLayerRenderingModel::RenderVisibleLayers(): Rendering layer "<<it.Get()->GetName()<<" with regions ("<<m_ExtractRegion.GetIndex()<<" "<<m_ExtractRegion.GetSize()<<") ("<<m_ScaledExtractRegion.GetIndex()<<" "<<m_ScaledExtractRegion.GetSize()<<")");
+ it.Get()->Render();
}
}
}
diff --git a/Code/Visualization/otbImageView.h b/Code/Visualization/otbImageView.h
index b7b1891ceecc8ec2466248f24002a2edc7a33887..ae5abf511d820a1fd5dcb345d554a32916c17634 100644
--- a/Code/Visualization/otbImageView.h
+++ b/Code/Visualization/otbImageView.h
@@ -28,7 +28,7 @@ namespace otb
/** \class ImageView
* \brief todo
-* \Todo: Rename ImageViewer when refactoring will be completed.
+* \todo: Rename ImageViewer when refactoring will be completed.
* \ingroup Visualization
*/
diff --git a/Code/Visualization/otbMouseClickActionHandler.h b/Code/Visualization/otbMouseClickActionHandler.h
index 79c7c3ac835dee7d34aa88e39f82116a8574c3dc..0d8f8de78815e98c4a7f7103cd870216d2a6f039 100644
--- a/Code/Visualization/otbMouseClickActionHandler.h
+++ b/Code/Visualization/otbMouseClickActionHandler.h
@@ -67,21 +67,21 @@ public:
typename ViewType::ImageWidgetType::Pointer source;
if(m_ActiveOnScrollWidget && widgetId == m_View->GetScrollWidget()->GetIdentifier() )
- {
- source = m_View->GetScrollWidget();
- }
+ {
+ source = m_View->GetScrollWidget();
+ }
else if(m_ActiveOnFullWidget && widgetId == m_View->GetFullWidget()->GetIdentifier() )
- {
- source = m_View->GetFullWidget();
- }
+ {
+ source = m_View->GetFullWidget();
+ }
else if(m_ActiveOnZoomWidget && widgetId == m_View->GetZoomWidget()->GetIdentifier() )
- {
- source = m_View->GetZoomWidget();
- }
+ {
+ source = m_View->GetZoomWidget();
+ }
if(source.IsNotNull() && event == FL_PUSH && Fl::event_button() == m_MouseButton)
{
- // Get the clicked index
+ // Get the clicked index
typename ViewType::ImageWidgetType::PointType screenPoint, imagePoint;
screenPoint = source->GetMousePosition();
@@ -92,7 +92,7 @@ public:
typename ViewType::IndexType index;
index[0]=static_cast<int>(imagePoint[0]);
index[1]=static_cast<int>(imagePoint[1]);
-
+
// Change scaled extract region center
m_Model->IndexClicked(index);
return true;
diff --git a/Code/Visualization/otbPackedWidgetManager.cxx b/Code/Visualization/otbPackedWidgetManager.cxx
index 2b4390b2e380d3d2cbee4bef64b8c03d65ea84c9..b99dcdc46e5b365f339291de6f15db0899f56de7 100644
--- a/Code/Visualization/otbPackedWidgetManager.cxx
+++ b/Code/Visualization/otbPackedWidgetManager.cxx
@@ -46,7 +46,7 @@ PackedWidgetManager
m_PackedWidget->m_FullGroup->add(fullWidget);
m_PackedWidget->m_FullGroup->resizable(fullWidget);
fullWidget->resize(m_PackedWidget->m_FullGroup->x(),m_PackedWidget->m_FullGroup->y(),
- m_PackedWidget->m_FullGroup->w(),m_PackedWidget->m_FullGroup->h());
+ m_PackedWidget->m_FullGroup->w(),m_PackedWidget->m_FullGroup->h());
}
@@ -58,7 +58,7 @@ PackedWidgetManager
m_PackedWidget->m_QuicklookGroup->add(scrollWidget);
m_PackedWidget->m_QuicklookGroup->resizable(scrollWidget);
scrollWidget->resize(m_PackedWidget->m_QuicklookGroup->x(),m_PackedWidget->m_QuicklookGroup->y(),
- m_PackedWidget->m_QuicklookGroup->w(),m_PackedWidget->m_QuicklookGroup->h());
+ m_PackedWidget->m_QuicklookGroup->w(),m_PackedWidget->m_QuicklookGroup->h());
}
@@ -70,7 +70,7 @@ PackedWidgetManager
m_PackedWidget->m_ZoomGroup->add(zoomWidget);
m_PackedWidget->m_ZoomGroup->resizable(zoomWidget);
zoomWidget->resize(m_PackedWidget->m_ZoomGroup->x(),m_PackedWidget->m_ZoomGroup->y(),
- m_PackedWidget->m_ZoomGroup->w(),m_PackedWidget->m_ZoomGroup->h());
+ m_PackedWidget->m_ZoomGroup->w(),m_PackedWidget->m_ZoomGroup->h());
}
void
PackedWidgetManager
@@ -80,7 +80,7 @@ PackedWidgetManager
m_PackedWidget->m_PixelInformationGroup->add(pixelWidget);
m_PackedWidget->m_PixelInformationGroup->resizable(pixelWidget);
pixelWidget->resize(m_PackedWidget->m_PixelInformationGroup->x(),m_PackedWidget->m_PixelInformationGroup->y(),
- m_PackedWidget->m_PixelInformationGroup->w(),m_PackedWidget->m_PixelInformationGroup->h());
+ m_PackedWidget->m_PixelInformationGroup->w(),m_PackedWidget->m_PixelInformationGroup->h());
}
@@ -92,7 +92,7 @@ PackedWidgetManager
m_PackedWidget->m_HistogramsGroup->add(curveWidget);
m_PackedWidget->m_HistogramsGroup->resizable(curveWidget);
curveWidget->resize(m_PackedWidget->m_HistogramsGroup->x(),m_PackedWidget->m_HistogramsGroup->y(),
- m_PackedWidget->m_HistogramsGroup->w(),m_PackedWidget->m_HistogramsGroup->h());
+ m_PackedWidget->m_HistogramsGroup->w(),m_PackedWidget->m_HistogramsGroup->h());
}
void
diff --git a/Code/Visualization/otbPixelDescriptionActionHandler.h b/Code/Visualization/otbPixelDescriptionActionHandler.h
index 39b702b7583d9a23608d9166eca5ede8b28b6298..2f2effa9532b196e72c826fe70d2b16d9a8dfbf6 100644
--- a/Code/Visualization/otbPixelDescriptionActionHandler.h
+++ b/Code/Visualization/otbPixelDescriptionActionHandler.h
@@ -110,8 +110,8 @@ public:
index[0]=static_cast<int>(imagePoint[0]);
index[1]=static_cast<int>(imagePoint[1]);
- //Add the offset
- index += m_Offset;
+ //Add the offset
+ index += m_Offset;
// Communicate new index to model
m_Model->UpdatePixelDescription(index);
diff --git a/Code/Visualization/otbPixelDescriptionView.h b/Code/Visualization/otbPixelDescriptionView.h
index d8d2ebf990fbbca23925e5958b453a1885e1e831..3d1f24cdbf29f194bb0c6beb0c81e7e756112b33 100644
--- a/Code/Visualization/otbPixelDescriptionView.h
+++ b/Code/Visualization/otbPixelDescriptionView.h
@@ -29,7 +29,7 @@ namespace otb
/** \class PixelDescriptionView
* \brief todo
-* \Todo: Rename PixelDescriptioner when refactoring will be completed.
+* \todo: Rename PixelDescriptioner when refactoring will be completed.
* \ingroup Visualization
*/
diff --git a/Code/Visualization/otbSelectAreaActionHandler.h b/Code/Visualization/otbSelectAreaActionHandler.h
index 769ee569b646941e5b3ae5530c0aac1dbf20bc5b..c27c9d68d13b9d44dbe9e366bfb9a47b6cd2b63e 100644
--- a/Code/Visualization/otbSelectAreaActionHandler.h
+++ b/Code/Visualization/otbSelectAreaActionHandler.h
@@ -73,37 +73,37 @@ public:
// if left mouse button pressed
if ( Fl::event_button() != FL_LEFT_MOUSE)
{
- return true;
+ return true;
}
if( m_Model.IsNotNull() )
{
- if(widgetId == m_Widget->GetIdentifier() )
- {
- // Get the clicked index
- typename WidgetType::PointType screenPoint, imagePoint;/*, lScreenSizePoint, lImageSizePoint;*/
- screenPoint = m_Widget->GetMousePosition();
-
- // Transform to image point
- imagePoint = m_Widget->GetScreenToImageTransform()->TransformPoint(screenPoint);
-
- // Transform to index
- IndexType lIndex;
- lIndex[0]=static_cast<long int>(imagePoint[0]);
- lIndex[1]=static_cast<long int>(imagePoint[1]);
-
- switch (event)
- {
- case FL_PUSH:
- {
- m_FirstPush = false;
- m_StartIndex = lIndex;
+ if(widgetId == m_Widget->GetIdentifier() )
+ {
+ // Get the clicked index
+ typename WidgetType::PointType screenPoint, imagePoint;/*, lScreenSizePoint, lImageSizePoint;*/
+ screenPoint = m_Widget->GetMousePosition();
+
+ // Transform to image point
+ imagePoint = m_Widget->GetScreenToImageTransform()->TransformPoint(screenPoint);
+
+ // Transform to index
+ IndexType lIndex;
+ lIndex[0]=static_cast<long int>(imagePoint[0]);
+ lIndex[1]=static_cast<long int>(imagePoint[1]);
+
+ switch (event)
+ {
+ case FL_PUSH:
+ {
+ m_FirstPush = false;
+ m_StartIndex = lIndex;
// ImageView.txx hide the GlComponent when Update
m_RegionGlComponent->SetVisible(true);
- break;
- }
- case FL_RELEASE:
- {
+ break;
+ }
+ case FL_RELEASE:
+ {
if(m_StartIndex[0] != lIndex[0] && m_StartIndex[1] != lIndex[1])
{
m_FirstPush = true;
@@ -111,23 +111,23 @@ public:
m_Model->SetExtractRegionByIndex(m_StartIndex,m_StopIndex);
m_Model->Update();
}
- break;
- }
- case FL_DRAG:
- {
- // only redraw the red box in the widget
- m_StopIndex = lIndex;
- m_Model->SetExtractRegionByIndex(m_StartIndex,m_StopIndex);
- m_RegionGlComponent->SetRegion(m_Model->GetExtractRegion());
- m_Widget->redraw();
- break;
- }
- default:
- {
- }
- }
- return true;
- }
+ break;
+ }
+ case FL_DRAG:
+ {
+ // only redraw the red box in the widget
+ m_StopIndex = lIndex;
+ m_Model->SetExtractRegionByIndex(m_StartIndex,m_StopIndex);
+ m_RegionGlComponent->SetRegion(m_Model->GetExtractRegion());
+ m_Widget->redraw();
+ break;
+ }
+ default:
+ {
+ }
+ }
+ return true;
+ }
}
return false;
diff --git a/Code/Visualization/otbStandardImageViewer.txx b/Code/Visualization/otbStandardImageViewer.txx
index a7679787c5ff94e39ffb048cf5c593976fc86f43..476d2b6819dff3c66fae230505db22b0eec30947 100644
--- a/Code/Visualization/otbStandardImageViewer.txx
+++ b/Code/Visualization/otbStandardImageViewer.txx
@@ -28,9 +28,9 @@ namespace otb
template <class TImage,class TVectorData,class TWidgetManager>
StandardImageViewer<TImage,TVectorData,TWidgetManager>
::StandardImageViewer() : m_Label("Default label"), m_Image(), m_VectorData(),
- m_ImageLayer(), m_RenderingModel(),m_PixelDescriptionModel(),
- m_View(), m_PixelDescriptionView(), m_CurveWidget(),
- m_Controller(), m_RenderingFunction(), m_DisplayWindow()
+ m_ImageLayer(), m_RenderingModel(),m_PixelDescriptionModel(),
+ m_View(), m_PixelDescriptionView(), m_CurveWidget(),
+ m_Controller(), m_RenderingFunction(), m_DisplayWindow()
{
// Build a new rendering model
m_RenderingModel = RenderingModelType::New();
diff --git a/Code/Visualization/otbStandardRenderingFunction.h b/Code/Visualization/otbStandardRenderingFunction.h
index aae2ee5e4f2a54d6ce8aa1e3254355d05c8dd889..039528a9a783494a23838201bc2de110bd2b6b44 100644
--- a/Code/Visualization/otbStandardRenderingFunction.h
+++ b/Code/Visualization/otbStandardRenderingFunction.h
@@ -119,48 +119,48 @@ public:
for(unsigned int channel = 0; channel < vpixel.Size();++channel)
{
if(channel == m_RedChannelIndex)
- {
- oss<<"c= "<<channel<<", R= "<<(int)output[0];
- if(output[0]<100)
- {
- oss<<" ";
- }
- if(output[0]<10)
- {
- oss<<" ";
- }
- oss<<", v= "<<static_cast<typename itk::NumericTraits<ScalarPixelType>::PrintType>(vpixel[channel])<<std::endl;
- }
+ {
+ oss<<"c= "<<channel<<", R= "<<(int)output[0];
+ if(output[0]<100)
+ {
+ oss<<" ";
+ }
+ if(output[0]<10)
+ {
+ oss<<" ";
+ }
+ oss<<", v= "<<static_cast<typename itk::NumericTraits<ScalarPixelType>::PrintType>(vpixel[channel])<<std::endl;
+ }
else if(channel == m_BlueChannelIndex)
- {
- oss<<"c= "<<channel<<", G= "<<(int)output[1];
- if(output[1]<100)
- {
- oss<<" ";
- }
- if(output[1]<10)
- {
- oss<<" ";
- }
- oss<<", v= "<<static_cast<typename itk::NumericTraits<ScalarPixelType>::PrintType>(vpixel[channel])<<std::endl;
- }
+ {
+ oss<<"c= "<<channel<<", G= "<<(int)output[1];
+ if(output[1]<100)
+ {
+ oss<<" ";
+ }
+ if(output[1]<10)
+ {
+ oss<<" ";
+ }
+ oss<<", v= "<<static_cast<typename itk::NumericTraits<ScalarPixelType>::PrintType>(vpixel[channel])<<std::endl;
+ }
else if(channel == m_GreenChannelIndex)
- {
- oss<<"c= "<<channel<<", B= "<<(int)output[2];
- if(output[2]<100)
- {
- oss<<" ";
- }
- if(output[2]<10)
- {
- oss<<" ";
- }
- oss<<", v= "<<static_cast<typename itk::NumericTraits<ScalarPixelType>::PrintType>(vpixel[channel])<<std::endl;
- }
+ {
+ oss<<"c= "<<channel<<", B= "<<(int)output[2];
+ if(output[2]<100)
+ {
+ oss<<" ";
+ }
+ if(output[2]<10)
+ {
+ oss<<" ";
+ }
+ oss<<", v= "<<static_cast<typename itk::NumericTraits<ScalarPixelType>::PrintType>(vpixel[channel])<<std::endl;
+ }
else
- {
- oss<<"c= "<<channel<<", v= "<<static_cast<typename itk::NumericTraits<ScalarPixelType>::PrintType>(vpixel[channel])<<std::endl;
- }
+ {
+ oss<<"c= "<<channel<<", v= "<<static_cast<typename itk::NumericTraits<ScalarPixelType>::PrintType>(vpixel[channel])<<std::endl;
+ }
}
return oss.str();
}
diff --git a/Code/Visualization/otbVectorDataGlComponent.txx b/Code/Visualization/otbVectorDataGlComponent.txx
index f821c6b9312329ac62ec1587207c05cd49ae7630..bbbd4a1390ee74390cc017a501caaab277254220 100644
--- a/Code/Visualization/otbVectorDataGlComponent.txx
+++ b/Code/Visualization/otbVectorDataGlComponent.txx
@@ -29,7 +29,7 @@ namespace otb
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)
+ m_Color(), m_LineWidth(1.5),m_CrossWidth(10),m_RenderPolygonBoundariesOnly(false)
{
// Default color is red
m_Color.Fill(0);
@@ -276,7 +276,7 @@ VectorDataGlComponent<TVectorData>
case FEATURE_POLYGON:
{
this->RenderPolygon(node->Get()->GetPolygonExteriorRing(),node->Get()->GetPolygonInteriorRings(),
- extent,space2ScreenTransform);
+ extent,space2ScreenTransform);
break;
}
default:
diff --git a/Code/Visualization/otbWidgetManager.h b/Code/Visualization/otbWidgetManager.h
index 78db931071baf53cfee08a2f3bd248bb230b11bd..5a4111ac4bbb7d0efca6ada6a4f1b9434e625ce6 100644
--- a/Code/Visualization/otbWidgetManager.h
+++ b/Code/Visualization/otbWidgetManager.h
@@ -51,11 +51,11 @@ public:
typedef WidgetType::Pointer WidgetPointerType;
/** Register Wigets*/
- virtual void RegisterFullWidget(WidgetType* fullWidget) = 0 ;
- virtual void RegisterScrollWidget(WidgetType* scrollWidget) = 0 ;
- virtual void RegisterZoomWidget(WidgetType* zoomWidget) = 0 ;
- virtual void RegisterHistogramWidget(WidgetType* curveWidget) = 0 ;
- virtual void RegisterPixelInformationWidget(Fl_Output * pixelWidget) = 0 ;
+ virtual void RegisterFullWidget(WidgetType* fullWidget) = 0;
+ virtual void RegisterScrollWidget(WidgetType* scrollWidget) = 0;
+ virtual void RegisterZoomWidget(WidgetType* zoomWidget) = 0;
+ virtual void RegisterHistogramWidget(WidgetType* curveWidget) = 0;
+ virtual void RegisterPixelInformationWidget(Fl_Output * pixelWidget) = 0;
virtual void Show() = 0;
virtual void Hide() = 0;
virtual void Refresh() = 0;
diff --git a/Testing/Code/BasicFilters/otbContinuousMinimumMaximumImageCalculatorTest.cxx b/Testing/Code/BasicFilters/otbContinuousMinimumMaximumImageCalculatorTest.cxx
index 6a264783aad9edf9651c29d805dc3615236d4c97..122b7f0a922a90782a65156cbcf82b42c50ba894 100644
--- a/Testing/Code/BasicFilters/otbContinuousMinimumMaximumImageCalculatorTest.cxx
+++ b/Testing/Code/BasicFilters/otbContinuousMinimumMaximumImageCalculatorTest.cxx
@@ -95,7 +95,7 @@ otbContinuousMinimumMaximumImageCalculatorTest(int ,char *[] )
if (minimumResult != minimum)
{
- std::cout << "Minimum Value is wrong : " << minimumResult ;
+ std::cout << "Minimum Value is wrong : " << minimumResult;
std::cout << " != " << minimum << std::endl;
flag = 1;
}
@@ -107,7 +107,7 @@ otbContinuousMinimumMaximumImageCalculatorTest(int ,char *[] )
if (maximumResult != maximum)
{
- std::cout << "Maximum Value is wrong : " << maximumResult ;
+ std::cout << "Maximum Value is wrong : " << maximumResult;
std::cout << " != " << maximum << std::endl;
flag = 2;
}
diff --git a/Testing/Code/BasicFilters/otbEuclideanDistanceWithMissingValue.cxx b/Testing/Code/BasicFilters/otbEuclideanDistanceWithMissingValue.cxx
index aa83f89a7c799b509052a82d342eb637d35cf629..fef2bbad9d70d358cbb0b248c926280e51b7bf7e 100644
--- a/Testing/Code/BasicFilters/otbEuclideanDistanceWithMissingValue.cxx
+++ b/Testing/Code/BasicFilters/otbEuclideanDistanceWithMissingValue.cxx
@@ -9,7 +9,7 @@ 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
diff --git a/Testing/Code/BasicFilters/otbEuclideanDistanceWithMissingValueNew.cxx b/Testing/Code/BasicFilters/otbEuclideanDistanceWithMissingValueNew.cxx
index ced90ba14971da9de375f9d1a375cac6aed97ca1..75bc8d673b38268d759f0db4e7f950295850aec1 100644
--- a/Testing/Code/BasicFilters/otbEuclideanDistanceWithMissingValueNew.cxx
+++ b/Testing/Code/BasicFilters/otbEuclideanDistanceWithMissingValueNew.cxx
@@ -9,7 +9,7 @@ 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
diff --git a/Testing/Code/BasicFilters/otbImagePCAShapeModelEstimatorTest.cxx b/Testing/Code/BasicFilters/otbImagePCAShapeModelEstimatorTest.cxx
index 7d9e889dffd372d7da080c6a255d3165cd93d65b..38e34b510496985d3cdb67358ab44357551de746 100644
--- a/Testing/Code/BasicFilters/otbImagePCAShapeModelEstimatorTest.cxx
+++ b/Testing/Code/BasicFilters/otbImagePCAShapeModelEstimatorTest.cxx
@@ -63,12 +63,12 @@ int otbImagePCAShapeModelEstimatorTest(int argc, char* argv[] )
std::vector<std::string> imagesfilenames;
std::vector<std::string> outputimagesfilenames;
int cpt(3);
- for(; cpt<(numberOfTrainingImages+3) ; cpt++)
+ for(; cpt<(numberOfTrainingImages+3); cpt++)
{
imagesfilenames.push_back(argv[cpt]);
}
int cpt2(cpt);
- for(; cpt<(numberOfPrincipalComponentsRequired+cpt2) ; cpt++)
+ for(; cpt<(numberOfPrincipalComponentsRequired+cpt2); cpt++)
{
outputimagesfilenames.push_back(argv[cpt]);
}
diff --git a/Testing/Code/BasicFilters/otbInnerProductPCAImageFilter.cxx b/Testing/Code/BasicFilters/otbInnerProductPCAImageFilter.cxx
index 643c2a3bd2cba3b2cdcb26938ff1f28bd56bf9a7..abc38f537e99cc94860e96357ea9474f44976020 100644
--- a/Testing/Code/BasicFilters/otbInnerProductPCAImageFilter.cxx
+++ b/Testing/Code/BasicFilters/otbInnerProductPCAImageFilter.cxx
@@ -57,7 +57,7 @@ int otbInnerProductPCAImageFilter( int argc, char* argv[] )
unsigned int nbComponents = numberOfPrincipalComponentsRequired;
if (generateMeanComponent == true) nbComponents += 1;
- for(unsigned int cpt=0 ; cpt < nbComponents ; cpt++)
+ for(unsigned int cpt=0; cpt < nbComponents; cpt++)
{
ExtractROIFilterType::Pointer extractROIFilter = ExtractROIFilterType::New();
WriterType2::Pointer writer2 = WriterType2::New();
diff --git a/Testing/Code/BasicFilters/otbListSampleToHistogramListGenerator.cxx b/Testing/Code/BasicFilters/otbListSampleToHistogramListGenerator.cxx
index 423c0537bcbc08136e9cf162b0bfe89282dfb481..6bd2c413bb41c52f6306c7c7f55551ab9c1255e3 100644
--- a/Testing/Code/BasicFilters/otbListSampleToHistogramListGenerator.cxx
+++ b/Testing/Code/BasicFilters/otbListSampleToHistogramListGenerator.cxx
@@ -59,7 +59,7 @@ int otbListSampleToHistogramListGenerator(int argc, char * argv[])
for(unsigned int comp = 0; comp<reader->GetOutput()->GetNumberOfComponentsPerPixel();++comp)
{
ofs<<"Channel: "<<comp<<" histogram: "<<std::endl;
- for(unsigned int bin = 0; bin <nbBins ;++bin)
+ for(unsigned int bin = 0; bin <nbBins;++bin)
{
ofs<<generator->GetOutput()->GetNthElement(comp)->GetFrequency(bin)<<"\t";
}
diff --git a/Testing/Code/BasicFilters/otbPointSetDensityFunctionTest.cxx b/Testing/Code/BasicFilters/otbPointSetDensityFunctionTest.cxx
index af6ffd04b993725161a18e3c98fb5a155a0a1da2..7efe47dc111d8cdbf5229ca8f10fc0cccf37a504 100644
--- a/Testing/Code/BasicFilters/otbPointSetDensityFunctionTest.cxx
+++ b/Testing/Code/BasicFilters/otbPointSetDensityFunctionTest.cxx
@@ -46,16 +46,16 @@ int otbPointSetDensityFunctionTest(int argc, char* argv[] )
PointSetType::PointIdentifier count = 0;
PointSetType::PointType pDst ,pSrc;
- pDst[0] = 12.78 ;
- pDst[1] = 18.76 ;
+ pDst[0] = 12.78;
+ pDst[1] = 18.76;
pointSet->SetPoint(count++,pDst);
- pDst[0] = 15.78 ;
- pDst[1] = 23.76 ;
+ pDst[0] = 15.78;
+ pDst[1] = 23.76;
pointSet->SetPoint(count++,pDst);
- pDst[0] = 9.78 ;
- pDst[1] = 5.76 ;
+ pDst[0] = 9.78;
+ pDst[1] = 5.76;
pointSet->SetPoint(count++,pDst);
diff --git a/Testing/Code/BasicFilters/otbPolygonCompacityFunctor.cxx b/Testing/Code/BasicFilters/otbPolygonCompacityFunctor.cxx
index 0f010fc1c0c2340e30449927ec8f1360f920465b..a54cb4eac957e4ef966c937693d7e8cb62531a6f 100644
--- a/Testing/Code/BasicFilters/otbPolygonCompacityFunctor.cxx
+++ b/Testing/Code/BasicFilters/otbPolygonCompacityFunctor.cxx
@@ -37,7 +37,7 @@ int otbPolygonCompacityFunctor( int argc, char * argv[] )
if (argc !=3 )
{
- std::cout << "Usage: " << argv[0] ;
+ std::cout << "Usage: " << argv[0];
std::cout << " inputImage outputFile" << std::endl;
return 1;
}
diff --git a/Testing/Code/Common/otbHistogramStatisticsFunction.cxx b/Testing/Code/Common/otbHistogramStatisticsFunction.cxx
index 26d7c7ab0f4cef5a69b9c7f2711c6869aa106379..c73e0fa63776ffde579c987e84fb084033d32d25 100644
--- a/Testing/Code/Common/otbHistogramStatisticsFunction.cxx
+++ b/Testing/Code/Common/otbHistogramStatisticsFunction.cxx
@@ -27,19 +27,19 @@ int otbHistogramStatisticsFunction(int argc, char* argv[])
{
unsigned int NbOfBins((unsigned int)::atoi(argv[1]));
- typedef float MeasurementType ;
- typedef itk::Statistics::Histogram< MeasurementType, 1 > HistogramType ;
- HistogramType::Pointer histogram = HistogramType::New() ;
+ typedef float MeasurementType;
+ typedef itk::Statistics::Histogram< MeasurementType, 1 > HistogramType;
+ HistogramType::Pointer histogram = HistogramType::New();
// initialize histogram
HistogramType::SizeType size;
- size.Fill(NbOfBins) ;
- HistogramType::MeasurementVectorType lowerBound ;
- HistogramType::MeasurementVectorType upperBound ;
- lowerBound[0] = 0.0 ;
- upperBound[0] = NbOfBins ;
+ size.Fill(NbOfBins);
+ HistogramType::MeasurementVectorType lowerBound;
+ HistogramType::MeasurementVectorType upperBound;
+ lowerBound[0] = 0.0;
+ upperBound[0] = NbOfBins;
- histogram->Initialize(size, lowerBound, upperBound ) ;
+ histogram->Initialize(size, lowerBound, upperBound );
// create histogram with same value for each frequency
diff --git a/Testing/Code/Common/otbLineSpatialObjectList.cxx b/Testing/Code/Common/otbLineSpatialObjectList.cxx
index 609cf48f7eb74b97eb412b394f48fff6bb0e1d56..380c209ea7418d2c45a1abc4bb6d6283d4d13b64 100644
--- a/Testing/Code/Common/otbLineSpatialObjectList.cxx
+++ b/Testing/Code/Common/otbLineSpatialObjectList.cxx
@@ -29,7 +29,7 @@ int otbLineSpatialObjectList( int argc, char * argv[] )
typedef LineSpatialObjectListType::const_iterator LineSpatialObjectListConstIterator;
LineSpatialObjectListType::Pointer listLines = LineSpatialObjectListType::New();
- for ( int i = 0 ; i < 10 ; i++ )
+ for ( int i = 0; i < 10; i++ )
{
LineSpatialObjecType::Pointer lLine = LineSpatialObjecType::New();
listLines->push_back( lLine );
diff --git a/Testing/Code/Common/otbMultiChannelExtractROI.cxx b/Testing/Code/Common/otbMultiChannelExtractROI.cxx
index 939982bfddcc7ba85489b80c0d60b3f94107387e..8e81555ce063ae5cf3f5e63f2a7fd256425b55c6 100644
--- a/Testing/Code/Common/otbMultiChannelExtractROI.cxx
+++ b/Testing/Code/Common/otbMultiChannelExtractROI.cxx
@@ -100,7 +100,7 @@ int generic_otbMultiChannelExtractROI( int argc, char * argv[], const char * inp
std::cout << " Canaux selectionnes ("<<extractROIFilter->GetNbChannels()<<") : ";
typename ExtractROIFilterType::ChannelsType lChannels;
lChannels = extractROIFilter->GetChannels();
- for (unsigned int i=0 ; i< lChannels.size(); i++)
+ for (unsigned int i=0; i< lChannels.size(); i++)
{
std::cout << lChannels[i]<<" ";
}
diff --git a/Testing/Code/Common/otbPathListToHistogramGenerator.cxx b/Testing/Code/Common/otbPathListToHistogramGenerator.cxx
index e7cb3f9dc1c30be217da5dfc3f22ddce9c494b27..a8ac5680b5993d3300caca0dc30f9ff06045bc2e 100644
--- a/Testing/Code/Common/otbPathListToHistogramGenerator.cxx
+++ b/Testing/Code/Common/otbPathListToHistogramGenerator.cxx
@@ -46,7 +46,7 @@ int otbPathListToHistogramGenerator( int argc, char* argv[] )
PathListType* PathList = new PathListType;
PathList->clear();
- for (int i = 0 ; i <NbAngle ; i++)
+ for (int i = 0; i <NbAngle; i++)
{
PathPointer pathElt = PathType::New();
pathElt->Initialize();
diff --git a/Testing/Code/Common/otbTestCommandLineArgumentParser.cxx b/Testing/Code/Common/otbTestCommandLineArgumentParser.cxx
index dca82b0f93b406586ec9620395919094e5fca64a..94a6b2674ebbfb10a0f5c74624a55bc98cfb0f20 100644
--- a/Testing/Code/Common/otbTestCommandLineArgumentParser.cxx
+++ b/Testing/Code/Common/otbTestCommandLineArgumentParser.cxx
@@ -35,7 +35,7 @@ int otbTestCommandLineArgumentParser( int argc, char * argv[] )
typedef otb::CommandLineArgumentParseResult ParserResultType;
ParserResultType::Pointer parseResult = ParserResultType::New();
- parser->ParseCommandLine(argc,argv,parseResult) ;
+ parser->ParseCommandLine(argc,argv,parseResult);
std::cout << "Image : "<<parseResult->GetParameterString("-image")<<std::endl;
diff --git a/Testing/Code/Common/otbTestCommandLineArgumentParserHelp.cxx b/Testing/Code/Common/otbTestCommandLineArgumentParserHelp.cxx
index 513ceaf0cb4e0ce1518c5b8e740678141a26cdd7..9e38d4b617b37608f436551934d1ad6efee45693 100644
--- a/Testing/Code/Common/otbTestCommandLineArgumentParserHelp.cxx
+++ b/Testing/Code/Common/otbTestCommandLineArgumentParserHelp.cxx
@@ -35,7 +35,7 @@ int otbTestCommandLineArgumentParserHelp( int argc, char * argv[] )
typedef otb::CommandLineArgumentParseResult ParserResultType;
ParserResultType::Pointer parseResult = ParserResultType::New();
- parser->ParseCommandLine(argc,argv,parseResult) ;
+ parser->ParseCommandLine(argc,argv,parseResult);
std::cout << "Image : "<<parseResult->GetParameterString("-image")<<std::endl;
diff --git a/Testing/Code/Common/otbTestCommandLineArgumentParserList.cxx b/Testing/Code/Common/otbTestCommandLineArgumentParserList.cxx
index 3eb34df1af7209347b7610e43476016e9540f209..3fcd49e7964e83bb7d540fd5fe4df8c7ceda8ae6 100644
--- a/Testing/Code/Common/otbTestCommandLineArgumentParserList.cxx
+++ b/Testing/Code/Common/otbTestCommandLineArgumentParserList.cxx
@@ -36,7 +36,7 @@ int otbTestCommandLineArgumentParserList( int argc, char * argv[] )
typedef otb::CommandLineArgumentParseResult ParserResultType;
ParserResultType::Pointer parseResult = ParserResultType::New();
- parser->ParseCommandLine(argc,argv,parseResult) ;
+ parser->ParseCommandLine(argc,argv,parseResult);
std::cout << "Image : "<<parseResult->GetParameterString("-image")<<std::endl;
@@ -54,7 +54,7 @@ int otbTestCommandLineArgumentParserList( int argc, char * argv[] )
std::cout << "Double : "<<lDouble<<std::endl;
std::cout << "List de Double : "<<parseResult->GetNumberOfParameters("-doubles")<<std::endl;
- for (int i =0 ; i<parseResult->GetNumberOfParameters("-doubles") ; i++)
+ for (int i =0; i<parseResult->GetNumberOfParameters("-doubles"); i++)
{
//double value = otb::GetParameter<double>(parseResult,"-doubles",i);
double value = parseResult->GetParameterDouble("-doubles",i);
diff --git a/Testing/Code/Common/otbTestCommandLineArgumentParserWithError.cxx b/Testing/Code/Common/otbTestCommandLineArgumentParserWithError.cxx
index c80c06914b24f542dc31d169bc68c5e6c07c18ad..d840ac51d5d2321ed9a55159c1aec202828177cc 100644
--- a/Testing/Code/Common/otbTestCommandLineArgumentParserWithError.cxx
+++ b/Testing/Code/Common/otbTestCommandLineArgumentParserWithError.cxx
@@ -38,7 +38,7 @@ int otbTestCommandLineArgumentParserWithError( int argc, char * argv[] )
try
{
- parser->ParseCommandLine(argc,argv,parseResult) ;
+ parser->ParseCommandLine(argc,argv,parseResult);
std::cout << "Image : "<<parseResult->GetParameterString("-image")<<std::endl;
diff --git a/Testing/Code/DisparityMap/otbBSplinesInterpolateTransformDeformationFieldGenerator.cxx b/Testing/Code/DisparityMap/otbBSplinesInterpolateTransformDeformationFieldGenerator.cxx
index 43e9f10c41d93893380a19cd5dcad47ae7fc7e52..2455c7348ac1594fc116848d7829a151ddcaf47f 100644
--- a/Testing/Code/DisparityMap/otbBSplinesInterpolateTransformDeformationFieldGenerator.cxx
+++ b/Testing/Code/DisparityMap/otbBSplinesInterpolateTransformDeformationFieldGenerator.cxx
@@ -78,13 +78,13 @@ int otbBSplinesInterpolateTransformDeformationFieldGenerator(int argc, char * ar
pd4[0] = 0.91;
pd4[1] = 0;
pd4[2] = 0;
- pd4[3] = 0.03925 ;
+ pd4[3] = 0.03925;
pd4[4] = -5;
pd4[5] = 5;
pd5[0] = 0.91;
pd5[1] = 0;
pd5[2] = 0;
- pd5[3] = -0.03925 ;
+ pd5[3] = -0.03925;
pd5[4] = -5;
pd5[5] = -5;
diff --git a/Testing/Code/DisparityMap/otbDisparityMapEstimationMethod.cxx b/Testing/Code/DisparityMap/otbDisparityMapEstimationMethod.cxx
index 616b810883856447d34e9531b85bdc5a6386ff2c..84eb33c96d74976c3ff6e11c740411a94ff8e553 100644
--- a/Testing/Code/DisparityMap/otbDisparityMapEstimationMethod.cxx
+++ b/Testing/Code/DisparityMap/otbDisparityMapEstimationMethod.cxx
@@ -133,9 +133,10 @@ int otbDisparityMapEstimationMethod(int argc, char* argv[])
// unsigned int idData=0;
PointDataIteratorType itData = pointSet->GetPointData()->Begin();
std::cout<<"Point data size: "<<pointSet->GetPointData()->Size()<<std::endl;
- for (;it!=pointSet->GetPoints()->End()
- &&itData!=pointSet->GetPointData()->End()
- ;++it,++itData)
+ for (;
+ it!=pointSet->GetPoints()->End()
+ &&itData!=pointSet->GetPointData()->End();
+ ++it,++itData)
{
out<<"Point "<<it.Value()<<" -> transform parameters: ";
out<<itData.Value();
diff --git a/Testing/Code/FeatureExtraction/otbAlignImageToPath.cxx b/Testing/Code/FeatureExtraction/otbAlignImageToPath.cxx
index 800d9a85d2ecec0f1267d3b42b99661b5cd6f5c7..db0035707a50440509e4e420264e450c14658dc7 100644
--- a/Testing/Code/FeatureExtraction/otbAlignImageToPath.cxx
+++ b/Testing/Code/FeatureExtraction/otbAlignImageToPath.cxx
@@ -104,7 +104,7 @@ int otbAlignImageToPath( int argc, char * argv[] )
int nbPath = sortiePath->Size();
otbGenericMsgDebugMacro(<< "NbSegment: "<<nbPath);
fprintf(file,"Nb Segment: %d\n",nbPath);
- for (int i =0 ; i<nbPath ;i++)
+ for (int i =0; i<nbPath;i++)
{
vertexList = sortiePath->GetNthElement(i)->GetVertexList();
cindex = vertexList->GetElement(0);
diff --git a/Testing/Code/FeatureExtraction/otbBreakAngularPathListFilter.cxx b/Testing/Code/FeatureExtraction/otbBreakAngularPathListFilter.cxx
index 4e3735fee0b6617d6ef32ef7069d8692b90e6135..a3b312e96e0a4519f09f0c13ea8ae357aa0552f7 100644
--- a/Testing/Code/FeatureExtraction/otbBreakAngularPathListFilter.cxx
+++ b/Testing/Code/FeatureExtraction/otbBreakAngularPathListFilter.cxx
@@ -76,12 +76,12 @@ int otbBreakAngularPathListFilter(int argc, char * argv[])
PathListType::Pointer InputPathList = PathListType::New();
//Generate PathList
- for (PointsMatrixType::iterator listpos=MatricePoints.begin() ; listpos != MatricePoints.end() ; ++listpos)
+ for (PointsMatrixType::iterator listpos=MatricePoints.begin(); listpos != MatricePoints.end(); ++listpos)
{
PathType::Pointer path = PathType::New();
//Generate PathList
std::cout << "List "<<std::endl;
- for (PointsVectorType::iterator it=(*listpos).begin() ; it != (*listpos).end() ; ++it)
+ for (PointsVectorType::iterator it=(*listpos).begin(); it != (*listpos).end(); ++it)
{
cindex[0] = *it;
++it;
@@ -100,7 +100,7 @@ int otbBreakAngularPathListFilter(int argc, char * argv[])
std::ofstream file;
file.open(outfname);
- for (PointsVectorType::iterator itAngle=ListMaxAngle.begin() ; itAngle != ListMaxAngle.end() ; ++itAngle)
+ for (PointsVectorType::iterator itAngle=ListMaxAngle.begin(); itAngle != ListMaxAngle.end(); ++itAngle)
{
diff --git a/Testing/Code/FeatureExtraction/otbCompacityPathCircle.cxx b/Testing/Code/FeatureExtraction/otbCompacityPathCircle.cxx
index 8f64f09badeb87329da1d45d78e7d6e342ca34f2..38a1ffae5681a2c7952f3cf57650fe32c378eaab 100644
--- a/Testing/Code/FeatureExtraction/otbCompacityPathCircle.cxx
+++ b/Testing/Code/FeatureExtraction/otbCompacityPathCircle.cxx
@@ -50,7 +50,7 @@ int otbCompacityPathCircle( int argc, char * argv[] )
pathElt->Initialize();
- for (unsigned int noTheta = 0 ; noTheta < NbOfPoints ; noTheta++)
+ for (unsigned int noTheta = 0; noTheta < NbOfPoints; noTheta++)
{
RealType Theta = deltaTheta * static_cast<RealType>(noTheta);
diff --git a/Testing/Code/FeatureExtraction/otbFillGapsFilter.cxx b/Testing/Code/FeatureExtraction/otbFillGapsFilter.cxx
index 9a9dc9108b1df711cc46bc524229798d977439f3..bdf2c99f6bef998046ccc08dc78c561150a1f071 100644
--- a/Testing/Code/FeatureExtraction/otbFillGapsFilter.cxx
+++ b/Testing/Code/FeatureExtraction/otbFillGapsFilter.cxx
@@ -62,7 +62,7 @@ int otbFillGapsFilter( int argc, char * argv[] )
FillGapsFilterType::Pointer fillgaps = FillGapsFilterType::New();
LinesListType::Pointer linesListBeforeFillGaps = LinesListType::New();
- const LinesListType *linesListAfterFillGaps ;
+ const LinesListType *linesListAfterFillGaps;
LineType::PointListType pointList;
LineType::LinePointType point;
diff --git a/Testing/Code/FeatureExtraction/otbFlusserImage.cxx b/Testing/Code/FeatureExtraction/otbFlusserImage.cxx
index d230706cf3fb90ac1ac95d0edada5d95b51f99b0..454051810e09ba1b0f9b569f3760808119f60d21 100644
--- a/Testing/Code/FeatureExtraction/otbFlusserImage.cxx
+++ b/Testing/Code/FeatureExtraction/otbFlusserImage.cxx
@@ -75,7 +75,7 @@ int otbFlusserImage( int argc, char * argv[] )
std::ofstream outputStream(outputFilename);
outputStream <<std::setprecision(10)<<"Flusser Image moments: [12]"<<std::endl;
- for (Number = 1 ;Number<12;Number++)
+ for (Number = 1;Number<12;Number++)
{
//OTB-FA-00024-CS
function->SetMomentNumber(Number);
diff --git a/Testing/Code/FeatureExtraction/otbFlusserPath.cxx b/Testing/Code/FeatureExtraction/otbFlusserPath.cxx
index 0726a9dbd456e3ba244818470d3e2522e58bbf09..ed574603d1945d02a6eb0a999871671b6b37076a 100644
--- a/Testing/Code/FeatureExtraction/otbFlusserPath.cxx
+++ b/Testing/Code/FeatureExtraction/otbFlusserPath.cxx
@@ -65,7 +65,7 @@ int otbFlusserPath( int argc, char * argv[] )
RealType Result;
- for (Number = 1 ;Number<12;Number++)
+ for (Number = 1;Number<12;Number++)
{
//OTB-FA-00024-CS
function->SetMomentNumber(Number);
diff --git a/Testing/Code/FeatureExtraction/otbHarrisToPointSet.cxx b/Testing/Code/FeatureExtraction/otbHarrisToPointSet.cxx
index 9f02805425130251d3a757ea992b9863f80c06e9..f37e5b5706a1f51d9ddaea3ca559a9414aef1bd5 100644
--- a/Testing/Code/FeatureExtraction/otbHarrisToPointSet.cxx
+++ b/Testing/Code/FeatureExtraction/otbHarrisToPointSet.cxx
@@ -75,10 +75,10 @@ int otbHarrisToPointSet( int argc, char * argv[] )
unsigned long NbPoints = pointList->GetNumberOfPoints();
file << "NbPoints : " << NbPoints <<std::endl;
- for (unsigned long i = 0 ; i < NbPoints ; i++)
+ for (unsigned long i = 0; i < NbPoints; i++)
{
pointList->GetPoint(i,&CoordPoint);
- file << i+1 <<" / " << NbPoints << " : " ;
+ file << i+1 <<" / " << NbPoints << " : ";
file << CoordPoint[0]<<" , "<< CoordPoint[1] << std::endl;
}
diff --git a/Testing/Code/FeatureExtraction/otbHoughTransform2DLinesImageTest.cxx b/Testing/Code/FeatureExtraction/otbHoughTransform2DLinesImageTest.cxx
index d4d60966673e43d10b635593e149225d51be327e..bca9a4ab74ce5f1e5ef34cd5e9cfa7aefa7a5e47 100644
--- a/Testing/Code/FeatureExtraction/otbHoughTransform2DLinesImageTest.cxx
+++ b/Testing/Code/FeatureExtraction/otbHoughTransform2DLinesImageTest.cxx
@@ -224,7 +224,7 @@ int otbHoughTransform2DLinesImageTest(int argc , char* argv[])
{
houghPoint m_HoughPoint;
m_HoughPoint.radius = it_input.GetIndex()[0];
- m_HoughPoint.angle = ((it_input.GetIndex()[1])*2*nPI/houghFilter->GetAngleAxisSize())-nPI ;
+ m_HoughPoint.angle = ((it_input.GetIndex()[1])*2*nPI/houghFilter->GetAngleAxisSize())-nPI;
m_LinesList.push_back(m_HoughPoint);
diff --git a/Testing/Code/FeatureExtraction/otbHuImage.cxx b/Testing/Code/FeatureExtraction/otbHuImage.cxx
index 80e4e21fe60a8137fd71a304606ed5c9de1782c7..29f34d341f985d02c5ea84997f7937c0ce44daa8 100644
--- a/Testing/Code/FeatureExtraction/otbHuImage.cxx
+++ b/Testing/Code/FeatureExtraction/otbHuImage.cxx
@@ -74,7 +74,7 @@ int otbHuImage( int argc, char * argv[] )
std::ofstream outputStream(outputFilename);
outputStream << std::setprecision(10) << "Hu Image moments: [10]"<<std::endl;
- for (Number = 1 ;Number<10;Number++)
+ for (Number = 1;Number<10;Number++)
{
//OTB-FA-00024-CS
function->SetMomentNumber(Number);
diff --git a/Testing/Code/FeatureExtraction/otbHuPath.cxx b/Testing/Code/FeatureExtraction/otbHuPath.cxx
index 645760bab53294aabcac6300b2d51f9ca31ed3e1..528a9f06b00fe792479c552a670302e83afa2951 100644
--- a/Testing/Code/FeatureExtraction/otbHuPath.cxx
+++ b/Testing/Code/FeatureExtraction/otbHuPath.cxx
@@ -65,7 +65,7 @@ int otbHuPath( int argc, char * argv[] )
std::ofstream outputStream(outputFilename);
outputStream << std::setprecision(10) << "Hu Path moments: [8]"<<std::endl;
- for (Number = 1 ;Number<8;Number++)
+ for (Number = 1;Number<8;Number++)
{
//OTB-FA-00024-CS
function->SetMomentNumber(Number);
diff --git a/Testing/Code/FeatureExtraction/otbImageToEdgePathFilter.cxx b/Testing/Code/FeatureExtraction/otbImageToEdgePathFilter.cxx
index d1c32daa626a0c4df59659127ca64b993bfd0543..93d49c6525c3232595c486e55daf6d45cf6d1bd7 100644
--- a/Testing/Code/FeatureExtraction/otbImageToEdgePathFilter.cxx
+++ b/Testing/Code/FeatureExtraction/otbImageToEdgePathFilter.cxx
@@ -76,7 +76,7 @@ int otbImageToEdgePathFilter(int argc, char * argv[])
// Create one iterator for the Input Image (this is a light object)
IteratorType it( outputImage, outputImage->GetBufferedRegion() );
- for (unsigned int cpt=0 ; cpt< ptrVertexList->Size() ; cpt++)
+ for (unsigned int cpt=0; cpt< ptrVertexList->Size(); cpt++)
{
std::cout <<" Point "<<cpt<<" : "<< ptrVertexList->GetElement(cpt)<<std::endl;
IndexType pos;
diff --git a/Testing/Code/FeatureExtraction/otbImageToFastSIFTKeyPointSetFilterOutputDescriptorAscii.cxx b/Testing/Code/FeatureExtraction/otbImageToFastSIFTKeyPointSetFilterOutputDescriptorAscii.cxx
index 26aa4fd829452cef4f451bd461c2423de1709a0e..0a3877a80f7a2c24eda0a1c39ad997dc1238b3e0 100644
--- a/Testing/Code/FeatureExtraction/otbImageToFastSIFTKeyPointSetFilterOutputDescriptorAscii.cxx
+++ b/Testing/Code/FeatureExtraction/otbImageToFastSIFTKeyPointSetFilterOutputDescriptorAscii.cxx
@@ -98,7 +98,7 @@ int otbImageToFastSIFTKeyPointSetFilterOutputDescriptorAscii(int argc, char * ar
}
//Sorting the vectors
- ImageDataType::iterator itData ;
+ ImageDataType::iterator itData;
sort(imageData.begin() , imageData.end(),CMPData);
itData = imageData.begin();
@@ -108,7 +108,7 @@ int otbImageToFastSIFTKeyPointSetFilterOutputDescriptorAscii(int argc, char * ar
int itDescriptor = 0;
while (itDescriptor < static_cast<int> (pDataIt.Value().Size() ))
{
- outfile << "[" << std::fixed << std::setprecision(3) << (*itData)[itDescriptor+2] << " " ;
+ outfile << "[" << std::fixed << std::setprecision(3) << (*itData)[itDescriptor+2] << " ";
itDescriptor++;
}
outfile << "]" << std::endl;
diff --git a/Testing/Code/FeatureExtraction/otbImageToFastSIFTKeyPointSetFilterOutputInterestPointAscii.cxx b/Testing/Code/FeatureExtraction/otbImageToFastSIFTKeyPointSetFilterOutputInterestPointAscii.cxx
index 14926ff5a6a65082e65544761a65b4bb4ba8afdb..f7c9d397e8d315f25e3a46e97ab64d4917149de5 100644
--- a/Testing/Code/FeatureExtraction/otbImageToFastSIFTKeyPointSetFilterOutputInterestPointAscii.cxx
+++ b/Testing/Code/FeatureExtraction/otbImageToFastSIFTKeyPointSetFilterOutputInterestPointAscii.cxx
@@ -104,7 +104,7 @@ int otbImageToFastSIFTKeyPointSetFilterOutputInterestPointAscii(int argc, char *
}
//Sorting the vectors
- ImageDataType::iterator itData ;
+ ImageDataType::iterator itData;
sort(imageData.begin() , imageData.end(),CMP);
itData = imageData.begin();
diff --git a/Testing/Code/FeatureExtraction/otbImageToSURFKeyPointSetFilterOutputDescriptorAscii.cxx b/Testing/Code/FeatureExtraction/otbImageToSURFKeyPointSetFilterOutputDescriptorAscii.cxx
index 24f471675a6111ec9ab91503a15d83d7260dd103..460461d67000dadd2cbbe6e553519c4355e1becd 100644
--- a/Testing/Code/FeatureExtraction/otbImageToSURFKeyPointSetFilterOutputDescriptorAscii.cxx
+++ b/Testing/Code/FeatureExtraction/otbImageToSURFKeyPointSetFilterOutputDescriptorAscii.cxx
@@ -81,7 +81,7 @@ int otbImageToSURFKeyPointSetFilterOutputDescriptorAscii(int argc, char * argv[]
while ( pIt!=filter->GetOutput()->GetPoints()->End() )
{
- outfile << "[" ;
+ outfile << "[";
unsigned int lIterDesc=0;
while (lIterDesc < pDataIt.Value().Size())
{
diff --git a/Testing/Code/FeatureExtraction/otbLikelihoodPathListFilter.cxx b/Testing/Code/FeatureExtraction/otbLikelihoodPathListFilter.cxx
index 77ea94ca4b42f56f575864c828a175034a40709c..f046bd236ba1c2030cff1f171ffce8c8ad8dfc91 100644
--- a/Testing/Code/FeatureExtraction/otbLikelihoodPathListFilter.cxx
+++ b/Testing/Code/FeatureExtraction/otbLikelihoodPathListFilter.cxx
@@ -71,12 +71,12 @@ int otbLikelihoodPathListFilter(int argc, char * argv[])
PathListType::Pointer InputPathList = PathListType::New();
//Generate PathList
- for (PointsMatrixType::iterator listpos=MatricePoints.begin() ; listpos != MatricePoints.end() ; ++listpos)
+ for (PointsMatrixType::iterator listpos=MatricePoints.begin(); listpos != MatricePoints.end(); ++listpos)
{
PathType::Pointer path = PathType::New();
//Generate PathList
std::cout << "List "<<std::endl;
- for (PointsVectorType::iterator it=(*listpos).begin() ; it != (*listpos).end() ; ++it)
+ for (PointsVectorType::iterator it=(*listpos).begin(); it != (*listpos).end(); ++it)
{
cindex[0] = *it;
++it;
diff --git a/Testing/Code/FeatureExtraction/otbLineSegmentDetector.cxx b/Testing/Code/FeatureExtraction/otbLineSegmentDetector.cxx
index 375ede7fbe69f8bc39a47bc691abf338e418b1c9..74ebc650609558bfb16d409a1d74b2592a0693fc 100644
--- a/Testing/Code/FeatureExtraction/otbLineSegmentDetector.cxx
+++ b/Testing/Code/FeatureExtraction/otbLineSegmentDetector.cxx
@@ -78,22 +78,22 @@ int otbLineSegmentDetector( int argc, char * argv[] )
// float x = (*itPoints).GetPosition()[0];
// float y = (*itPoints).GetPosition()[1];
-// IndexBegin[0] = static_cast<int>(x) ; IndexBegin[1] = static_cast<int>(y);
+// IndexBegin[0] = static_cast<int>(x); IndexBegin[1] = static_cast<int>(y);
// itPoints++;
// float x1 = (*itPoints).GetPosition()[0];
// float y1 = (*itPoints).GetPosition()[1];
-// IndexEnd[0]= static_cast<int>(x1) ; IndexEnd[1] = static_cast<int>(y1);
+// IndexEnd[0]= static_cast<int>(x1); IndexEnd[1] = static_cast<int>(y1);
// LineIteratorFilter itLine(reader->GetOutput(),IndexBegin, IndexEnd);
// itLine.GoToBegin();
// while(!itLine.IsAtEnd())
-// {
-// if(reader->GetOutput()->GetRequestedRegion().IsInside(itLine.GetIndex()))
-// itLine.Set(255.);
-// ++itLine;
-// }
+// {
+// if(reader->GetOutput()->GetRequestedRegion().IsInside(itLine.GetIndex()))
+// itLine.Set(255.);
+// ++itLine;
+// }
// ++it;
// }
diff --git a/Testing/Code/FeatureExtraction/otbLineSpatialObjectListToRightAnglePointSetFilter.cxx b/Testing/Code/FeatureExtraction/otbLineSpatialObjectListToRightAnglePointSetFilter.cxx
index 73ec5b3df3c86dea4db386e52dcccc0a0d9295dd..ebecd5775084ed3d71c57c8470fa6b7f8ab35e65 100644
--- a/Testing/Code/FeatureExtraction/otbLineSpatialObjectListToRightAnglePointSetFilter.cxx
+++ b/Testing/Code/FeatureExtraction/otbLineSpatialObjectListToRightAnglePointSetFilter.cxx
@@ -132,7 +132,7 @@ int otbLineSpatialObjectListToRightAnglePointSetFilter( int argc, char * argv[]
segmentOrtho = rightAngleFilter->GetOutput();
PointSetType::PointType pRight;
- for (unsigned int i = 0; i<segmentOrtho->GetNumberOfPoints() ; i++)
+ for (unsigned int i = 0; i<segmentOrtho->GetNumberOfPoints(); i++)
{
segmentOrtho->GetPoint(i, &pRight);
outfile << " Right Angle found in point : " << pRight << std::endl;
diff --git a/Testing/Code/FeatureExtraction/otbLineSpatialObjectListToRightAnglePointSetFilterByStepsOutputAscii.cxx b/Testing/Code/FeatureExtraction/otbLineSpatialObjectListToRightAnglePointSetFilterByStepsOutputAscii.cxx
index 5b485941a1e8fae536891d4bdd174a2b97b45cda..e2dbeaf6c41997151c52e391d7ddecdab928c12b 100644
--- a/Testing/Code/FeatureExtraction/otbLineSpatialObjectListToRightAnglePointSetFilterByStepsOutputAscii.cxx
+++ b/Testing/Code/FeatureExtraction/otbLineSpatialObjectListToRightAnglePointSetFilterByStepsOutputAscii.cxx
@@ -76,7 +76,7 @@ int otbLineSpatialObjectListToRightAnglePointSetFilterByStepsOutputAscii( int ar
LinesListType::Pointer outputLinesList = LinesListType::New();
std::ofstream outfile(outfname);
- for (unsigned int i = 0; i<segmentOrtho->GetNumberOfPoints() ; i++)
+ for (unsigned int i = 0; i<segmentOrtho->GetNumberOfPoints(); i++)
{
segmentOrtho->GetPoint(i, &pRight);
outfile << " Right Angle found in point : " << pRight << std::endl;
diff --git a/Testing/Code/FeatureExtraction/otbLinkPathListFilter.cxx b/Testing/Code/FeatureExtraction/otbLinkPathListFilter.cxx
index 544f57dda8c6ae93d9ea86161d95a4e31b04aecb..ef4893145a72b6c49bb78090f0c3a4826a9b1cb2 100644
--- a/Testing/Code/FeatureExtraction/otbLinkPathListFilter.cxx
+++ b/Testing/Code/FeatureExtraction/otbLinkPathListFilter.cxx
@@ -70,12 +70,12 @@ int otbLinkPathListFilter(int argc, char * argv[])
PathListType::Pointer InputPathList = PathListType::New();
//Generate PathList
- for (PointsMatrixType::iterator listpos=MatricePoints.begin() ; listpos != MatricePoints.end() ; ++listpos)
+ for (PointsMatrixType::iterator listpos=MatricePoints.begin(); listpos != MatricePoints.end(); ++listpos)
{
PathType::Pointer path = PathType::New();
//Generate PathList
std::cout << "List "<<std::endl;
- for (PointsVectorType::iterator it=(*listpos).begin() ; it != (*listpos).end() ; ++it)
+ for (PointsVectorType::iterator it=(*listpos).begin(); it != (*listpos).end(); ++it)
{
cindex[0] = *it;
++it;
diff --git a/Testing/Code/FeatureExtraction/otbRegionImageToRectangularPathListFilter.cxx b/Testing/Code/FeatureExtraction/otbRegionImageToRectangularPathListFilter.cxx
index 6a31eee0c2f5fa64d3041c9c43b10ea121b530da..a40416e0cd54ab17ee3348287b89af42083e9dfe 100644
--- a/Testing/Code/FeatureExtraction/otbRegionImageToRectangularPathListFilter.cxx
+++ b/Testing/Code/FeatureExtraction/otbRegionImageToRectangularPathListFilter.cxx
@@ -37,9 +37,9 @@ int otbRegionImageToRectangularPathListFilter(int argc, char * argv[])
typedef unsigned short InputPixelType;
- const unsigned int Dimension = 2;
+ const unsigned int Dimension = 2;
- typedef otb::Image< InputPixelType, Dimension > InputImageType;
+ typedef otb::Image< InputPixelType, Dimension > InputImageType;
typedef otb::ImageFileReader< InputImageType > ReaderType;
ReaderType::Pointer reader = ReaderType::New();
@@ -79,13 +79,13 @@ int otbRegionImageToRectangularPathListFilter(int argc, char * argv[])
{
for (PathType::VertexListType::ConstIterator vit = listIt.Get()->GetVertexList()->Begin();
- vit != listIt.Get()->GetVertexList()->End();++vit)
- {
- double x = vit.Value()[0];
- double y = vit.Value()[1];
- fprintf(file,"%8.3f %8.3f\n",x,y);
-
- }
+ vit != listIt.Get()->GetVertexList()->End();++vit)
+ {
+ double x = vit.Value()[0];
+ double y = vit.Value()[1];
+ fprintf(file,"%8.3f %8.3f\n",x,y);
+
+ }
double score = listIt.Get()->GetValue();
fprintf(file,"%8.3f\n",score);
diff --git a/Testing/Code/FeatureExtraction/otbRegionImageToRectangularPathListFilterNew.cxx b/Testing/Code/FeatureExtraction/otbRegionImageToRectangularPathListFilterNew.cxx
index e6f111844031dc8ac0e7697ea242d3992cc3c5ad..aefc8b7fcf4a8e0eb97bb419b9369cfed4bffe49 100644
--- a/Testing/Code/FeatureExtraction/otbRegionImageToRectangularPathListFilterNew.cxx
+++ b/Testing/Code/FeatureExtraction/otbRegionImageToRectangularPathListFilterNew.cxx
@@ -23,9 +23,9 @@
int otbRegionImageToRectangularPathListFilterNew(int argc, char * argv[])
{
typedef unsigned short InputPixelType;
- const unsigned int Dimension = 2;
+ const unsigned int Dimension = 2;
- typedef otb::Image< InputPixelType, Dimension > InputImageType;
+ typedef otb::Image< InputPixelType, Dimension > InputImageType;
typedef otb::PolyLineParametricPathWithValue< double, Dimension > PathType;
typedef otb::RegionImageToRectangularPathListFilter<InputImageType,PathType>
diff --git a/Testing/Code/FeatureExtraction/otbRemoveTortuousPathListFilter.cxx b/Testing/Code/FeatureExtraction/otbRemoveTortuousPathListFilter.cxx
index 238dd7e5380a0a5026e9d1b4d77ec5a5c88a41f6..eb37db8bd5a38a7e76e14e57b4de50c487b4fccc 100644
--- a/Testing/Code/FeatureExtraction/otbRemoveTortuousPathListFilter.cxx
+++ b/Testing/Code/FeatureExtraction/otbRemoveTortuousPathListFilter.cxx
@@ -64,12 +64,12 @@ int otbRemoveTortuousPathListFilter(int argc, char * argv[])
PathListType::Pointer InputPathList = PathListType::New();
//Generate PathList
- for (PointsMatrixType::iterator listpos=MatricePoints.begin() ; listpos != MatricePoints.end() ; ++listpos)
+ for (PointsMatrixType::iterator listpos=MatricePoints.begin(); listpos != MatricePoints.end(); ++listpos)
{
PathType::Pointer path = PathType::New();
//Generate PathList
std::cout << "List "<<std::endl;
- for (PointsVectorType::iterator it=(*listpos).begin() ; it != (*listpos).end() ; ++it)
+ for (PointsVectorType::iterator it=(*listpos).begin(); it != (*listpos).end(); ++it)
{
cindex[0] = *it;
++it;
diff --git a/Testing/Code/FeatureExtraction/otbSimplePointCountStrategyTest.cxx b/Testing/Code/FeatureExtraction/otbSimplePointCountStrategyTest.cxx
index 608ed02ef00df6adf861a1073ad3ebd5e1e9077f..e587241abdb91e310fd96f54b7e30d0ef5b005a6 100644
--- a/Testing/Code/FeatureExtraction/otbSimplePointCountStrategyTest.cxx
+++ b/Testing/Code/FeatureExtraction/otbSimplePointCountStrategyTest.cxx
@@ -28,7 +28,7 @@ int otbSimplePointCountStrategyTest(int argc, char * argv[])
typedef float RealType;
typedef otb::Image<RealType,Dimension> ImageType;
- typedef ImageType::PointType PointType ;
+ typedef ImageType::PointType PointType;
typedef itk::VariableLengthVector<RealType> RealVectorType;
typedef itk::PointSet<RealVectorType,Dimension> PointSetType;
@@ -41,10 +41,10 @@ int otbSimplePointCountStrategyTest(int argc, char * argv[])
PointSetType::Pointer pointset = PointSetType::New();
PointsContainerType::ElementIdentifier count = 0;
PointSetType::PointType Point;
- Point[0] = 12.14 ;
+ Point[0] = 12.14;
Point[1] = 14.14;
- for (int i = 0 ; i < 10 ; i++)
+ for (int i = 0; i < 10; i++)
{
pointset->SetPoint(count, Point);
count++;
@@ -52,8 +52,8 @@ int otbSimplePointCountStrategyTest(int argc, char * argv[])
/*Test du filtre*/
IndexType index;
- index[0] = 12 ;
- index[1] = 14 ;
+ index[0] = 12;
+ index[1] = 14;
unsigned int rad = 2;
counterType comptemoica;
diff --git a/Testing/Code/FeatureExtraction/otbSimplifyPathListFilter.cxx b/Testing/Code/FeatureExtraction/otbSimplifyPathListFilter.cxx
index c6bcfb30109f660b49aa2819d2385b3c852a7b71..817785863f976e2e40be37ab079baad24f88d041 100644
--- a/Testing/Code/FeatureExtraction/otbSimplifyPathListFilter.cxx
+++ b/Testing/Code/FeatureExtraction/otbSimplifyPathListFilter.cxx
@@ -64,12 +64,12 @@ int otbSimplifyPathListFilter(int argc, char * argv[])
PathListType::Pointer InputPathList = PathListType::New();
//Generate PathList
- for (PointsMatrixType::iterator listpos=MatricePoints.begin() ; listpos != MatricePoints.end() ; ++listpos)
+ for (PointsMatrixType::iterator listpos=MatricePoints.begin(); listpos != MatricePoints.end(); ++listpos)
{
PathType::Pointer path = PathType::New();
//Generate PathList
std::cout << "List "<<std::endl;
- for (PointsVectorType::iterator it=(*listpos).begin() ; it != (*listpos).end() ; ++it)
+ for (PointsVectorType::iterator it=(*listpos).begin(); it != (*listpos).end(); ++it)
{
cindex[0] = *it;
++it;
diff --git a/Testing/Code/FeatureExtraction/otbThresholdImageToPointSetTest.cxx b/Testing/Code/FeatureExtraction/otbThresholdImageToPointSetTest.cxx
index 71e6a08669f35be57dc995363b70812a589061ea..ba601929fc6b766f56de1ec72bfb125d1cd69652 100644
--- a/Testing/Code/FeatureExtraction/otbThresholdImageToPointSetTest.cxx
+++ b/Testing/Code/FeatureExtraction/otbThresholdImageToPointSetTest.cxx
@@ -68,7 +68,7 @@ int otbThresholdImageToPointSetTest( int argc, char * argv[] )
//Initialization
CoordPoint.Fill(0);
- for (unsigned long i = 0 ; i < NbPoints ; i++)
+ for (unsigned long i = 0; i < NbPoints; i++)
{
pointList->GetPoint(i,&CoordPoint);
file << i+1 <<"/" << NbPoints<<" : " << CoordPoint[0] << " , "<<CoordPoint[1]<< std::endl;
diff --git a/Testing/Code/IO/otbDEMHandlerTest.cxx b/Testing/Code/IO/otbDEMHandlerTest.cxx
index 6954d9f89b3db6bc059468421ca7f36f79b40e6e..c2766dfb8568a2a53fbae461e46ec3c20d0d90b7 100644
--- a/Testing/Code/IO/otbDEMHandlerTest.cxx
+++ b/Testing/Code/IO/otbDEMHandlerTest.cxx
@@ -48,7 +48,7 @@ int otbDEMHandlerTest(int argc, char * argv[])
std::ofstream file;
file.open(outputfilename);
file << "--- HEIGHT ABOVE MSL TEST ---" << std::endl;
- file << " geoPoint: "<<geoPoint[1]<<" ; "<<geoPoint[0]<< std::endl;
+ file << " geoPoint: "<<geoPoint[1]<<"; "<<geoPoint[0]<< std::endl;
file << " -> Height: "<<height<< std::endl;
file.close();
diff --git a/Testing/Code/IO/otbImageSeriesFileReader.cxx b/Testing/Code/IO/otbImageSeriesFileReader.cxx
index 6c001c22034e6863c7f5a7b806c14b7a27240ab5..94727c444baca52a4dbfeb14601e89e155a0fad7 100644
--- a/Testing/Code/IO/otbImageSeriesFileReader.cxx
+++ b/Testing/Code/IO/otbImageSeriesFileReader.cxx
@@ -2,7 +2,7 @@
Program: ORFEO Toolbox
Language: C++
- Date: $Date$
+ Date: $Date$
Version: $Revision$
@@ -12,9 +12,9 @@
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
- PURPOSE. See the above copyright notices for more information.
+ 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/IO/otbImageTest.cxx b/Testing/Code/IO/otbImageTest.cxx
index 31677bedebf9fb514a81321e0264e1df572cf49f..d7c3d5a29265e68d3b9337578f0430fc543d1dba 100644
--- a/Testing/Code/IO/otbImageTest.cxx
+++ b/Testing/Code/IO/otbImageTest.cxx
@@ -76,7 +76,7 @@ int otbImageTest(int argc, char* argv[])
unsigned int GCPCount = image->GetGCPCount();
file << "GCP Count " << image->GetGCPCount() << std::endl;
- for (unsigned int GCPnum = 0 ; GCPnum < GCPCount ; GCPnum++ )
+ for (unsigned int GCPnum = 0; GCPnum < GCPCount; GCPnum++ )
{
file << "GCP[" << GCPnum << "] Id " << image->GetGCPId(GCPnum) << std::endl;
file << "GCP[" << GCPnum << "] Info " << image->GetGCPInfo(GCPnum) << std::endl;
@@ -91,7 +91,7 @@ int otbImageTest(int argc, char* argv[])
InputImageType::VectorType tab = image->GetGeoTransform();
file << "Geo Transform " << std::endl;
- for (unsigned int i = 0 ; i < tab.size() ; i++ )
+ for (unsigned int i = 0; i < tab.size(); i++ )
{
file << " " <<i<<" -> "<<tab[i]<< std::endl;
}
@@ -99,28 +99,28 @@ int otbImageTest(int argc, char* argv[])
tab = image->GetUpperLeftCorner();
file << "Corners " << std::endl;
- for (unsigned int i = 0 ; i < tab.size() ; i++ )
+ for (unsigned int i = 0; i < tab.size(); i++ )
{
file << " UL[" <<i<<"] -> "<<tab[i]<< std::endl;
}
tab.clear();
tab = image->GetUpperRightCorner();
- for (unsigned int i = 0 ; i < tab.size() ; i++ )
+ for (unsigned int i = 0; i < tab.size(); i++ )
{
file << " UR[" <<i<<"] -> "<<tab[i]<< std::endl;
}
tab.clear();
tab = image->GetLowerLeftCorner();
- for (unsigned int i = 0 ; i < tab.size() ; i++ )
+ for (unsigned int i = 0; i < tab.size(); i++ )
{
file << " LL[" <<i<<"] -> "<<tab[i]<< std::endl;
}
tab.clear();
tab = image->GetLowerRightCorner();
- for (unsigned int i = 0 ; i < tab.size() ; i++ )
+ for (unsigned int i = 0; i < tab.size(); i++ )
{
file << " LR[" <<i<<"] -> "<<tab[i]<< std::endl;
}
diff --git a/Testing/Code/IO/otbVectorImageTest.cxx b/Testing/Code/IO/otbVectorImageTest.cxx
index dcc12c08f1d75b984b0b7082524996b412a3b982..681b5ed2fed7fa875a487fe1ad8299e4f2277c02 100644
--- a/Testing/Code/IO/otbVectorImageTest.cxx
+++ b/Testing/Code/IO/otbVectorImageTest.cxx
@@ -76,7 +76,7 @@ int otbVectorImageTest(int argc, char* argv[])
unsigned int GCPCount = image->GetGCPCount();
file << "GCP Count " << image->GetGCPCount() << std::endl;
- for (unsigned int GCPnum = 0 ; GCPnum < GCPCount ; GCPnum++ )
+ for (unsigned int GCPnum = 0; GCPnum < GCPCount; GCPnum++ )
{
file << "GCP[" << GCPnum << "] Id " << image->GetGCPId(GCPnum) << std::endl;
file << "GCP[" << GCPnum << "] Info " << image->GetGCPInfo(GCPnum) << std::endl;
@@ -91,7 +91,7 @@ int otbVectorImageTest(int argc, char* argv[])
InputImageType::VectorType tab = image->GetGeoTransform();
file << "Geo Transform " << std::endl;
- for (unsigned int i = 0 ; i < tab.size() ; i++ )
+ for (unsigned int i = 0; i < tab.size(); i++ )
{
file << " " <<i<<" -> "<<tab[i]<< std::endl;
}
@@ -99,28 +99,28 @@ int otbVectorImageTest(int argc, char* argv[])
tab = image->GetUpperLeftCorner();
file << "Corners " << std::endl;
- for (unsigned int i = 0 ; i < tab.size() ; i++ )
+ for (unsigned int i = 0; i < tab.size(); i++ )
{
file << " UL[" <<i<<"] -> "<<tab[i]<< std::endl;
}
tab.clear();
tab = image->GetUpperRightCorner();
- for (unsigned int i = 0 ; i < tab.size() ; i++ )
+ for (unsigned int i = 0; i < tab.size(); i++ )
{
file << " UR[" <<i<<"] -> "<<tab[i]<< std::endl;
}
tab.clear();
tab = image->GetLowerLeftCorner();
- for (unsigned int i = 0 ; i < tab.size() ; i++ )
+ for (unsigned int i = 0; i < tab.size(); i++ )
{
file << " LL[" <<i<<"] -> "<<tab[i]<< std::endl;
}
tab.clear();
tab = image->GetLowerRightCorner();
- for (unsigned int i = 0 ; i < tab.size() ; i++ )
+ for (unsigned int i = 0; i < tab.size(); i++ )
{
file << " LR[" <<i<<"] -> "<<tab[i]<< std::endl;
}
diff --git a/Testing/Code/Learning/otbSEMClassifierNew.cxx b/Testing/Code/Learning/otbSEMClassifierNew.cxx
index ddcb23b16caf723ae260ddabb4f520b15855d9e2..44fccd7ec5071b89ae78eb2bad9703b62f977db0 100644
--- a/Testing/Code/Learning/otbSEMClassifierNew.cxx
+++ b/Testing/Code/Learning/otbSEMClassifierNew.cxx
@@ -40,7 +40,7 @@ int otbSEMClassifierNew( int argc, char* argv[] )
typedef itk::Statistics::ListSample< ImageType::PixelType > SampleType;
typedef itk::Statistics::Subsample< SampleType > ClassSampleType;
- typedef otb::Statistics::ModelComponentBase< ClassSampleType > ComponentType ;
+ typedef otb::Statistics::ModelComponentBase< ClassSampleType > ComponentType;
ClassifType::Pointer classifier = ClassifType::New();
ComponentType::Pointer component = ComponentType::New();
diff --git a/Testing/Code/Learning/otbSOMClassifier.cxx b/Testing/Code/Learning/otbSOMClassifier.cxx
index 1af7a3f85601e80678fe9d25eeac75da8a3c7168..ddcc6afafd125629b9662d028eb3798f7327e815 100644
--- a/Testing/Code/Learning/otbSOMClassifier.cxx
+++ b/Testing/Code/Learning/otbSOMClassifier.cxx
@@ -35,7 +35,7 @@ int otbSOMClassifier(int argc, char* argv[] )
if (argc != 4)
{
std::cout << "Usage : " << argv[0] << " inputImage modelFile outputImage"
- << std::endl ;
+ << std::endl;
return EXIT_FAILURE;
}
@@ -81,10 +81,10 @@ int otbSOMClassifier(int argc, char* argv[] )
++it;
}
- ClassifierType::Pointer classifier = ClassifierType::New() ;
+ ClassifierType::Pointer classifier = ClassifierType::New();
classifier->SetSample(listSample.GetPointer());
classifier->SetMap(somreader->GetOutput());
- classifier->Update() ;
+ classifier->Update();
OutputImageType::Pointer outputImage = OutputImageType::New();
outputImage->SetRegions( reader->GetOutput()->GetLargestPossibleRegion());
@@ -100,7 +100,7 @@ int otbSOMClassifier(int argc, char* argv[] )
while (m_iter != m_last && !outIt.IsAtEnd())
{
outIt.Set(m_iter.GetClassLabel());
- ++m_iter ;
+ ++m_iter;
++outIt;
}
diff --git a/Testing/Code/Learning/otbSOMClassifierNew.cxx b/Testing/Code/Learning/otbSOMClassifierNew.cxx
index 4708f3f6d379b6e0c3cbde10315fa96452c7567c..32755d567dcf8a433fcb8fe5acbf8ce0a2c466db 100644
--- a/Testing/Code/Learning/otbSOMClassifierNew.cxx
+++ b/Testing/Code/Learning/otbSOMClassifierNew.cxx
@@ -39,7 +39,7 @@ int otbSOMClassifierNew(int argc, char* argv[] )
typedef itk::Statistics::ListSample< PixelType > SampleType;
typedef otb::SOMClassifier<SampleType,SOMMapType,LabelPixelType> ClassifierType;
- ClassifierType::Pointer classifier = ClassifierType::New() ;
+ ClassifierType::Pointer classifier = ClassifierType::New();
return EXIT_SUCCESS;
diff --git a/Testing/Code/Learning/otbSVMClassifierImage.cxx b/Testing/Code/Learning/otbSVMClassifierImage.cxx
index 0898244e3093d1568652bd11395456f08e82eedc..b5bb515502d510c4dc559a0659693f8988e6fcb7 100644
--- a/Testing/Code/Learning/otbSVMClassifierImage.cxx
+++ b/Testing/Code/Learning/otbSVMClassifierImage.cxx
@@ -62,12 +62,12 @@ public:
int otbSVMClassifierImage(int argc, char* argv[] )
{
- namespace stat = itk::Statistics ;
+ namespace stat = itk::Statistics;
if (argc != 4)
{
std::cout << "Usage : " << argv[0] << " inputImage modelFile outputImage"
- << std::endl ;
+ << std::endl;
return EXIT_FAILURE;
}
@@ -108,14 +108,14 @@ int otbSVMClassifierImage(int argc, char* argv[] )
int numberOfClasses = model->GetNumberOfClasses();
- typedef otb::SVMClassifier< SampleType, LabelPixelType > ClassifierType ;
+ typedef otb::SVMClassifier< SampleType, LabelPixelType > ClassifierType;
- ClassifierType::Pointer classifier = ClassifierType::New() ;
+ ClassifierType::Pointer classifier = ClassifierType::New();
- classifier->SetNumberOfClasses(numberOfClasses) ;
+ classifier->SetNumberOfClasses(numberOfClasses);
classifier->SetModel( model );
- classifier->SetSample(sample.GetPointer()) ;
- classifier->Update() ;
+ classifier->SetSample(sample.GetPointer());
+ classifier->Update();
/* Build the class map */
otbGenericMsgDebugMacro( << "Output image creation" );
@@ -148,12 +148,12 @@ int otbSVMClassifierImage(int argc, char* argv[] )
otbGenericMsgDebugMacro( << "classifier get output" );
ClassifierType::OutputType* membershipSample =
- classifier->GetOutput() ;
+ classifier->GetOutput();
otbGenericMsgDebugMacro( << "Sample iterators" );
ClassifierType::OutputType::ConstIterator m_iter =
- membershipSample->Begin() ;
+ membershipSample->Begin();
ClassifierType::OutputType::ConstIterator m_last =
- membershipSample->End() ;
+ membershipSample->End();
otbGenericMsgDebugMacro( << "Image iterator" );
typedef itk::ImageRegionIterator< OutputImageType> OutputIteratorType;
@@ -168,7 +168,7 @@ int otbSVMClassifierImage(int argc, char* argv[] )
while (m_iter != m_last && !outIt.IsAtEnd())
{
outIt.Set(m_iter.GetClassLabel());
- ++m_iter ;
+ ++m_iter;
++outIt;
}
diff --git a/Testing/Code/Learning/otbSVMClassifierNew.cxx b/Testing/Code/Learning/otbSVMClassifierNew.cxx
index 2442a1fcd26b53c6e66d0aeeb4291a4f3cc4bdcb..7674a7fa049e9b4c7365a5214f2107cf1a9eecce 100644
--- a/Testing/Code/Learning/otbSVMClassifierNew.cxx
+++ b/Testing/Code/Learning/otbSVMClassifierNew.cxx
@@ -29,13 +29,13 @@ int otbSVMClassifierNew(int argc, char* argv[] )
{
typedef double InputPixelType;
typedef int LabelPixelType;
- typedef itk::PointSet< InputPixelType, 2 > PointSetType ;
+ typedef itk::PointSet< InputPixelType, 2 > PointSetType;
typedef itk::Statistics::PointSetToListAdaptor< PointSetType >
DataSampleType;
- typedef otb::SVMClassifier< DataSampleType, LabelPixelType > ClassifierType ;
+ typedef otb::SVMClassifier< DataSampleType, LabelPixelType > ClassifierType;
ClassifierType::Pointer classifier = ClassifierType::New();
diff --git a/Testing/Code/Learning/otbSVMClassifierPointSet.cxx b/Testing/Code/Learning/otbSVMClassifierPointSet.cxx
index eac2bf01b58c8911ae825a7c5204efb055994e28..b760bf5b1435de303dc76966e0d83699e0e3c47d 100644
--- a/Testing/Code/Learning/otbSVMClassifierPointSet.cxx
+++ b/Testing/Code/Learning/otbSVMClassifierPointSet.cxx
@@ -32,12 +32,12 @@
int otbSVMClassifierPointSet(int argc, char* argv[] )
{
- namespace stat = itk::Statistics ;
+ namespace stat = itk::Statistics;
if (argc != 2)
{
std::cout << "Usage : " << argv[0] << " modelFile"
- << std::endl ;
+ << std::endl;
return EXIT_FAILURE;
}
@@ -109,26 +109,26 @@ int otbSVMClassifierPointSet(int argc, char* argv[] )
int numberOfClasses = model->GetNumberOfClasses();
- typedef otb::SVMClassifier< SampleType, LabelPixelType > ClassifierType ;
+ typedef otb::SVMClassifier< SampleType, LabelPixelType > ClassifierType;
- ClassifierType::Pointer classifier = ClassifierType::New() ;
+ ClassifierType::Pointer classifier = ClassifierType::New();
- classifier->SetNumberOfClasses(numberOfClasses) ;
+ classifier->SetNumberOfClasses(numberOfClasses);
classifier->SetModel( model );
- classifier->SetSample(sample.GetPointer()) ;
- classifier->Update() ;
+ classifier->SetSample(sample.GetPointer());
+ classifier->Update();
/* Build the class map */
std::cout << "classifier get output" << std::endl;
ClassifierType::OutputType* membershipSample =
- classifier->GetOutput() ;
+ classifier->GetOutput();
std::cout << "Sample iterators" << std::endl;
ClassifierType::OutputType::ConstIterator m_iter =
- membershipSample->Begin() ;
+ membershipSample->Begin();
ClassifierType::OutputType::ConstIterator m_last =
- membershipSample->End() ;
+ membershipSample->End();
double error = 0.0;
@@ -149,7 +149,7 @@ int otbSVMClassifierPointSet(int argc, char* argv[] )
++pointId;
- ++m_iter ;
+ ++m_iter;
}
std::cout << "Error = " << error/pointId << std::endl;
diff --git a/Testing/Code/MultiScale/otbWaveletFilterBank.cxx b/Testing/Code/MultiScale/otbWaveletFilterBank.cxx
index 3022a30fef62247419e784b94485802b2f4e458a..c61a217f2d71e9af9b067bcb84dc8f9737cb03ef 100644
--- a/Testing/Code/MultiScale/otbWaveletFilterBank.cxx
+++ b/Testing/Code/MultiScale/otbWaveletFilterBank.cxx
@@ -37,7 +37,7 @@ int otbWaveletFilterBank( int argc, char * argv[] )
{
typedef otb::CommandLineArgumentParser ParserType;
ParserType::Pointer parser = ParserType::New();
- parser->AddInputImage() ;
+ parser->AddInputImage();
//parser->AddOption( "--Level", "Decomposition level through the low pass branch (def. 1)", "-l", 1, false );
//parser->AddOutputImage();
parser->AddOption( "--Output", "Output filename prefix", "-out", 1, true );
diff --git a/Testing/Code/MultiScale/otbWaveletPacketTransform.cxx b/Testing/Code/MultiScale/otbWaveletPacketTransform.cxx
index 2a6d7058291e3db97806722a8ebaba1fb2016dfd..f7e75dcd64d8d6a4d43cebf135d3d5689bd258ec 100644
--- a/Testing/Code/MultiScale/otbWaveletPacketTransform.cxx
+++ b/Testing/Code/MultiScale/otbWaveletPacketTransform.cxx
@@ -39,7 +39,7 @@ int otbWaveletPacketTransform( int argc, char * argv[] )
{
typedef otb::CommandLineArgumentParser ParserType;
ParserType::Pointer parser = ParserType::New();
- parser->AddInputImage() ;
+ parser->AddInputImage();
parser->AddOption( "--Level", "Decomposition level of the wavelet packet (def. 1)", "-l", 1, false );
parser->AddOption( "--Output", "Output filename prefix", "-out", 1, true );
typedef otb::CommandLineArgumentParseResult ParserResultType;
diff --git a/Testing/Code/MultiScale/otbWaveletTransform.cxx b/Testing/Code/MultiScale/otbWaveletTransform.cxx
index 4181562a7e64bce4e13ab66ea2e8b13974f57762..c5ec490a16146bd640a9cff6ed2964fd723b9518 100644
--- a/Testing/Code/MultiScale/otbWaveletTransform.cxx
+++ b/Testing/Code/MultiScale/otbWaveletTransform.cxx
@@ -38,7 +38,7 @@ int otbWaveletTransform( int argc, char * argv[] )
{
typedef otb::CommandLineArgumentParser ParserType;
ParserType::Pointer parser = ParserType::New();
- parser->AddInputImage() ;
+ parser->AddInputImage();
parser->AddOption( "--Level", "Decomposition level through the low pass branch (def. 1)", "-l", 1, false );
parser->AddOption( "--Output", "Output filename prefix", "-out", 1, true );
typedef otb::CommandLineArgumentParseResult ParserResultType;
diff --git a/Testing/Code/Projections/otbOrthoRectificationFilter.cxx b/Testing/Code/Projections/otbOrthoRectificationFilter.cxx
index f08eef9b87f1c0dfff43e6aafce93310f67483b7..43727345626d11b6927c1cbf9b242fcb8c58fbbd 100644
--- a/Testing/Code/Projections/otbOrthoRectificationFilter.cxx
+++ b/Testing/Code/Projections/otbOrthoRectificationFilter.cxx
@@ -51,8 +51,8 @@ int otbOrthoRectificationFilter( int argc, char* argv[] )
typedef otb::Image<double, 2> ImageType;
typedef otb::ImageFileReader<ImageType> ReaderType;
typedef otb::StreamingImageFileWriter<ImageType> WriterType;
- typedef otb::UtmInverseProjection UtmMapProjectionType ;
- typedef otb::OrthoRectificationFilter<ImageType, ImageType, UtmMapProjectionType> OrthoRectifFilterType ;
+ typedef otb::UtmInverseProjection UtmMapProjectionType;
+ typedef otb::OrthoRectificationFilter<ImageType, ImageType, UtmMapProjectionType> OrthoRectifFilterType;
//Allocate pointer
ReaderType::Pointer reader = ReaderType::New();
diff --git a/Testing/Code/Projections/otbOrthoRectificationFilterNew.cxx b/Testing/Code/Projections/otbOrthoRectificationFilterNew.cxx
index 4f55ffcef1d1fc9884355b69e26bcf79d666e349..42c6b4019a39c31e442376497d61ac05429afc5f 100644
--- a/Testing/Code/Projections/otbOrthoRectificationFilterNew.cxx
+++ b/Testing/Code/Projections/otbOrthoRectificationFilterNew.cxx
@@ -25,8 +25,8 @@
int otbOrthoRectificationFilterNew( int argc, char* argv[] )
{
typedef otb::Image<double, 2> ImageType;
- typedef otb::UtmInverseProjection UtmMapProjectionType ;
- typedef otb::OrthoRectificationFilter<ImageType, ImageType, UtmMapProjectionType> OrthoRectifFilterType ;
+ typedef otb::UtmInverseProjection UtmMapProjectionType;
+ typedef otb::OrthoRectificationFilter<ImageType, ImageType, UtmMapProjectionType> OrthoRectifFilterType;
OrthoRectifFilterType::Pointer orthoRectifFilter=OrthoRectifFilterType::New();
diff --git a/Testing/Code/Projections/otbOrthoRectificationFilterWithDEM.cxx b/Testing/Code/Projections/otbOrthoRectificationFilterWithDEM.cxx
index c5a9863b7eed5e785b8a8d3e6a874088e57903f0..2f57114ae379cd35d834eaf2dd56005a04f21bf8 100644
--- a/Testing/Code/Projections/otbOrthoRectificationFilterWithDEM.cxx
+++ b/Testing/Code/Projections/otbOrthoRectificationFilterWithDEM.cxx
@@ -65,8 +65,8 @@ int otbOrthoRectificationFilterWithDEM( int argc, char* argv[] )
typedef otb::ImageFileReader<ImageType> ReaderType;
typedef otb::StreamingImageFileWriter<ImageType> WriterType;
- typedef otb::UtmInverseProjection UtmMapProjectionType ;
- typedef otb::OrthoRectificationFilter<ImageType, ImageType, UtmMapProjectionType> OrthoRectifFilterType ;
+ typedef otb::UtmInverseProjection UtmMapProjectionType;
+ typedef otb::OrthoRectificationFilter<ImageType, ImageType, UtmMapProjectionType> OrthoRectifFilterType;
//Allocate pointer
ReaderType::Pointer reader=ReaderType::New();
diff --git a/Testing/Code/Projections/otbOrthoRectificationMonoThreadFilter.cxx b/Testing/Code/Projections/otbOrthoRectificationMonoThreadFilter.cxx
index 49f59aff70f21bc10d0047d4c6bf6b7aaadb5481..1e9625f70f376df6cdadb82b87595f137dc9255d 100644
--- a/Testing/Code/Projections/otbOrthoRectificationMonoThreadFilter.cxx
+++ b/Testing/Code/Projections/otbOrthoRectificationMonoThreadFilter.cxx
@@ -52,8 +52,8 @@ int otbOrthoRectificationMonoThreadFilter( int argc, char* argv[] )
typedef otb::Image<double, 2> ImageType;
typedef otb::ImageFileReader<ImageType> ReaderType;
typedef otb::StreamingImageFileWriter<ImageType> WriterType;
- typedef otb::UtmInverseProjection UtmMapProjectionType ;
- typedef otb::OrthoRectificationFilter<ImageType, ImageType, UtmMapProjectionType> OrthoRectifFilterType ;
+ typedef otb::UtmInverseProjection UtmMapProjectionType;
+ typedef otb::OrthoRectificationFilter<ImageType, ImageType, UtmMapProjectionType> OrthoRectifFilterType;
//Allocate pointer
ReaderType::Pointer reader = ReaderType::New();
diff --git a/Testing/Code/Radiometry/otbAtmosphericCorrectionSequencement.cxx b/Testing/Code/Radiometry/otbAtmosphericCorrectionSequencement.cxx
index 8795d76315e30b0a5006a3104cc777b8b7a0280e..d4cc59629953f58aedb6bb130443f5b1a50b7c2e 100644
--- a/Testing/Code/Radiometry/otbAtmosphericCorrectionSequencement.cxx
+++ b/Testing/Code/Radiometry/otbAtmosphericCorrectionSequencement.cxx
@@ -82,7 +82,7 @@ int otbAtmosphericCorrectionSequencementTest( int argc, char *argv[] )
std::ifstream fin;
fin.open(argv[3]);
double dalpha(0.), dbeta(0.);
- for ( unsigned int i=0 ; i < nbOfComponent ; i++)
+ for ( unsigned int i=0; i < nbOfComponent; i++)
{
fin >> dalpha;
fin >> dbeta;
@@ -108,7 +108,7 @@ int otbAtmosphericCorrectionSequencementTest( int argc, char *argv[] )
fin.open(argv[7]);
double dsolarIllumination(0.);
- for ( unsigned int i=0 ; i < nbOfComponent ; i++)
+ for ( unsigned int i=0; i < nbOfComponent; i++)
{
fin >> dsolarIllumination;
solarIllumination[i] = dsolarIllumination;
@@ -157,7 +157,7 @@ int otbAtmosphericCorrectionSequencementTest( int argc, char *argv[] )
fin.open(argv[16]);
fin >> nbBands;
- for (unsigned int i=0 ; i<nbBands ; i++)
+ for (unsigned int i=0; i<nbBands; i++)
{
valuesVector.clear();
fin >> sString;
@@ -165,7 +165,7 @@ int otbAtmosphericCorrectionSequencementTest( int argc, char *argv[] )
fin >> maxSpectralValue;
fin >> userStep;
fin >> nbValuesPerBand;
- for ( unsigned int j=0 ; j < nbValuesPerBand ; j++)
+ for ( unsigned int j=0; j < nbValuesPerBand; j++)
{
fin >> value;
valuesVector.push_back(value);
diff --git a/Testing/Code/Visualization/otbHistogramCurveNew.cxx b/Testing/Code/Visualization/otbHistogramCurveNew.cxx
index be8d6f7e4ba7d9865a85780fcbc3f5d6b1ac160c..d9962a4aba1b7c9eb5d31d182344379b157c499c 100644
--- a/Testing/Code/Visualization/otbHistogramCurveNew.cxx
+++ b/Testing/Code/Visualization/otbHistogramCurveNew.cxx
@@ -25,6 +25,6 @@ int otbHistogramCurveNew( int argc, char * argv[] )
itk::Statistics::DenseFrequencyContainer > HistogramType;
typedef otb::HistogramCurve<HistogramType> HistogramCurveType;
HistogramCurveType::Pointer curve = HistogramCurveType::New();
-
+
return EXIT_SUCCESS;
}
diff --git a/Testing/Fa/PolygonsVectorization.cxx b/Testing/Fa/PolygonsVectorization.cxx
index ed77a9d306a8dd15d17ca4461a48321a6c2a04bf..816558e7ed692aa15030a70e920d6fc9e3304751 100644
--- a/Testing/Fa/PolygonsVectorization.cxx
+++ b/Testing/Fa/PolygonsVectorization.cxx
@@ -72,7 +72,7 @@ int main( int argc, char * argv[] )
typedef itk::ConnectedComponentImageFilter<LabeledImageType,LabeledImageType> ConnectedFilterType;
typedef itk::RescaleIntensityImageFilter<LabeledImageType,OutputImageType> RescalerType;
/*
- typedef itk::BinaryBallStructuringElement< LabelPixelType, 2 > StructuringElementType;
+ typedef itk::BinaryBallStructuringElement< LabelPixelType, 2 > StructuringElementType;
typedef itk::BinaryErodeImageFilter<LabeledImageType,LabeledImageType,StructuringElementType> ErodeFilterType;
typedef itk::BinaryDilateImageFilter<LabeledImageType,LabeledImageType,StructuringElementType> DilateFilterType;
typedef itk::MedianImageFilter<LabeledImageType,LabeledImageType> MedianFilterType;
@@ -105,14 +105,14 @@ int main( int argc, char * argv[] )
{
std::string descriptionException = err.GetDescription();
if(descriptionException.find("ParseCommandLine(): Help Parser")
- != std::string::npos)
+ != std::string::npos)
{
- return EXIT_SUCCESS;
+ return EXIT_SUCCESS;
}
if(descriptionException.find("ParseCommandLine(): Version Parser")
- != std::string::npos)
+ != std::string::npos)
{
- return EXIT_SUCCESS;
+ return EXIT_SUCCESS;
}
return EXIT_FAILURE;
}
@@ -195,10 +195,10 @@ int main( int argc, char * argv[] )
{
std::cout << "polygon " << polygon << "\tnPoints="
<< OutputPolyList->GetNthElement(polygon)->GetVertexList()->Size() << "\tsurface="
- << OutputPolyList->GetNthElement(polygon)->GetArea()<< "\tlength="
- << OutputPolyList->GetNthElement(polygon)->GetLength() << "\tregion size="
- << polygonRegion.GetSize() <<"\tregion nb pixel="
- << polygonRegion.GetNumberOfPixels() << std::endl;
+ << OutputPolyList->GetNthElement(polygon)->GetArea()<< "\tlength="
+ << OutputPolyList->GetNthElement(polygon)->GetLength() << "\tregion size="
+ << polygonRegion.GetSize() <<"\tregion nb pixel="
+ << polygonRegion.GetNumberOfPixels() << std::endl;
// std::cout << OutputPolyList->GetNthElement(polygon)<< std::endl << std::endl;
}
polygon++;
@@ -254,8 +254,8 @@ int main( int argc, char * argv[] )
outputIt.GoToBegin();
while(!outputIt.IsAtEnd())
{
- outputIt.Set(0);
- ++outputIt;
+ outputIt.Set(0);
+ ++outputIt;
}
}
@@ -276,14 +276,14 @@ int main( int argc, char * argv[] )
try
{
- otb::StandardWriterWatcher watcher(writer, "Remove small object");
- writer->Update();
+ otb::StandardWriterWatcher watcher(writer, "Remove small object");
+ writer->Update();
}
catch ( itk::ExceptionObject &err)
{
- std::cout << "ExceptionObject caught !" << std::endl;
- std::cout << err << std::endl;
- return EXIT_FAILURE;
+ std::cout << "ExceptionObject caught !" << std::endl;
+ std::cout << err << std::endl;
+ return EXIT_FAILURE;
}
if (minSize == 0)
diff --git a/Utilities/otbossim/src/ossim/projection/ossimIkonosRpcModel.cpp b/Utilities/otbossim/src/ossim/projection/ossimIkonosRpcModel.cpp
index 9b3693987fa9a14c6af3ea44e76b6ea9c8ca0472..21369fe9085db106b66cc3fd6fca0ce6a2aeb8a0 100644
--- a/Utilities/otbossim/src/ossim/projection/ossimIkonosRpcModel.cpp
+++ b/Utilities/otbossim/src/ossim/projection/ossimIkonosRpcModel.cpp
@@ -888,7 +888,6 @@ bool ossimIkonosRpcModel::parseTiffFile(const ossimFilename& filename)
//retrieve information from the metadata file
//if the ikonos tif is po_2619900_pan_0000000.tif
//the metadata file will be po_2619900_metadata.txt
- std::cout << "Parsing metadata..." << std::endl;
ossimString separator("_");
ossimString filenamebase = filename.fileNoExtension();
std::vector< ossimString > filenameparts = filenamebase.split(separator);
diff --git a/Utilities/otbossim/src/ossim/support_data/ossimIkonosMetaData.cpp b/Utilities/otbossim/src/ossim/support_data/ossimIkonosMetaData.cpp
index 89fc27aa9cbddd48e7b89265a4113afccab0428b..578fa3c36d71a71953ed54483c0c5aeee7b54bea 100644
--- a/Utilities/otbossim/src/ossim/support_data/ossimIkonosMetaData.cpp
+++ b/Utilities/otbossim/src/ossim/support_data/ossimIkonosMetaData.cpp
@@ -46,7 +46,6 @@ ossimIkonosMetaData::ossimIkonosMetaData(const ossimFilename& imageFilename)
//retrieve information from the metadata file
//if the ikonos tif is po_2619900_pan_0000000.tif
//the metadata file will be po_2619900_metadata.txt
- std::cout << "Parsing metadata..." << std::endl;
ossimString separator("_");
ossimString filenamebase = imageFilename.fileNoExtension();
std::vector< ossimString > filenameparts = filenamebase.split(separator);