Skip to content
GitLab
Select Git revision
  • zonalstats_histogram default
Find file BlameHistoryPermalink
  • Manuel Grizonnet's avatar
    ENH: rename files with txx extension to hxx · 3a1fd1fc
    Manuel Grizonnet authored 
    OTB followed since the beginning the ITK convention and use .txx extension for all
template classes. Nevertheless, some development tools do not recognize .txx
file extension. Other tool like GitHub can't do in-browser syntax highlighting for
txx files I think.

The root problem is the use of the txx which should be changed to hxx (or hpp).

In 2011, after an in-depth discussion near April 20, 2011 on the
Insight-Developers mailing list, ITK rename all txx files to hxx (and event
prevent the push of .txx files with a pre-commit hook). It happens is major release v4.

You can find some arguments in the discussion about the change and also in other
projects related to ITK which applied the same modification, see for instance VXL:

https://github.com/vxl/vxl/issues/209

This commit apply now the same modification for OTB.

I understand that it will change some habit for developers and don't bring new
features but I think that in general it is better to stay align with ITK guidelines.

In my opinion, it always facilitate the use of OTB and ITK together if we share
when we can the same code architecture, directory organization, naming
conventions...
    3a1fd1fc
otbOGRDataSourceWrapper.hxx 4.25 KiB
1 
/*
2 
 * Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
3 
 *
4 
 * This file is part of Orfeo Toolbox
5 
 *
6 
 *     https://www.orfeo-toolbox.org/
7 
 *
8 
 * Licensed under the Apache License, Version 2.0 (the "License");
9 
 * you may not use this file except in compliance with the License.
10 
 * You may obtain a copy of the License at
11 
 *
12 
 *     http://www.apache.org/licenses/LICENSE-2.0
13 
 *
14 
 * Unless required by applicable law or agreed to in writing, software
15 
 * distributed under the License is distributed on an "AS IS" BASIS,
16 
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
17 
 * See the License for the specific language governing permissions and
18 
 * limitations under the License.
19 
 */
20
21
22 
/**\ingroup Geometry
23 
 * \file    otbOGRDataSourceWrapper.txx
24 
 * \internal this file is meant to be included by otbOGRDataSourceWrapper.h
25 
 */
26
27 
#ifndef otbOGRDataSourceWrapper_txx
28 
#define otbOGRDataSourceWrapper_txx
29
30 
#include "otbOGRDataSourceWrapper.h"
31
32 
/*===========================================================================*/
33 
/*===============================[ Includes ]================================*/
34 
/*===========================================================================*/
35 
#include <cassert>
36 
#include "itkMacro.h" // itk::ExceptionObject
37 
#include "ogrsf_frmts.h" // OGRDataSource & OGRLayer
38
39 
/*===========================================================================*/
40 
/*=========================[ otb::ogr::DataSource ]==========================*/
41 
/*===========================================================================*/
42 
// These function definitions are inline so assert() will be expanded according
43 
// to the compilation mode of the client code.
44
45 
inline
46 
otb::ogr::version_proxy::GDALDatasetType & otb::ogr::DataSource::ogr()
47 
{
48 
  assert(m_DataSource && "GDALDataset not initialized");
49 
  return *m_DataSource;
50 
}
51
52 
inline
53 
otb::ogr::Layer otb::ogr::DataSource::GetLayer(size_t i)
54 
{
55 
  assert(int(i) < GetLayersCount() && "Out-of-range index");
56 
  OGRLayer * layer_ptr = GetLayerUnchecked(i);
57 
  assert(layer_ptr && "No layer returned by OGR");
58 
  return otb::ogr::Layer(layer_ptr, IsLayerModifiable(i));
59 
}
60
61 
inline
62 
otb::ogr::Layer const otb::ogr::DataSource::GetLayer(size_t i) const
63 
{
64 
  return const_cast <DataSource*>(this)->GetLayer(i);
65 
}
66
67 
inline
68 
otb::ogr::Layer const otb::ogr::DataSource::GetLayer(std::string const& name) const
69 
{
70 
  return const_cast <DataSource*>(this)->GetLayer(name);
7172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136
} inline otb::ogr::Layer const otb::ogr::DataSource::GetLayerChecked(size_t i) const { return const_cast <DataSource*>(this)->GetLayerChecked(i); } inline OGRLayer* otb::ogr::DataSource::GetLayerUnchecked(size_t i) const { return const_cast <DataSource*>(this)->GetLayerUnchecked(i); } /*===========================================================================*/ /*====================[ otb::ogr::DataSource/iterators ]=====================*/ /*===========================================================================*/ template <class Value> otb::ogr::DataSource::layer_iter<Value>::layer_iter(container_type & datasource, size_t index) : m_DataSource(&datasource), m_index(index) {} template <class Value> otb::ogr::DataSource::layer_iter<Value>::layer_iter() : m_DataSource(0), m_index(0) {} template <class Value> template <class OtherValue> otb::ogr::DataSource::layer_iter<Value>::layer_iter( otb::ogr::DataSource::layer_iter<OtherValue> const& other, typename boost::enable_if<boost::is_convertible<OtherValue*,Value*> , enabler >::type ) : m_DataSource(other.m_DataSource), m_index(other.m_index) {} template <class Value> template <class OtherValue> bool otb::ogr::DataSource::layer_iter<Value>::equal(layer_iter<OtherValue> const& other) const { return m_DataSource == other.m_DataSource && other.m_index == m_index; } template <class Value> void otb::ogr::DataSource::layer_iter<Value>::increment() { assert(m_DataSource && int(m_index) < m_DataSource->GetLayersCount() && "cannot increment past end()"); ++m_index; } template <class Value> Value otb::ogr::DataSource::layer_iter<Value>::dereference() const { assert(m_DataSource && int(m_index) < m_DataSource->GetLayersCount() && "cannot dereference past end()"); return Value(m_DataSource->GetLayerUnchecked(m_index), m_DataSource->IsLayerModifiable(m_index)); } #endif // otbOGRDataSourceWrapper_txx