Commit cf68b6bc authored by OTB Bot's avatar OTB Bot

STYLE

parent 11829e08
......@@ -31,8 +31,8 @@ namespace otb
/** \class DisparityMapToDEMFilter
* \brief Project an input disparity map into a regular DEM
*
* This filter uses an input disparity map (horizontal and vertical) to produce a DEM with a regular sampling
* in the chosen map projection system. The elevation is computed from the triangulation of the "left-right" pairs
* This filter uses an input disparity map (horizontal and vertical) to produce a DEM with a regular sampling
* in the chosen map projection system. The elevation is computed from the triangulation of the "left-right" pairs
* of pixels matched. When several elevations are possible on a DEM cell, the highest is kept.
*
* The inputs are:
......@@ -54,7 +54,7 @@ namespace otb
* \ingroup Threaded
*
*/
template <class TDisparityImage, class TInputImage, class TOutputDEMImage = TDisparityImage,
template <class TDisparityImage, class TInputImage, class TOutputDEMImage = TDisparityImage,
class TEpipolarGridImage = TDisparityImage, class TMaskImage = otb::Image<unsigned char> >
class ITK_EXPORT DisparityMapToDEMFilter :
public itk::ImageToImageFilter<TDisparityImage,TOutputDEMImage>
......
......@@ -226,8 +226,8 @@ int otb::ogr::DataSource::GetLayersCount() const
}
otb::ogr::Layer otb::ogr::DataSource::ExecuteSQL(
std::string const& statement,
OGRGeometry * poSpatialFilter,
std::string const& statement,
OGRGeometry * poSpatialFilter,
char const* pszDialect)
{
assert(m_DataSource && "Datasource not initialized");
......@@ -238,7 +238,7 @@ otb::ogr::Layer otb::ogr::DataSource::ExecuteSQL(
#if defined(PREFER_EXCEPTION)
itkExceptionMacro( << "Unexpected error: cannot execute the SQL request <" << statement
<< "> in the OGRDataSource <" << m_DataSource->GetName() << ">.");
#else
#else
// Cannot use the deleter made for result sets obtained from
// OGRDataSource::ExecuteSQL because it checks for non-nullity....
// *sigh*
......
......@@ -74,8 +74,8 @@ bool otb::ogr::operator==(otb::ogr::Feature const& lhs, otb::ogr::Feature const&
OGRFeature * r = const_cast<OGRFeature*>(rhs.m_Feature.get());
return
(l == r ) // incl. ==0
||
||
(l && r && l->Equal(r)) // must be non-null to compare them with Equal
;
;
}
......@@ -69,8 +69,8 @@ private:
};
} // ogr namespace
} // otb namespace
} // ogr namespace
} // otb namespace
#ifndef OTB_MANUAL_INSTANTIATION
......
......@@ -115,7 +115,7 @@ std::string otb::ogr::Layer::GetName() const
assert(m_Layer && "null layer");
#if GDAL_VERSION >= 10800
return m_Layer->GetName();
#else
#else
return GetLayerDefn().GetName();
#endif
}
......
......@@ -170,11 +170,11 @@ public:
template <class OtherValue> bool equal(feature_iter<OtherValue> const& other) const
{ return other.m_Crt == m_Crt; }
void increment()
{
{
assert(m_Layer && "cannot increment end()");
m_Crt = m_Layer->GetNextFeature();
}
Value & dereference() const
Value & dereference() const
{ return m_Crt; }
otb::ogr::Layer * m_Layer;
......@@ -187,9 +187,9 @@ public:
const_iterator begin () const { return cbegin(); }
const_iterator end () const { return cend (); }
const_iterator cbegin() const;
const_iterator cbegin() const;
const_iterator cend () const { return iterator(); }
iterator begin ();
iterator begin ();
iterator end () { return iterator(); }
//@}
......
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