update gdal

ARPA-SIMC · Sep 10, 2024 · 0306f32 · 0306f32
1 parent aea9500
commit 0306f32
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 22 deletions.
diff --git a/agrolib/gdal.pri b/agrolib/gdal.pri
@@ -14,7 +14,6 @@
 
 unix:!macx {
     LIBS += -L/usr/lib -lgdal
-    LIBS += -L/usr/lib/x86_64-linux-gnu -lgeos_c
 
     INCLUDEPATH += /usr/include/gdal
     DEPENDPATH += /usr/include/gdal
@@ -39,16 +38,11 @@ win32-g++ {
 mac {
     LIBS += -framework IOKit
     LIBS += -framework CoreFoundation
+    LIBS += -framework GDAL
 
     QMAKE_LFLAGS += -F/Library/Frameworks/
 
-    LIBS += -framework GDAL
-    LIBS += -framework PROJ
-    LIBS += -framework GEOS
-
     INCLUDEPATH += /Library/Frameworks/GDAL.framework/Headers
-    INCLUDEPATH += /Library/Frameworks/PROJ.framework/Headers
-    INCLUDEPATH += /Library/Frameworks/GEOS.framework/Headers
 }
 
 
diff --git a/agrolib/gdalHandler/gdalExtensions.cpp b/agrolib/gdalHandler/gdalExtensions.cpp
@@ -4,9 +4,9 @@
  * https://github.com/mogasw/rasterix/
 */
 
-#include "gdalExtensions.h"
-
 #include <cstring>
+
+#include "gdalExtensions.h"
 #include <gdal_priv.h>
 
 

diff --git a/agrolib/gdalHandler/gdalRasterFunctions.cpp b/agrolib/gdalHandler/gdalRasterFunctions.cpp
@@ -1,24 +1,23 @@
 #include "gdalRasterFunctions.h"
 #include "commonConstants.h"
 
-#include <gdalwarper.h>
-
 #include <iostream>
 #include <cmath>
 
+#include <gdalwarper.h>
+
 #include <QFileInfo>
 #include <QString>
-#include <QDebug>
 
 
 /*! readGdalRaster
  * \brief open a raster file with GDAL library
  * \return GDALDataset
  */
-bool readGdalRaster(QString fileName, gis::Crit3DRasterGrid* myRaster, int &utmZone, QString &error)
+bool readGdalRaster(QString fileName, gis::Crit3DRasterGrid* rasterPointer, int &utmZone, QString &error)
 {
-    // check
-    if (myRaster == nullptr) return false;
+    // check parameters
+    if (rasterPointer == nullptr) return false;
     if (fileName == "") return false;
 
     GDALDataset* dataset = (GDALDataset*) GDALOpen(fileName.toStdString().data(), GA_ReadOnly);
@@ -28,7 +27,7 @@ bool readGdalRaster(QString fileName, gis::Crit3DRasterGrid* myRaster, int &utmZ
         return false;
     }
 
-    bool myResult = convertGdalRaster(dataset, myRaster, utmZone, error);
+    bool myResult = convertGdalRaster(dataset, rasterPointer, utmZone, error);
     GDALClose(dataset);
 
     return myResult;

diff --git a/agrolib/gdalHandler/gdalRasterFunctions.h b/agrolib/gdalHandler/gdalRasterFunctions.h
@@ -8,7 +8,7 @@
 
     class QString;
 
-    bool readGdalRaster(QString fileName, gis::Crit3DRasterGrid *myRaster, int &utmZone, QString &error);
+    bool readGdalRaster(QString fileName, gis::Crit3DRasterGrid *rasterPointer, int &utmZone, QString &error);
 
     bool convertGdalRaster(GDALDataset* dataset, gis::Crit3DRasterGrid *myRaster, int &utmZone, QString &error);
 

diff --git a/agrolib/gdalHandler/gdalShapeFunctions.cpp b/agrolib/gdalHandler/gdalShapeFunctions.cpp
@@ -1,14 +1,12 @@
 #include <QFileInfo>
 #include <string.h>
-#include <ogrsf_frmts.h>
-#include "ogr_spatialref.h"
-#include <gdal_priv.h>
-#include <gdal_utils.h>
-#include <QDebug>
 
 #include "gdalShapeFunctions.h"
 #include "gdalRasterFunctions.h"
 
+#include <ogrsf_frmts.h>
+#include <gdal_utils.h>
+
 
 bool gdalShapeToRaster(QString shapeFileName, QString shapeField, QString resolution,
                        QString mapProjection, QString outputName, QString paletteFileName,