Skip to content
Snippets Groups Projects
Commit 4ebbc37b authored by Julien Malik's avatar Julien Malik
Browse files

MRG

parents 6e602713 1ba27c99
Branches
Tags
No related merge requests found
...@@ -153,6 +153,7 @@ public: ...@@ -153,6 +153,7 @@ public:
{ {
GDALDatasetWrapper::Pointer datasetWrapper; GDALDatasetWrapper::Pointer datasetWrapper;
GDALDatasetH dataset = GDALOpen(filename.c_str(), GA_ReadOnly); GDALDatasetH dataset = GDALOpen(filename.c_str(), GA_ReadOnly);
if (dataset != NULL) if (dataset != NULL)
{ {
datasetWrapper = GDALDatasetWrapper::New(); datasetWrapper = GDALDatasetWrapper::New();
...@@ -196,6 +197,13 @@ private : ...@@ -196,6 +197,13 @@ private :
GDALDriverManagerWrapper() GDALDriverManagerWrapper()
{ {
GDALAllRegister(); GDALAllRegister();
#if !CHECK_HDF4OPEN_SYMBOL
// Get rid of the HDF4 driver when it is buggy
GDALDriver* driver = GetGDALDriverManager()->GetDriverByName( "hdf4" );
if (driver)
GetGDALDriverManager()->DeregisterDriver( driver );
#endif
} }
~GDALDriverManagerWrapper() ~GDALDriverManagerWrapper()
......
...@@ -70,3 +70,6 @@ ...@@ -70,3 +70,6 @@
/* Deprecated Managment */ /* Deprecated Managment */
#cmakedefine OTB_USE_DEPRECATED #cmakedefine OTB_USE_DEPRECATED
#cmakedefine CHECK_HDF4OPEN_SYMBOL
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment