Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
otb
Project overview
Project overview
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
207
Issues
207
List
Boards
Labels
Milestones
Merge Requests
8
Merge Requests
8
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Packages
Packages
Container Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Main Repositories
otb
Commits
4ef17d6e
Commit
4ef17d6e
authored
Jan 04, 2019
by
Cédric Traizet
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ENH: remove version_proxy::Close
parent
47a369c3
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
9 additions
and
30 deletions
+9
-30
Modules/Adapters/GdalAdapters/include/otbOGRVersionProxy.h
Modules/Adapters/GdalAdapters/include/otbOGRVersionProxy.h
+0
-12
Modules/Adapters/GdalAdapters/src/otbOGRDataSourceWrapper.cxx
...les/Adapters/GdalAdapters/src/otbOGRDataSourceWrapper.cxx
+2
-2
Modules/Adapters/GdalAdapters/src/otbOGRVersionProxy.cxx
Modules/Adapters/GdalAdapters/src/otbOGRVersionProxy.cxx
+1
-10
Modules/IO/IOGDAL/src/otbOGRVectorDataIO.cxx
Modules/IO/IOGDAL/src/otbOGRVectorDataIO.cxx
+4
-4
Modules/Segmentation/Conversion/include/otbRasterizeVectorDataFilter.h
...ntation/Conversion/include/otbRasterizeVectorDataFilter.h
+1
-1
Modules/Segmentation/Conversion/include/otbVectorDataToLabelImageFilter.h
...tion/Conversion/include/otbVectorDataToLabelImageFilter.h
+1
-1
No files found.
Modules/Adapters/GdalAdapters/include/otbOGRVersionProxy.h
View file @
4ef17d6e
...
...
@@ -78,18 +78,6 @@ namespace version_proxy
OTBGdalAdapters_EXPORT
GDALDataset
*
Open
(
const
char
*
filename
,
bool
readOnly
=
true
,
std
::
vector
<
std
::
string
>
const
&
options
=
std
::
vector
<
std
::
string
>
()
);
/**
* This function closes a dataset.
*
* Calls OGRDataSource::DestroyDataSource for gdal 1.x
* implementation and GDALClose for gdal 2.x implementation.
*
* \param dataset Pointer to the dataset to close. Will not be
* checked for null pointer.
*/
OTBGdalAdapters_EXPORT
void
Close
(
GDALDataset
*
dataset
);
/**
* This function creates a new dataset.
*
...
...
Modules/Adapters/GdalAdapters/src/otbOGRDataSourceWrapper.cxx
View file @
4ef17d6e
...
...
@@ -54,7 +54,7 @@ void otb::ogr::DataSource::Reset(GDALDataset * source)
// OGR makes a pointless check for non-nullity in
// GDALDataset::DestroyDataSource (pointless because "delete 0" is
// perfectly valid -> it's a no-op)
ogr
::
version_proxy
::
Close
(
m_DataSource
);
// void, noexcept
GDAL
Close
(
m_DataSource
);
// void, noexcept
}
m_DataSource
=
source
;
}
...
...
@@ -233,7 +233,7 @@ otb::ogr::DataSource::New(std::string const& datasourceName, Modes::type mode)
bool
ds_exists
=
(
ds
!=
nullptr
);
ogr
::
version_proxy
::
Close
(
ds
);
GDAL
Close
(
ds
);
if
(
ds_exists
&&
mode
==
Modes
::
Overwrite
)
...
...
Modules/Adapters/GdalAdapters/src/otbOGRVersionProxy.cxx
View file @
4ef17d6e
...
...
@@ -64,15 +64,6 @@ GDALDataset * Open(const char * filename, bool readOnly , std::vector< std::stri
#endif
}
void
Close
(
GDALDataset
*
dataset
)
{
#if GDAL_VERSION_NUM<2000000
OGRDataSource
::
DestroyDataSource
(
dataset
);
#else
GDALClose
(
dataset
);
#endif
}
GDALDataset
*
Create
(
GDALDriver
*
driver
,
const
char
*
name
,
std
::
vector
<
std
::
string
>
const
&
options
)
{
#if GDAL_VERSION_NUM<2000000
...
...
@@ -101,7 +92,7 @@ bool Delete(const char * name)
if
(
poDS
)
{
poDriver
=
poDS
->
GetDriver
();
Close
(
poDS
);
GDAL
Close
(
poDS
);
}
#if GDAL_VERSION_NUM<2000000
if
(
poDriver
&&
poDriver
->
TestCapability
(
ODrCDeleteDataSource
))
...
...
Modules/IO/IOGDAL/src/otbOGRVectorDataIO.cxx
View file @
4ef17d6e
...
...
@@ -62,7 +62,7 @@ OGRVectorDataIO::CanReadFile(const char* filename) const
return
false
;
}
// std::cout << poDS->GetDriver()->GetName() << std::endl;
ogr
::
version_proxy
::
Close
(
poDS
);
GDAL
Close
(
poDS
);
return
true
;
}
...
...
@@ -184,7 +184,7 @@ OGRVectorDataIO
void
OGRVectorDataIO
::
CloseInternalDataSource
()
{
assert
(
m_DataSource
!=
NULL
&&
"m_DataSource cannot be NULL"
);
ogr
::
version_proxy
::
Close
(
m_DataSource
);
GDAL
Close
(
m_DataSource
);
m_DataSource
=
nullptr
;
}
...
...
@@ -226,7 +226,7 @@ void OGRVectorDataIO::Write(const itk::DataObject* datag, char ** /** unused */)
// free an existing previous data source, if any
if
(
m_DataSource
!=
nullptr
)
{
ogr
::
version_proxy
::
Close
(
m_DataSource
);
GDAL
Close
(
m_DataSource
);
}
// Erase the dataSource if already exist
...
...
@@ -288,7 +288,7 @@ void OGRVectorDataIO::Write(const itk::DataObject* datag, char ** /** unused */)
otbMsgDevMacro
(
<<
"layerKept "
<<
layerKept
);
(
void
)
layerKept
;
// keep compiler happy
otb
::
ogr
::
version_proxy
::
Close
(
m_DataSource
);
GDAL
Close
(
m_DataSource
);
m_DataSource
=
nullptr
;
if
(
oSRS
!=
nullptr
)
...
...
Modules/Segmentation/Conversion/include/otbRasterizeVectorDataFilter.h
View file @
4ef17d6e
...
...
@@ -148,7 +148,7 @@ protected:
{
if
(
m_OGRDataSourcePointer
!=
nullptr
)
{
ogr
::
version_proxy
::
Close
(
m_OGRDataSourcePointer
);
GDAL
Close
(
m_OGRDataSourcePointer
);
}
}
...
...
Modules/Segmentation/Conversion/include/otbVectorDataToLabelImageFilter.h
View file @
4ef17d6e
...
...
@@ -151,7 +151,7 @@ protected:
if
(
m_OGRDataSourcePointer
!=
nullptr
)
{
ogr
::
version_proxy
::
Close
(
m_OGRDataSourcePointer
);
GDAL
Close
(
m_OGRDataSourcePointer
);
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment