Commit 6f89deca authored by OTB Bot's avatar OTB Bot
Browse files

STYLE

parent b4157bb5
...@@ -27,7 +27,6 @@ ...@@ -27,7 +27,6 @@
#include <itkConnectedComponentFunctorImageFilter.h> #include <itkConnectedComponentFunctorImageFilter.h>
namespace otb { namespace otb {
...@@ -74,7 +73,6 @@ private: ...@@ -74,7 +73,6 @@ private:
/** \class MeanShiftSegmentationFilter /** \class MeanShiftSegmentationFilter
* *
* Performs segmentation of an image by chaining a mean shift filter and region * Performs segmentation of an image by chaining a mean shift filter and region
...@@ -126,14 +124,12 @@ public: ...@@ -126,14 +124,12 @@ public:
typedef typename RegionPruningFilterType::Pointer RegionPruningFilterPointerType; typedef typename RegionPruningFilterType::Pointer RegionPruningFilterPointerType;
typedef Functor::ConnectedLabelFunctor<InputLabelPixelType> LabelFunctorType; typedef Functor::ConnectedLabelFunctor<InputLabelPixelType> LabelFunctorType;
typedef itk::ConnectedComponentFunctorImageFilter<InputLabelImageType,InputLabelImageType,LabelFunctorType> RelabelComponentFilterType; typedef itk::ConnectedComponentFunctorImageFilter<InputLabelImageType,InputLabelImageType,LabelFunctorType> RelabelComponentFilterType;
typedef typename RelabelComponentFilterType::Pointer RelabelComponentFilterPointerType; typedef typename RelabelComponentFilterType::Pointer RelabelComponentFilterPointerType;
/** Sets the spatial bandwidth (or radius in the case of a uniform kernel) /** Sets the spatial bandwidth (or radius in the case of a uniform kernel)
* of the neighborhood for each pixel * of the neighborhood for each pixel
*/ */
......
...@@ -36,7 +36,7 @@ GenericRSTransform<TScalarType, NInputDimensions, NOutputDimensions> ...@@ -36,7 +36,7 @@ GenericRSTransform<TScalarType, NInputDimensions, NOutputDimensions>
m_DEMDirectory(""), m_GeoidFile(""), m_DEMDirectory(""), m_GeoidFile(""),
m_AverageElevation(-32768.0), m_AverageElevation(-32768.0),
m_OptimizeInputTransform(false), m_OptimizeInputTransform(false),
m_OptimizeOutputTransform(false), m_OptimizeOutputTransform(false),
m_InputTiePoints(), m_InputTiePoints(),
m_OutputTiePoints() m_OutputTiePoints()
...@@ -171,7 +171,7 @@ GenericRSTransform<TScalarType, NInputDimensions, NOutputDimensions> ...@@ -171,7 +171,7 @@ GenericRSTransform<TScalarType, NInputDimensions, NOutputDimensions>
if(m_OptimizeInputTransform && !m_InputTiePoints.empty()) if(m_OptimizeInputTransform && !m_InputTiePoints.empty())
{ {
for(typename InputTiePointContainerType::const_iterator it = m_InputTiePoints.begin(); for(typename InputTiePointContainerType::const_iterator it = m_InputTiePoints.begin();
it!= m_InputTiePoints.end();++it) it!= m_InputTiePoints.end(); ++it)
{ {
sensorModel->AddTiePoint(it->first,it->second); sensorModel->AddTiePoint(it->first,it->second);
} }
...@@ -254,7 +254,7 @@ GenericRSTransform<TScalarType, NInputDimensions, NOutputDimensions> ...@@ -254,7 +254,7 @@ GenericRSTransform<TScalarType, NInputDimensions, NOutputDimensions>
if(m_OptimizeOutputTransform && !m_OutputTiePoints.empty()) if(m_OptimizeOutputTransform && !m_OutputTiePoints.empty())
{ {
for(typename OutputTiePointContainerType::const_iterator it = m_OutputTiePoints.begin(); for(typename OutputTiePointContainerType::const_iterator it = m_OutputTiePoints.begin();
it!= m_OutputTiePoints.end();++it) it!= m_OutputTiePoints.end(); ++it)
{ {
sensorModel->AddTiePoint(it->second,it->first); sensorModel->AddTiePoint(it->second,it->first);
} }
......
...@@ -90,7 +90,7 @@ SensorModelBase<TScalarType, NInputDimensions, NOutputDimensions> ...@@ -90,7 +90,7 @@ SensorModelBase<TScalarType, NInputDimensions, NOutputDimensions>
template <class TScalarType, template <class TScalarType,
unsigned int NInputDimensions, unsigned int NInputDimensions,
unsigned int NOutputDimensions> unsigned int NOutputDimensions>
void void
SensorModelBase<TScalarType, NInputDimensions, NOutputDimensions> SensorModelBase<TScalarType, NInputDimensions, NOutputDimensions>
::AddTiePoint(const InputPointType & inputPoint, const OutputPointType & outputPoint) ::AddTiePoint(const InputPointType & inputPoint, const OutputPointType & outputPoint)
{ {
...@@ -101,7 +101,7 @@ SensorModelBase<TScalarType, NInputDimensions, NOutputDimensions> ...@@ -101,7 +101,7 @@ SensorModelBase<TScalarType, NInputDimensions, NOutputDimensions>
template <class TScalarType, template <class TScalarType,
unsigned int NInputDimensions, unsigned int NInputDimensions,
unsigned int NOutputDimensions> unsigned int NOutputDimensions>
void void
SensorModelBase<TScalarType, NInputDimensions, NOutputDimensions> SensorModelBase<TScalarType, NInputDimensions, NOutputDimensions>
::ClearTiePoints() ::ClearTiePoints()
{ {
...@@ -112,7 +112,7 @@ SensorModelBase<TScalarType, NInputDimensions, NOutputDimensions> ...@@ -112,7 +112,7 @@ SensorModelBase<TScalarType, NInputDimensions, NOutputDimensions>
template <class TScalarType, template <class TScalarType,
unsigned int NInputDimensions, unsigned int NInputDimensions,
unsigned int NOutputDimensions> unsigned int NOutputDimensions>
double double
SensorModelBase<TScalarType, NInputDimensions, NOutputDimensions> SensorModelBase<TScalarType, NInputDimensions, NOutputDimensions>
::Optimize() ::Optimize()
{ {
......
...@@ -204,8 +204,8 @@ void SensorModelAdapter::AddTiePoint(double x, double y, double z, double lon, d ...@@ -204,8 +204,8 @@ void SensorModelAdapter::AddTiePoint(double x, double y, double z, double lon, d
if (this->m_UseDEM) if (this->m_UseDEM)
{ {
double height = this->m_DEMHandler->GetHeightAboveMSL(lon, lat); double height = this->m_DEMHandler->GetHeightAboveMSL(lon, lat);
if(!ossim::isnan(height)) if(!ossim::isnan(height))
{ {
ossimGPoint.height(height); ossimGPoint.height(height);
} }
} }
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment