Skip to content

Commit

Permalink
[GDAL provider] Disable workaround added in 32dd2b6 that is no longer…
Browse files Browse the repository at this point in the history
… necessary with GDAL 2.3dev
  • Loading branch information
rouault committed Jun 29, 2017
1 parent c38e6e2 commit 797bd16
Showing 1 changed file with 3 additions and 1 deletion.
4 changes: 3 additions & 1 deletion src/providers/gdal/qgsgdalprovider.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -150,13 +150,15 @@ QgsGdalProvider::QgsGdalProvider( const QString &uri, bool update )
CPLSetConfigOption( "AAIGRID_DATATYPE", "Float64" );
}

#if !(GDAL_VERSION_MAJOR > 2 || (GDAL_VERSION_MAJOR == 2 && GDAL_VERSION_MINOR >= 3))
if ( !CPLGetConfigOption( "VRT_SHARED_SOURCE", nullptr ) )
{
// GDAL version up to this date have issues will use of VRT in multi-threaded
// GDAL < 2.3 has issues with use of VRT in multi-threaded
// scenarios. See https://issues.qgis.org/issues/16507 /
// https://trac.osgeo.org/gdal/ticket/6939
CPLSetConfigOption( "VRT_SHARED_SOURCE", "NO" );
}
#endif

// To get buildSupportedRasterFileFilter the provider is called with empty uri
if ( uri.isEmpty() )
Expand Down

0 comments on commit 797bd16

Please sign in to comment.