Commit 9648638a authored by OTB Bot's avatar OTB Bot

STYLE

parent 8d1478b3
......@@ -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.");
......
......@@ -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;
......
......@@ -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);
......
......@@ -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;
......
......@@ -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;
......
......@@ -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;
......
......@@ -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()
......
......@@ -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. */
......
......@@ -31,5 +31,5 @@ void RegisterTests()
REGISTER_TEST(otbPixelWiseBlockMatchingImageFilter);
REGISTER_TEST(otbPixelWiseBlockMatchingImageFilterNCC);
REGISTER_TEST(otbSubPixelDisparityImageFilter);
REGISTER_TEST(otbSubPixelDisparityImageFilterNew);
REGISTER_TEST(otbSubPixelDisparityImageFilterNew);
}
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