Commit 18d21092 authored by OTB Bot's avatar OTB Bot

STYLE

parent da8868a6
......@@ -164,7 +164,7 @@ namespace otb
command; \
} \
catch (const std::exception& stde) { \
throw ; } \
throw; } \
catch (...) \
{ \
std::ostringstream message; \
......
......@@ -78,7 +78,7 @@ otb::ogr::DataSource::DataSource()
{
Drivers::Init();
OGRSFDriver * d = OGRSFDriverRegistrar::GetRegistrar()->GetDriverByName("Memory");
OGRSFDriver * d = OGRSFDriverRegistrar::GetRegistrar()->GetDriverByName("Memory");
assert(d && "OGR Memory driver not found");
m_DataSource = d->CreateDataSource("in-memory");
if (!m_DataSource) {
......@@ -106,7 +106,7 @@ otb::ogr::DataSource::New(std::string const& filename, Modes::type mode)
return res;
}
/*static*/
/*static*/
otb::ogr::DataSource::Pointer
otb::ogr::DataSource::New(OGRDataSource * source)
{
......@@ -169,7 +169,7 @@ namespace { // Anonymous namespace
private:
bool m_doForceComputation;
};
} // Anonymous namespace
} // Anonymous namespace
int otb::ogr::DataSource::Size(bool doForceComputation) const
{
......
......@@ -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
// class OGRDataSource;
#include "ogrsf_frmts.h" // OGRDataSource
......@@ -113,7 +113,7 @@ namespace otb { namespace ogr {
*/
void TransformPointToPhysicalPoint(const PointType& point, PointType& physicalPoint) const
{
for (size_t i=0; i!=Dimension ; ++i)
for (size_t i=0; i!=Dimension; ++i)
physicalPoint[i] = point[i] * m_Spacing[i] + m_Origin[i];
}
......@@ -128,7 +128,7 @@ namespace otb { namespace ogr {
{
// why no loop on VDimension ?
PointType physicalPoint;
for (size_t i=0; i!=Dimension ; ++i)
for (size_t i=0; i!=Dimension; ++i)
physicalPoint[i] = point[i] * m_Spacing[i] + m_Origin[i];
return physicalPoint;
}
......@@ -146,7 +146,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
*/
class DataSource : public itk::DataObject
......@@ -232,7 +232,7 @@ namespace otb { namespace ogr {
{
assert(m_DataSource && "OGRDataSource not initialized");
const int nbLayers = this->GetLayersCount();
for (int i=0; i!=nbLayers ; ++i)
for (int i=0; i!=nbLayers; ++i)
{
OGRLayer * l = m_DataSource->GetLayer(i);
if (!l)
......@@ -257,7 +257,7 @@ namespace otb { namespace ogr {
{
assert(m_DataSource && "OGRDataSource not initialized");
const int nbLayers = this->GetLayersCount();
for (int i=0; i!=nbLayers ; ++i)
for (int i=0; i!=nbLayers; ++i)
{
OGRLayer * l = m_DataSource->GetLayer(i);
if (!l)
......@@ -293,7 +293,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);
......@@ -341,16 +341,16 @@ namespace otb { namespace ogr {
* to be programming errors.
* \throw None
*/
OGRLayer& GetLayerChecked(size_t i) ;
OGRLayer& GetLayerChecked(size_t i);
/**\copydoc otb::ogr::DataSource::GetLayerChecked()
*/
OGRLayer const& GetLayerChecked(size_t i) const ;
OGRLayer const& GetLayerChecked(size_t i) const;
//@}
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
......
......@@ -42,7 +42,7 @@ namespace otb { namespace ogr {
/** \name Singleton related functions */
//@{
public:
static Drivers & Init() ;
static Drivers & Init();
private:
/** Constructor.
* Calls \c OGRRegisterAll().
......
......@@ -22,7 +22,7 @@ namespace otb {
/**\defgroup Geometry Geometry
* \ingroup Thematic
* Classes and functions aimed toward the manipulation of set of geometric
* objects.
* objects.
* This module mainly provides an encapsulation of <a
* href="http://www.gdal.org/ogr/">OGR API</a>.
* @{
......
......@@ -28,13 +28,13 @@
using namespace otb;
#if 0
#if defined(BOOST_TEST_DYN_LINK)
#if defined(BOOST_TEST_DYN_LINK)
#error BOOST_TEST_DYN_LINK defined
#else
#else
#error BOOST_TEST_DYN_LINK not defined
#endif
#if defined(BOOST_TEST_MAIN)
#if defined(BOOST_TEST_MAIN)
#error BOOST_TEST_MAIN defined
#else
#error BOOST_TEST_MAIN not defined
......
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