osgeo4w: prepare for GDAL 2.3 update

qgis · Oct 13, 2018 · 4f76722 · 4f76722
1 parent 85fdf4e
commit 4f76722
Show file tree

Hide file tree

Showing 11 changed files with 32 additions and 10 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -481,6 +481,9 @@ IF(MSVC)
   SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -DQGISDEBUG=1")
   # disable macros that offend std::numeric_limits<T>::min()/max()
   ADD_DEFINITIONS(-DNOMINMAX)
+  IF(MSVC_VERSION LESS 1900)
+    ADD_DEFINITIONS(-DCPL_SUPRESS_CPLUSPLUS)
+  ENDIF(MSVC_VERSION LESS 1900)
 ENDIF(MSVC)
 
 IF(ENABLE_COVERAGE)

diff --git a/src/analysis/raster/qgsalignraster.cpp b/src/analysis/raster/qgsalignraster.cpp
@@ -15,9 +15,16 @@
 
 #include "qgsalignraster.h"
 
-#include <gdalwarper.h>
 #include <ogr_srs_api.h>
 #include <cpl_conv.h>
+
+#if defined(_MSC_VER) && _MSC_VER >= 1600 && _MSC_VER < 1900
+// we need GDALWarpKernel
+#undef CPL_SUPRESS_CPLUSPLUS
+#endif
+
+#include <gdalwarper.h>
+
 #include <limits>
 
 #include <qmath.h>
@@ -503,9 +510,8 @@ bool QgsAlignRaster::createAndWarp( const Item& raster )
   }
 
   // Initialize and execute the warp operation.
-  GDALWarpOperation oOperation;
-  oOperation.Initialize( psWarpOptions );
-  oOperation.ChunkAndWarpImage( 0, 0, mXSize, mYSize );
+  GDALWarpOperationH oOperation = GDALCreateWarpOperation( psWarpOptions );
+  GDALChunkAndWarpImage( oOperation, 0, 0, mXSize, mYSize );
 
   GDALDestroyGenImgProjTransformer( psWarpOptions->pTransformerArg );
   GDALDestroyWarpOptions( psWarpOptions );

diff --git a/src/app/qgsoptions.cpp b/src/app/qgsoptions.cpp
@@ -62,7 +62,9 @@
 #include <sqlite3.h>
 #include "qgslogger.h"
 
+#ifndef CPL_SUPRESS_CPLUSPLUS
 #define CPL_SUPRESS_CPLUSPLUS
+#endif
 #include <gdal.h>
 #include <geos_c.h>
 #include <cpl_conv.h> // for setting gdal options

diff --git a/src/core/qgsdataitem.cpp b/src/core/qgsdataitem.cpp
@@ -40,7 +40,9 @@
 #include "qgsconfig.h"
 
 // use GDAL VSI mechanism
+#ifndef CPL_SUPRESS_CPLUSPLUS
 #define CPL_SUPRESS_CPLUSPLUS
+#endif
 #include "cpl_vsi.h"
 #include "cpl_string.h"
 

diff --git a/src/plugins/georeferencer/qgsgeoreftransform.cpp b/src/plugins/georeferencer/qgsgeoreftransform.cpp
@@ -18,11 +18,11 @@
 
 #include <gdal.h>
 #include <gdal_alg.h>
+#include <cpl_string.h>
 
 #include "qgsleastsquares.h"
 
 #include <cmath>
-
 #include <cassert>
 #include <limits>
 
@@ -511,7 +511,7 @@ bool QgsGDALGeorefTransform::updateParametersFromGCPs( const QVector<QgsPoint> &
   for ( int i = 0; i < n; i++ )
   {
     GCPList[i].pszId = new char[20];
-    snprintf( GCPList[i].pszId, 19, "gcp%i", i );
+    CPLsnprintf( GCPList[i].pszId, 19, "gcp%i", i );
     GCPList[i].pszInfo = nullptr;
     GCPList[i].dfGCPPixel =  pixelCoords[i].x();
     GCPList[i].dfGCPLine  = -pixelCoords[i].y();

diff --git a/src/plugins/georeferencer/qgsimagewarper.cpp b/src/plugins/georeferencer/qgsimagewarper.cpp
@@ -252,15 +252,14 @@ int QgsImageWarper::warpFile( const QString& input,
                                    adfGeoTransform );
 
   // Initialize and execute the warp operation.
-  GDALWarpOperation oOperation;
-  oOperation.Initialize( psWarpOptions );
+  GDALWarpOperationH oOperation = GDALCreateWarpOperation( psWarpOptions );
 
   progressDialog->show();
   progressDialog->raise();
   progressDialog->activateWindow();
 
-  eErr = oOperation.ChunkAndWarpImage( 0, 0, destPixels, destLines );
-//  eErr = oOperation.ChunkAndWarpMulti(0, 0, destPixels, destLines);
+  eErr = GDALChunkAndWarpImage( oOperation, 0, 0, destPixels, destLines );
+  // eErr = GDALChunkAndWarpMulti( oOperation, 0, 0, destPixels, destLines );
 
   destroyGeoToPixelTransform( psWarpOptions->pTransformerArg );
   GDALDestroyWarpOptions( psWarpOptions );

diff --git a/src/providers/gdal/qgsgdalproviderbase.cpp b/src/providers/gdal/qgsgdalproviderbase.cpp
@@ -15,7 +15,9 @@
  *                                                                         *
  ***************************************************************************/
 
+#ifndef CPL_SUPRESS_CPLUSPLUS
 #define CPL_SUPRESS_CPLUSPLUS
+#endif
 #include "cpl_conv.h"
 
 #include "qgsapplication.h"

diff --git a/src/providers/gdal/qgsgdalproviderbase.h b/src/providers/gdal/qgsgdalproviderbase.h
@@ -23,7 +23,9 @@
 
 #include <QList>
 
+#ifndef CPL_SUPRESS_CPLUSPLUS
 #define CPL_SUPRESS_CPLUSPLUS
+#endif
 #include <gdal.h>
 
 #if defined(GDAL_VERSION_NUM) && GDAL_VERSION_NUM >= 1800

diff --git a/src/providers/ogr/qgsogrprovider.cpp b/src/providers/ogr/qgsogrprovider.cpp
@@ -21,7 +21,9 @@ email                : sherman at mrcc.com
 #include "qgsmessagelog.h"
 #include "qgslocalec.h"
 
+#ifndef CPL_SUPRESS_CPLUSPLUS
 #define CPL_SUPRESS_CPLUSPLUS
+#endif
 #include <gdal.h>         // to collect version information
 #include <ogr_api.h>
 #include <ogr_srs_api.h>

diff --git a/src/providers/wcs/qgswcsprovider.h b/src/providers/wcs/qgswcsprovider.h
@@ -44,7 +44,9 @@ class QNetworkAccessManager;
 class QNetworkReply;
 class QNetworkRequest;
 
+#ifndef CPL_SUPRESS_CPLUSPLUS
 #define CPL_SUPRESS_CPLUSPLUS
+#endif
 #include <gdal.h>
 #include "cpl_conv.h"
 

diff --git a/tests/src/core/testqgsapplication.cpp b/tests/src/core/testqgsapplication.cpp
@@ -15,7 +15,9 @@ Email                : sherman at mrcc dot com
 #include <QtTest/QtTest>
 #include <QPixmap>
 
+#ifndef CPL_SUPRESS_CPLUSPLUS
 #define CPL_SUPRESS_CPLUSPLUS
+#endif
 #include <gdal.h>
 
 //header for class being tested