File 0001-Fixed-GDAL-imports-for-GDAL-2.0.patch of Package merkaartor

Overview Repositories Revisions Requests Users Attributes Meta

File 0001-Fixed-GDAL-imports-for-GDAL-2.0.patch of Package merkaartor (Revision f8c1cf9cd141f8b1d20e9baa5283e12e)

Currently displaying revision f8c1cf9cd141f8b1d20e9baa5283e12e , Show latest

From b333cd33e487f79ae8cd0c2eea145baf650e793d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ladislav=20L=C3=A1ska?= <krakonos@krakonos.org>
Date: Sun, 26 Jul 2015 00:01:07 +0200
Subject: Fixed GDAL imports for GDAL 2.0.
Origin: https://github.com/openstreetmap/merkaartor/commit/b333cd33e487f79ae8cd0c2eea145baf650e793d

The GDALOpen is not willing to use vector formats. Replaced by GDALOpenEx.
---
 src/ImportExport/ImportExportGdal.cpp | 7 +++----
 src/MainWindow.cpp                    | 2 +-
 src/common/Document.cpp               | 3 ---
 3 files changed, 4 insertions(+), 8 deletions(-)

--- a/src/ImportExport/ImportExportGdal.cpp
+++ b/src/ImportExport/ImportExportGdal.cpp
@@ -487,16 +487,15 @@ bool ImportExportGdal::import(Layer* aLa
 #ifdef GDAL2
     GDALAllRegister();
     GDALDataset *poDS;
-    poDS = (GDALDataset *) GDALOpen( FileName.toUtf8().constData(), GA_ReadOnly );
+    poDS = (GDALDataset *) GDALOpenEx( FileName.toUtf8().constData(), GDAL_OF_VECTOR | GDAL_OF_RASTER | GDAL_OF_VERBOSE_ERROR, NULL, NULL, NULL );
 #else
     OGRRegisterAll();
     OGRDataSource *poDS;
     poDS = OGRSFDriverRegistrar::Open( FileName.toUtf8().constData(), FALSE );
 #endif
 
-    if( poDS == NULL )
-    {
-        qDebug( "GDAL Open failed.\n" );
+    if( poDS == NULL ) {
+        //qDebug() << "GDAL Open failed from file " << FileName.toUtf8().constData();
         return false;
     }
 
--- a/src/MainWindow.cpp
+++ b/src/MainWindow.cpp
@@ -1739,7 +1739,7 @@ MainWindow::ImportStatus MainWindow::imp
         newLayer = new DrawingLayer( baseFileName );
         newLayer->setUploadable(false);
         mapDocument->add(newLayer);
-        return mapDocument->importGDAL(baseFileName, (DrawingLayer*)newLayer) ? IMPORT_OK : IMPORT_ERROR;
+        return mapDocument->importGDAL(fileName, (DrawingLayer*)newLayer) ? IMPORT_OK : IMPORT_ERROR;
     }
 }
 
--- a/src/common/Document.cpp
+++ b/src/common/Document.cpp
@@ -736,9 +736,6 @@ bool Document::importKML(const QString&
 #ifndef _MOBILE
 bool Document::importGDAL(const QString& filename, DrawingLayer* NewLayer)
 {
-    Q_UNUSED(filename)
-    Q_UNUSED(NewLayer)
-
     ImportExportGdal imp(this);
     if (!imp.loadFile(filename))
         return false;

Places

File 0001-Fixed-GDAL-imports-for-GDAL-2.0.patch of Package merkaartor (Revision f8c1cf9cd141f8b1d20e9baa5283e12e)

Places