From a2d101876db1fa9cf4c79d08d6c5c320993d5a88 Mon Sep 17 00:00:00 2001
From: Cedric <cedric.traizet@c-s.fr>
Date: Fri, 4 Jan 2019 08:53:00 +0100
Subject: [PATCH] ENH: removed GetDatasetClassName() and GetDriverClassName()
---
.../GdalAdapters/include/otbOGRVersionProxy.h | 14 --------------
.../GdalAdapters/src/otbOGRVersionProxy.cxx | 18 ------------------
2 files changed, 32 deletions(-)
diff --git a/Modules/Adapters/GdalAdapters/include/otbOGRVersionProxy.h b/Modules/Adapters/GdalAdapters/include/otbOGRVersionProxy.h
index ec1e158e24..2377e7ca91 100644
--- a/Modules/Adapters/GdalAdapters/include/otbOGRVersionProxy.h
+++ b/Modules/Adapters/GdalAdapters/include/otbOGRVersionProxy.h
@@ -154,20 +154,6 @@ namespace version_proxy
OTBGdalAdapters_EXPORT
bool SyncToDisk(GDALDatasetType * dataset);
- /**
- * \return The name of the dataset class behind the implementation
- * (OGRDataSource for gdal 1.x and GdalDataset for gdal 2.x)
- */
- OTBGdalAdapters_EXPORT
- std::string GetDatasetClassName();
-
- /**
- * \return The name of the driver class behind the implementation
- * (OGRSFDriver for gdal 1.x and GDALDriver for gdal 2.x)
- */
- OTBGdalAdapters_EXPORT
- std::string GetDriverClassName();
-
/**
* Return the list of files composing the dataset.
*
diff --git a/Modules/Adapters/GdalAdapters/src/otbOGRVersionProxy.cxx b/Modules/Adapters/GdalAdapters/src/otbOGRVersionProxy.cxx
index 186c09cc5d..44b6bc3787 100644
--- a/Modules/Adapters/GdalAdapters/src/otbOGRVersionProxy.cxx
+++ b/Modules/Adapters/GdalAdapters/src/otbOGRVersionProxy.cxx
@@ -128,24 +128,6 @@ GDALDriverType * GetDriverByName(const char * name)
#endif
}
-std::string GetDatasetClassName()
-{
-#if GDAL_VERSION_NUM<2000000
- return std::string("OGRDataSource");
-#else
- return std::string("GDALDataset");
-#endif
-}
-
-std::string GetDriverClassName()
-{
-#if GDAL_VERSION_NUM<2000000
- return std::string("OGRSFDriver");
-#else
- return std::string("GDALDriver");
-#endif
-}
-
#if GDAL_VERSION_NUM>=2000000
namespace raii
{
--
GitLab