From db6555ad64a612098acd1955ac8d1501a339ec8a Mon Sep 17 00:00:00 2001
From: Stephane ALBERT <stephane.albert@c-s.fr>
Date: Wed, 21 Sep 2016 18:09:33 +0200
Subject: [PATCH] BUG: MANTIS-1267: improved
otb::GDALOverviewsBuilder::CountResolutions() signatures.
---
Modules/IO/IOGDAL/include/otbGDALOverviewsBuilder.h | 5 ++++-
Modules/IO/IOGDAL/src/otbGDALOverviewsBuilder.cxx | 10 +++++++++-
2 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/Modules/IO/IOGDAL/include/otbGDALOverviewsBuilder.h b/Modules/IO/IOGDAL/include/otbGDALOverviewsBuilder.h
index 9aa172a6d7..5b1da9b5f7 100644
--- a/Modules/IO/IOGDAL/include/otbGDALOverviewsBuilder.h
+++ b/Modules/IO/IOGDAL/include/otbGDALOverviewsBuilder.h
@@ -103,7 +103,10 @@ public:
* factor^n.
*/
unsigned int
- CountResolutions( unsigned int factor, unsigned int size =1 ) const;
+ CountResolutions( unsigned int factor, unsigned int size ) const;
+
+ unsigned int
+ CountResolutions( unsigned int size ) const;
unsigned int
CountResolutions() const;
diff --git a/Modules/IO/IOGDAL/src/otbGDALOverviewsBuilder.cxx b/Modules/IO/IOGDAL/src/otbGDALOverviewsBuilder.cxx
index 40393537b9..ecfdfcbeb1 100644
--- a/Modules/IO/IOGDAL/src/otbGDALOverviewsBuilder.cxx
+++ b/Modules/IO/IOGDAL/src/otbGDALOverviewsBuilder.cxx
@@ -156,12 +156,20 @@ GDALOverviewsBuilder
return count;
}
+/***************************************************************************/
+unsigned int
+GDALOverviewsBuilder
+::CountResolutions( unsigned int minSize ) const
+{
+ return CountResolutions( m_ResolutionFactor, minSize );
+}
+
/***************************************************************************/
unsigned int
GDALOverviewsBuilder
::CountResolutions() const
{
- return CountResolutions( m_ResolutionFactor );
+ return CountResolutions( 1 );
}
/***************************************************************************/
--
GitLab