Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Replace OGR_Dr_GetName with GDALGetDescription #60153

Merged
merged 1 commit into from
Jan 15, 2025
+4 −4
Merged

Replace OGR_Dr_GetName with GDALGetDescription #60153

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions src/core/qgsvectorfilewriter.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3842,7 +3842,7 @@ QStringList multiLayerFormats()
const QSet< QString > splitExtensions = qgis::listToSet( driverExtensions.split( ' ', Qt::SkipEmptyParts ) );
if ( splitExtensions.intersects( multiLayerExtensions ) )
{
driverNames << OGR_Dr_GetName( driver );
driverNames << GDALGetDescription( driver );
}
}
return driverNames;
Expand Down Expand Up @@ -3872,7 +3872,7 @@ QList< QgsVectorFileWriter::FilterFormatDetails > QgsVectorFileWriter::supported
OGRSFDriverH drv = OGRGetDriver( i );
if ( drv )
{
const QString drvName = OGR_Dr_GetName( drv );
const QString drvName = GDALGetDescription( drv );

if ( options & SupportsMultipleLayers )
{
Expand Down Expand Up @@ -3995,7 +3995,7 @@ QList< QgsVectorFileWriter::DriverDetails > QgsVectorFileWriter::ogrDriverList(
OGRSFDriverH drv = OGRGetDriver( i );
if ( drv )
{
const QString drvName = OGR_Dr_GetName( drv );
const QString drvName = GDALGetDescription( drv );

if ( options & SupportsMultipleLayers )
{
Expand Down Expand Up @@ -4492,7 +4492,7 @@ QgsVectorFileWriter::EditionCapabilities QgsVectorFileWriter::editionCapabilitie
gdal::ogr_datasource_unique_ptr hDS( OGROpen( datasetName.toUtf8().constData(), TRUE, &hDriver ) );
if ( !hDS )
return QgsVectorFileWriter::EditionCapabilities();
QString drvName = OGR_Dr_GetName( hDriver );
const QString drvName = GDALGetDescription( hDriver );
QgsVectorFileWriter::EditionCapabilities caps = QgsVectorFileWriter::EditionCapabilities();
if ( OGR_DS_TestCapability( hDS.get(), ODsCCreateLayer ) )
{
Expand Down
Loading