diff --git a/Code/ApplicationEngine/otbWrapperApplication.cxx b/Code/ApplicationEngine/otbWrapperApplication.cxx index 95bf39308d994954acc0939f3b0ece849b45907f..2005503b5dd858e19eca7b7fa9e4d3d60de03df6 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 4198d352fedf7090c991c54d3243ed8f9a20c0c0..0dbda5d596047929807cbaa33fe4fd20184b812b 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 4731ca894e924a0047e8fb878c8df82e01953202..b74f31b2235cda1045c3b092ee4faf06abac36a7 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 409497111116a2001dc2e84f5435ab3a79e8a0cb..2623cdbd2b2c8573dffc2b98ba53cf7a3dbffb56 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 3ffc53974dfe309fb31c1b895e78d27d9acfa8d8..73bd76797e1411bcfb399ba989e10ee6b49dab5c 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 0afd1df9aae668842bbf74227b2b9349bb5115fb..9aa2e6a2a0023daf75425d50293a8837efce3b2b 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 c509600523c19a990a75dc346cd2b217718dd821..8d65dde47dd70dc7b3433bf139ea4d146bebdccc 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 6008b883f827d32f41f4e6e697cccef490c4ebde..25194448a3b4c9df72c86ff35b5547368ae4fc78 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