Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Adapt to GDAL 2.0 API
  • Loading branch information
nyalldawson committed May 3, 2017
1 parent ce4f93b commit 03dd26e
Showing 1 changed file with 15 additions and 8 deletions.
23 changes: 15 additions & 8 deletions src/core/qgsvectorfilewriter.cpp
Expand Up @@ -49,6 +49,7 @@
#include <ogr_srs_api.h>
#include <cpl_error.h>
#include <cpl_conv.h>
#include <cpl_string.h>
#include <gdal.h>

QgsVectorFileWriter::FieldValueConverter::FieldValueConverter()
Expand Down Expand Up @@ -2749,21 +2750,27 @@ QString QgsVectorFileWriter::driverForExtension( const QString &extension )
QString ext = extension.trimmed();
if ( ext.isEmpty() )
return QString();
QgsApplication::registerOgrDrivers();
int const drvCount = OGRGetDriverCount();

if ( ext.startsWith( '.' ) )
ext.remove( 0, 1 );

GDALAllRegister();
int const drvCount = GDALGetDriverCount();

for ( int i = 0; i < drvCount; ++i )
{
OGRSFDriverH drv = OGRGetDriver( i );
GDALDriverH drv = GDALGetDriver( i );
if ( drv )
{
QString drvName = OGR_Dr_GetName( drv );
if ( OGR_Dr_TestCapability( drv, "CreateDataSource" ) != 0 )
char **driverMetadata = GDALGetMetadata( drv, nullptr );
if ( CSLFetchBoolean( driverMetadata, GDAL_DCAP_CREATE, false ) && CSLFetchBoolean( driverMetadata, GDAL_DCAP_VECTOR, false ) )
{
MetaData metadata;
if ( driverMetadata( drvName, metadata ) )
QString drvName = GDALGetDriverShortName( drv );
QStringList driverExtensions = QString( GDALGetMetadataItem( drv, GDAL_DMD_EXTENSIONS, nullptr ) ).split( ' ' );

Q_FOREACH ( const QString &driver, driverExtensions )
{
if ( metadata.glob.contains( ext, Qt::CaseInsensitive ) )
if ( driver.compare( ext, Qt::CaseInsensitive ) == 0 )
return drvName;
}
}
Expand Down

0 comments on commit 03dd26e

Please sign in to comment.