From 9648638a14220f9688ea12ed9e83f7477677bf8e Mon Sep 17 00:00:00 2001
From: OTB Bot <otbbot@orfeo-toolbox.org>
Date: Tue, 19 Jun 2012 19:58:05 +0200
Subject: [PATCH] STYLE
---
Applications/Rasterization/otbRasterization.cxx | 8 ++++----
Code/Common/otbOGRDataSourceToLabelImageFilter.h | 2 +-
Code/Common/otbOGRDataSourceToLabelImageFilter.txx | 6 +++---
.../OGRAdapters/otbGeometriesToGeometriesFilter.cxx | 4 ++--
.../OGRAdapters/otbOGRDataSourceWrapper.cxx | 12 ++++++------
.../OGRAdapters/otbOGRDataSourceWrapper.h | 2 +-
.../OGRAdapters/otbOGRLayerWrapper.cxx | 2 +-
.../OGRAdapters/otbOGRLayerWrapper.h | 2 +-
Testing/Code/DisparityMap/otbDisparityMapTests4.cxx | 2 +-
9 files changed, 20 insertions(+), 20 deletions(-)
diff --git a/Applications/Rasterization/otbRasterization.cxx b/Applications/Rasterization/otbRasterization.cxx
index d3dfc0821c..a4f802f9d3 100644
--- a/Applications/Rasterization/otbRasterization.cxx
+++ b/Applications/Rasterization/otbRasterization.cxx
@@ -147,7 +147,7 @@ private:
void DoExecute()
- {
+ {
UInt8ImageType::Pointer referenceImage;
m_OgrDS = otb::ogr::DataSource::New(GetParameterString("in"), otb::ogr::DataSource::Modes::read);
@@ -164,7 +164,7 @@ private:
std::string inputProjectionRef = lit->GetProjectionRef();
// Check if we have layers with different projection ref
- for(;lit != m_OgrDS->end();++lit)
+ for(; lit != m_OgrDS->end(); ++lit)
{
if(lit->GetProjectionRef() != inputProjectionRef)
{
@@ -195,8 +195,8 @@ private:
extentAvailable = false;
}
- if(!extentAvailable &&
- (!(HasValue("spx") && HasValue("spy"))
+ if(!extentAvailable &&
+ (!(HasValue("spx") && HasValue("spy"))
|| (!(HasValue("orx") && HasValue("ory")))))
{
otbAppLogWARNING(<<"Failed to retrieve the spatial extent of the dataset. The application will retry in force mode, which means it might have to walk the entire dataset to determine extent. This might be a long process for large datasets. Consider setting the orx, ory, spx and spy parameters.");
diff --git a/Code/Common/otbOGRDataSourceToLabelImageFilter.h b/Code/Common/otbOGRDataSourceToLabelImageFilter.h
index 15e87537f5..10f8f84b44 100644
--- a/Code/Common/otbOGRDataSourceToLabelImageFilter.h
+++ b/Code/Common/otbOGRDataSourceToLabelImageFilter.h
@@ -160,7 +160,7 @@ private:
OutputSpacingType m_OutputSpacing;
OutputOriginType m_OutputOrigin;
OutputSizeType m_OutputSize;
- OutputIndexType m_OutputStartIndex;
+ OutputIndexType m_OutputStartIndex;
OutputImageInternalPixelType m_BackgroundValue;
OutputImageInternalPixelType m_ForegroundValue;
bool m_BurnAttributeMode;
diff --git a/Code/Common/otbOGRDataSourceToLabelImageFilter.txx b/Code/Common/otbOGRDataSourceToLabelImageFilter.txx
index 6af73ae374..552f87d86f 100644
--- a/Code/Common/otbOGRDataSourceToLabelImageFilter.txx
+++ b/Code/Common/otbOGRDataSourceToLabelImageFilter.txx
@@ -27,8 +27,8 @@ namespace otb
{
template< class TOutputImage>
OGRDataSourceToLabelImageFilter<TOutputImage>
-::OGRDataSourceToLabelImageFilter() : m_BurnAttribute("DN"),
- m_BackgroundValue(0),
+::OGRDataSourceToLabelImageFilter() : m_BurnAttribute("DN"),
+ m_BackgroundValue(0),
m_ForegroundValue(255),
m_BurnAttributeMode(true)
{
@@ -199,7 +199,7 @@ OGRDataSourceToLabelImageFilter<TOutputImage>::GenerateData()
GDALSetProjection (dataset, this->GetOutput()->GetProjectionRef().c_str());
// Set the nodata value
- for(unsigned int band = 0; band < nbBands;++band)
+ for(unsigned int band = 0; band < nbBands; ++band)
{
GDALRasterBandH hBand = GDALGetRasterBand(dataset, band + 1);
GDALFillRaster(hBand, m_BackgroundValue, 0);
diff --git a/Code/UtilitiesAdapters/OGRAdapters/otbGeometriesToGeometriesFilter.cxx b/Code/UtilitiesAdapters/OGRAdapters/otbGeometriesToGeometriesFilter.cxx
index f6401d1858..d8319220d7 100644
--- a/Code/UtilitiesAdapters/OGRAdapters/otbGeometriesToGeometriesFilter.cxx
+++ b/Code/UtilitiesAdapters/OGRAdapters/otbGeometriesToGeometriesFilter.cxx
@@ -49,8 +49,8 @@ struct ProcessVisitor : boost::static_visitor<>
assert(source && "can't filter a nil datasource");
assert(destination && "can't filter to a nil datasource");
for (otb::ogr::DataSource::const_iterator b = source->begin(), e = source->end()
- ; b != e
- ; ++b
+; b != e
+; ++b
)
{
otb::ogr::Layer const& sourceLayer = *b;
diff --git a/Code/UtilitiesAdapters/OGRAdapters/otbOGRDataSourceWrapper.cxx b/Code/UtilitiesAdapters/OGRAdapters/otbOGRDataSourceWrapper.cxx
index edb33c7681..c6636911d9 100644
--- a/Code/UtilitiesAdapters/OGRAdapters/otbOGRDataSourceWrapper.cxx
+++ b/Code/UtilitiesAdapters/OGRAdapters/otbOGRDataSourceWrapper.cxx
@@ -402,17 +402,17 @@ int otb::ogr::DataSource::Size(bool doForceComputation) const
/*=================================[ Misc ]==================================*/
/*===========================================================================*/
-void otb::ogr::DataSource::GetGlobalExtent(double & ulx,
- double & uly,
- double & lrx,
- double & lry,
+void otb::ogr::DataSource::GetGlobalExtent(double & ulx,
+ double & uly,
+ double & lrx,
+ double & lry,
bool force) const
{
OGREnvelope sExtent;
const_iterator lit = this->begin();
if(lit==this->end())
- {
+ {
itkGenericExceptionMacro(<< "Cannot compute global extent because there are no layers in the DataSource");
}
@@ -427,7 +427,7 @@ void otb::ogr::DataSource::GetGlobalExtent(double & ulx,
++lit;
- for(; lit!=this->end();++lit)
+ for(; lit!=this->end(); ++lit)
{
OGREnvelope cExtent;
diff --git a/Code/UtilitiesAdapters/OGRAdapters/otbOGRDataSourceWrapper.h b/Code/UtilitiesAdapters/OGRAdapters/otbOGRDataSourceWrapper.h
index 3600e114aa..1e67896b45 100644
--- a/Code/UtilitiesAdapters/OGRAdapters/otbOGRDataSourceWrapper.h
+++ b/Code/UtilitiesAdapters/OGRAdapters/otbOGRDataSourceWrapper.h
@@ -225,7 +225,7 @@ public:
* available. May force the driver to walk all geometries to
* compute the extent.
* \throw itk::ExceptionObject if the layers extents can not be retrieved.
- */
+ */
void GetGlobalExtent(double & ulx, double & uly, double & lrx, double & lry, bool force = false) const;
diff --git a/Code/UtilitiesAdapters/OGRAdapters/otbOGRLayerWrapper.cxx b/Code/UtilitiesAdapters/OGRAdapters/otbOGRLayerWrapper.cxx
index 430ece35a9..a65dead397 100644
--- a/Code/UtilitiesAdapters/OGRAdapters/otbOGRLayerWrapper.cxx
+++ b/Code/UtilitiesAdapters/OGRAdapters/otbOGRLayerWrapper.cxx
@@ -171,7 +171,7 @@ void otb::ogr::Layer::GetExtent(double& ulx, double& uly, double& lrx, double& l
ulx = sExtent.MinX;
uly = sExtent.MinY;
lrx = sExtent.MaxX;
- lry = sExtent.MaxY;
+ lry = sExtent.MaxY;
}
OGRLayer & otb::ogr::Layer::ogr()
diff --git a/Code/UtilitiesAdapters/OGRAdapters/otbOGRLayerWrapper.h b/Code/UtilitiesAdapters/OGRAdapters/otbOGRLayerWrapper.h
index e8b9eae44e..f8ff643237 100644
--- a/Code/UtilitiesAdapters/OGRAdapters/otbOGRLayerWrapper.h
+++ b/Code/UtilitiesAdapters/OGRAdapters/otbOGRLayerWrapper.h
@@ -202,7 +202,7 @@ public:
* available. May force the driver to walk all geometries to
* compute the extent.
* \throw itk::ExceptionObject if the extent can not be retrieved.
- */
+ */
void GetExtent(double & ulx, double & uly, double & lrx, double & lry, bool force = false) const;
/** Prints self into stream. */
diff --git a/Testing/Code/DisparityMap/otbDisparityMapTests4.cxx b/Testing/Code/DisparityMap/otbDisparityMapTests4.cxx
index 510317a53f..537235fb0f 100644
--- a/Testing/Code/DisparityMap/otbDisparityMapTests4.cxx
+++ b/Testing/Code/DisparityMap/otbDisparityMapTests4.cxx
@@ -31,5 +31,5 @@ void RegisterTests()
REGISTER_TEST(otbPixelWiseBlockMatchingImageFilter);
REGISTER_TEST(otbPixelWiseBlockMatchingImageFilterNCC);
REGISTER_TEST(otbSubPixelDisparityImageFilter);
- REGISTER_TEST(otbSubPixelDisparityImageFilterNew);
+ REGISTER_TEST(otbSubPixelDisparityImageFilterNew);
}
--
GitLab