From a47a9be7e2029522d862256c28bb4bd97e2258e7 Mon Sep 17 00:00:00 2001
From: OTB Bot <otbbot@orfeo-toolbox.org>
Date: Fri, 13 Apr 2012 19:58:05 +0200
Subject: [PATCH] STYLE
---
Code/ApplicationEngine/otbWrapperApplication.cxx | 1 -
Code/DisparityMap/otbSubPixelDisparityImageFilter.txx | 4 ++--
Code/OBIA/otbFusionOGRTileFilter.h | 4 ++--
Code/OBIA/otbFusionOGRTileFilter.txx | 2 +-
.../OGRAdapters/otbOGRDataSourceWrapper.cxx | 10 +++++-----
.../OGRAdapters/otbOGRDataSourceWrapper.h | 10 +++++-----
.../OGRAdapters/otbOGRLayerWrapper.cxx | 4 ++--
.../UtilitiesAdapters/OGRAdapters/otbOGRLayerWrapper.h | 8 ++++----
8 files changed, 21 insertions(+), 22 deletions(-)
diff --git a/Code/ApplicationEngine/otbWrapperApplication.cxx b/Code/ApplicationEngine/otbWrapperApplication.cxx
index 95bf39308d..2005503b5d 100644
--- a/Code/ApplicationEngine/otbWrapperApplication.cxx
+++ b/Code/ApplicationEngine/otbWrapperApplication.cxx
@@ -1187,7 +1187,6 @@ void Application::AddRANDParameter(std::string paramKey)
-
std::vector< std::pair<std::string, std::string> >
Application::GetOutputParametersSumUp()
{
diff --git a/Code/DisparityMap/otbSubPixelDisparityImageFilter.txx b/Code/DisparityMap/otbSubPixelDisparityImageFilter.txx
index 4198d352fe..0dbda5d596 100644
--- a/Code/DisparityMap/otbSubPixelDisparityImageFilter.txx
+++ b/Code/DisparityMap/otbSubPixelDisparityImageFilter.txx
@@ -1777,7 +1777,7 @@ TDisparityImage,TMaskImage,TBlockMatchingFunctor>
outMetricIt.Set( s_yb );
}
else if (!verticalInterpolation && horizontalInterpolation)
- {
+ {
double xa = static_cast<double>(hDisp_i -1);
double xb = static_cast<double>(hDisp_i);
double xc = static_cast<double>(hDisp_i +1);
@@ -1791,7 +1791,7 @@ TDisparityImage,TMaskImage,TBlockMatchingFunctor>
offsetTransfo[1] = 0.0;
for (unsigned int k=0; k<nbIterMax; k++)
- {
+ {
if ( (xb-xa) < (xc-xb) )
{
xd = 0.5 * (xc+xb);
diff --git a/Code/OBIA/otbFusionOGRTileFilter.h b/Code/OBIA/otbFusionOGRTileFilter.h
index 4731ca894e..b74f31b223 100644
--- a/Code/OBIA/otbFusionOGRTileFilter.h
+++ b/Code/OBIA/otbFusionOGRTileFilter.h
@@ -29,7 +29,7 @@ namespace otb
* \brief This filter fusion the geometries in a layer (ogr) along streaming lines.
* The SetStreamSize() method allows to retrieve the number of streams in row and column,
* and their pixel coordinates.
- * The input image is used to transform pixel coordinates of the streaming lines into
+ * The input image is used to transform pixel coordinates of the streaming lines into
* coordinate system of the image, which must be the same as the one in the OGR input file.
* The input OGR file is updated with the fusionned polygons.
*
@@ -99,7 +99,7 @@ protected:
};
struct SortFeatureStruct
{
- bool operator() (FusionStruct f1, FusionStruct f2) { return (f1.overlap > f2.overlap);}
+ bool operator() (FusionStruct f1, FusionStruct f2) { return (f1.overlap > f2.overlap); }
} SortFeature;
private:
diff --git a/Code/OBIA/otbFusionOGRTileFilter.txx b/Code/OBIA/otbFusionOGRTileFilter.txx
index 4094971111..2623cdbd2b 100644
--- a/Code/OBIA/otbFusionOGRTileFilter.txx
+++ b/Code/OBIA/otbFusionOGRTileFilter.txx
@@ -129,7 +129,7 @@ FusionOGRTileFilter<TImage>
UpperLeftCorner[1] = m_StreamSize[1]*(y-1) + 1;
LowerRightCorner[0] = m_StreamSize[0]*x + 1 + m_Radius;
- LowerRightCorner[1] = m_StreamSize[1]*y - 1 - 1;
+ LowerRightCorner[1] = m_StreamSize[1]*y - 1 - 1;
inputImage->TransformIndexToPhysicalPoint(UpperLeftCorner, ulCorner);
inputImage->TransformIndexToPhysicalPoint(LowerRightCorner, lrCorner);
diff --git a/Code/UtilitiesAdapters/OGRAdapters/otbOGRDataSourceWrapper.cxx b/Code/UtilitiesAdapters/OGRAdapters/otbOGRDataSourceWrapper.cxx
index 3ffc53974d..73bd76797e 100644
--- a/Code/UtilitiesAdapters/OGRAdapters/otbOGRDataSourceWrapper.cxx
+++ b/Code/UtilitiesAdapters/OGRAdapters/otbOGRDataSourceWrapper.cxx
@@ -123,9 +123,9 @@ otb::ogr::DataSource::New(OGRDataSource * source)
/*================================[ layers ]=================================*/
/*===========================================================================*/
otb::ogr::Layer otb::ogr::DataSource::CreateLayer(
- std::string const& name,
- OGRSpatialReference * poSpatialRef/* = NULL */,
- OGRwkbGeometryType eGType/* = wkbUnknown */,
+ std::string const& name,
+ OGRSpatialReference * poSpatialRef/* = NULL */,
+ OGRwkbGeometryType eGType/* = wkbUnknown */,
char ** papszOptions/* = NULL */)
{
assert(m_DataSource && "Datasource not initialized");
@@ -141,8 +141,8 @@ otb::ogr::Layer otb::ogr::DataSource::CreateLayer(
}
otb::ogr::Layer otb::ogr::DataSource::CopyLayer(
- Layer & srcLayer,
- std::string const& newName,
+ Layer & srcLayer,
+ std::string const& newName,
char ** papszOptions/* = NULL */)
{
assert(m_DataSource && "Datasource not initialized");
diff --git a/Code/UtilitiesAdapters/OGRAdapters/otbOGRDataSourceWrapper.h b/Code/UtilitiesAdapters/OGRAdapters/otbOGRDataSourceWrapper.h
index 0afd1df9aa..9aa2e6a2a0 100644
--- a/Code/UtilitiesAdapters/OGRAdapters/otbOGRDataSourceWrapper.h
+++ b/Code/UtilitiesAdapters/OGRAdapters/otbOGRDataSourceWrapper.h
@@ -25,7 +25,7 @@
#include "itkPoint.h"
#include "itkDataObject.h"
#include "itkMacro.h" // itkNewMacro
-#include "itkObjectFactory.h" // that should have been included by itkMacro.h
+#include "itkObjectFactory.h" // that should have been included by itkMacro.h
#include "otbOGRLayerWrapper.h"
@@ -151,7 +151,7 @@ namespace otb { namespace ogr {
*
* \note not meant to be inherited
* \note this class has an entity semantics: \em non-copyable, nor \em
- * assignable.
+ * assignable.
* \note \c OGRRegisterAll() is implicitly called on construction
* \internal as the class is not meant to be inherited, no new function is virtual.
*/
@@ -272,7 +272,7 @@ namespace otb { namespace ogr {
* Resets current data source with the one in parameter.
* \param[in,out] source source \c OGRDataSource that this instance will own.
* \throw None
- * \post Assumes ownership of the \c source.
+ * \post Assumes ownership of the \c source.
*/
void Reset(OGRDataSource * source);
@@ -384,9 +384,9 @@ namespace otb { namespace ogr {
//@}
- struct boolean{ int i;};
+ struct boolean{ int i; };
/** Can the data source be used (ie not null).
- *
+ *
* Hack to provide a boolean operator that is convertible only to a
* boolean expression to be used in \c if tests.
* \see <em>Imperfect C++</em>, Matthew Wilson, Addisson-Welsey, par 24.6
diff --git a/Code/UtilitiesAdapters/OGRAdapters/otbOGRLayerWrapper.cxx b/Code/UtilitiesAdapters/OGRAdapters/otbOGRLayerWrapper.cxx
index c509600523..8d65dde47d 100644
--- a/Code/UtilitiesAdapters/OGRAdapters/otbOGRLayerWrapper.cxx
+++ b/Code/UtilitiesAdapters/OGRAdapters/otbOGRLayerWrapper.cxx
@@ -21,7 +21,7 @@
/*===========================================================================*/
#include "otbOGRLayerWrapper.h"
#include <cassert>
-#include <boost/bind.hpp>
+#include <boost/bind.hpp>
#include "ogrsf_frmts.h" // OGRDataSource & OGRLayer
/*===========================================================================*/
@@ -38,7 +38,7 @@ namespace { // Anonymous namespace
{
void operator()(OGRLayer*) const {}
};
-} // Anonymous namespace
+} // Anonymous namespace
otb::ogr::Layer::Layer(OGRLayer* layer)
diff --git a/Code/UtilitiesAdapters/OGRAdapters/otbOGRLayerWrapper.h b/Code/UtilitiesAdapters/OGRAdapters/otbOGRLayerWrapper.h
index 6008b883f8..25194448a3 100644
--- a/Code/UtilitiesAdapters/OGRAdapters/otbOGRLayerWrapper.h
+++ b/Code/UtilitiesAdapters/OGRAdapters/otbOGRLayerWrapper.h
@@ -32,7 +32,7 @@ namespace otb { namespace ogr
* It provides an encapsulation of OGR classes. In that particular case, it's an
* encapsulation of \c OGRLayer.
*
- * \note this class is a proxy class on top of an \c OGRLayer.
+ * \note this class is a proxy class on top of an \c OGRLayer.
* \note It can be copied.
* \note when created from a \c otb::ogr::DataSource::ExecuteSQL, it will
* automatically manage the release of the underlying \c OGRLayer.
@@ -42,7 +42,7 @@ namespace otb { namespace ogr
*
* \todo find a way to tell whether the related \c OGRDataSource was released
*/
-class Layer
+class Layer
// : public itk::DataObject
{
public:
@@ -81,9 +81,9 @@ public:
void PrintSelf(std::ostream& os, itk::Indent indent) const;
- struct boolean{ int i;};
+ struct boolean{ int i; };
/** Can the layer be used (ie not null).
- *
+ *
* Hack to provide a boolean operator that is convertible only to a
* boolean expression to be used in \c if tests.
* @see <em>Imperfect C++</em>, Matthew Wilson, Addisson-Welsey, par 24.6
--
GitLab