Merge remote-tracking branch 'upstream/master'

Author: abellgithub

.github/workflows/alpine/build.sh

@@ -48,3 +48,16 @@ $PYTHON_CMD -m venv myvenv
 source myvenv/bin/activate
 $PYTHON_CMD -m pip install -U check-jsonschema
 check-jsonschema --schemafile data/gdal_algorithm.schema.json out.json
+
+# Check behavior when plugin not available
+mv gdalplugins/ogr_PG.so gdalplugins/ogr_PG.so.disabled
+export GDAL_DRIVER_PATH=$PWD/gdalplugins
+if apps/gdal vector convert -i autotest/ogr/data/poly.shp -o PG:dbname=autotest >/dev/null; then
+  echo "Failure expected"
+  exit 1
+fi
+if test -d PG:dbname=autotest; then
+  echo "Directory PG:dbname=autotest should not have been created"
+  exit 1
+fi
+mv gdalplugins/ogr_PG.so.disabled gdalplugins/ogr_PG.so

.github/workflows/code_checks.yml

@@ -128,6 +128,9 @@ jobs:
       - name: Detect missing includes
         run: ./scripts/detect_missing_include.sh
 
+      - name: Detect (a+b-1)/b
+        run: ./scripts/detect_a_plus_b_minus_1_div_b.sh
+
       # Helps detecting updates of internal libjson-c where replacement
       # of strtod() -> CPLStrtod() is missing. The later function is not
       # locale sensitive. An alternative would be to make sure that HAVE_USELOCALE

.github/workflows/codeql.yml

@@ -108,7 +108,7 @@ jobs:
     # We do that after running CMake to avoid CodeQL to trigger during CMake time,
     # in particular during HDF5 detection which is terribly slow (https://github.com/OSGeo/gdal/issues/9549)
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@28deaeda66b76a05916b6923827895f2b14ab387 # v3.28.16
+      uses: github/codeql-action/init@ff0a06e83cb2de871e5a09832bc6a81e7276941f # v3.28.18
       with:
         languages: ${{ matrix.language }}
         # If you wish to specify custom queries, you can do so here or in a config file.
@@ -128,6 +128,6 @@ jobs:
         cmake --build build -j$(nproc)
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@28deaeda66b76a05916b6923827895f2b14ab387 # v3.28.16
+      uses: github/codeql-action/analyze@ff0a06e83cb2de871e5a09832bc6a81e7276941f # v3.28.18
       with:
         category: "/language:${{matrix.language}}"

.github/workflows/scorecard.yml

@@ -41,7 +41,7 @@ jobs:
           persist-credentials: false
 
       - name: "Run analysis"
-        uses: ossf/scorecard-action@f49aabe0b5af0936a0987cfb85d86b75731b0186 # v2.4.1
+        uses: ossf/scorecard-action@05b42c624433fc40578a4040d5cf5e36ddca8cde # v2.4.2
         with:
           results_file: results.sarif
           results_format: sarif
@@ -71,6 +71,6 @@ jobs:
 
       # Upload the results to GitHub's code scanning dashboard.
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@28deaeda66b76a05916b6923827895f2b14ab387 # v3.28.16
+        uses: github/codeql-action/upload-sarif@ff0a06e83cb2de871e5a09832bc6a81e7276941f # v3.28.18
         with:
           sarif_file: results.sarif

.github/workflows/ubuntu_20.04/Dockerfile.ci

@@ -164,7 +164,7 @@ RUN wget -q https://github.com/Esri/file-geodatabase-api/raw/master/FileGDB_API_
   && echo "/usr/local/FileGDB_API/lib" > /etc/ld.so.conf.d/filegdbapi.conf
 
 # Build and install GEOS
-ENV GEOS_VERSION=3.11.0
+ENV GEOS_VERSION=main
 RUN mkdir geos \
     && wget -q https://github.com/libgeos/geos/archive/${GEOS_VERSION}.tar.gz -O - \
         | tar xz -C geos --strip-components=1 \

alg/gdal_simplesurf.h

@@ -175,7 +175,7 @@ class GDALFeaturePoint
 };
 
 /**
- * @author Andrew Migal migal.drew@gmail.com
+ * @author Andrew Migal migal.drew at gmail.com
  * @brief Integral image class (summed area table).
  * @details Integral image is a table for fast computing the sum of
  * values in rectangular subarea. In more detail, for 2-dimensional array
@@ -267,7 +267,7 @@ class GDALIntegralImage
 };
 
 /**
- * @author Andrew Migal migal.drew@gmail.com
+ * @author Andrew Migal migal.drew at gmail.com
  * @brief Class for computation and storage of Hessian values in SURF-based
  * algorithm.
  *
@@ -339,7 +339,7 @@ class GDALOctaveLayer
 };
 
 /**
- * @author Andrew Migal migal.drew@gmail.com
+ * @author Andrew Migal migal.drew at gmail.com
  * @brief Class for handling octave layers in SURF-based algorithm.
  * @details Class contains OctaveLayers and provides capability to construct
  * octave space and distinguish feature points. Normally this class is used only
@@ -414,7 +414,7 @@ class GDALOctaveMap
 };
 
 /**
- * @author Andrew Migal migal.drew@gmail.com
+ * @author Andrew Migal migal.drew at gmail.com
  * @brief Class for searching corresponding points on images.
  * @details Provides capability for detection feature points
  * and finding equal points on different images.

alg/gdalchecksum.cpp

@@ -151,7 +151,6 @@ int CPL_STDCALL GDALChecksumImage(GDALRasterBandH hBand, int nXOff, int nYOff,
                              "Checksum value could not be computed due to I/O "
                              "read error.");
                     nChecksum = -1;
-                    iYBlock = nYBlocks;
                     break;
                 }
                 const size_t xIters =
@@ -176,6 +175,9 @@ int CPL_STDCALL GDALChecksumImage(GDALRasterBandH hBand, int nXOff, int nYOff,
                     nChecksum &= 0xffff;
                 }
             }
+
+            if (nChecksum < 0)
+                break;
         }
 
         CPLFree(padfLineData);
@@ -285,7 +287,6 @@ int CPL_STDCALL GDALChecksumImage(GDALRasterBandH hBand, int nXOff, int nYOff,
                              "Checksum value could not be computed due to I/O "
                              "read error.");
                     nChecksum = -1;
-                    iYBlock = nYBlocks;
                     break;
                 }
                 const size_t xIters =
@@ -310,6 +311,9 @@ int CPL_STDCALL GDALChecksumImage(GDALRasterBandH hBand, int nXOff, int nYOff,
                     nChecksum &= 0xffff;
                 }
             }
+
+            if (nChecksum < 0)
+                break;
         }
 
         CPLFree(panChunkData);

alg/gdalgrid.cpp

@@ -2560,6 +2560,7 @@ struct _GDALGridJob
     GDALDataType eType;
 
     int *pnCounter;
+    int nCounterSingleThreaded;
     volatile int *pbStop;
     CPLCond *hCond;
     CPLMutex *hCondMutex;
@@ -2591,8 +2592,7 @@ static int GDALGridProgressMultiThread(GDALGridJob *psJob)
 // Return TRUE if the computation must be interrupted.
 static int GDALGridProgressMonoThread(GDALGridJob *psJob)
 {
-    // coverity[missing_lock]
-    const int nCounter = ++(*psJob->pnCounter);
+    const int nCounter = ++(psJob->nCounterSingleThreaded);
     if (!psJob->pfnRealProgress(nCounter / static_cast<double>(psJob->nYSize),
                                 "", psJob->pRealProgressArg))
     {
@@ -3509,6 +3509,7 @@ CPLErr GDALGridContextProcess(GDALGridContext *psContext, double dfXMin,
     sJob.eType = eType;
     sJob.pfnRealProgress = pfnProgress;
     sJob.pRealProgressArg = pProgressArg;
+    sJob.nCounterSingleThreaded = 0;
     sJob.pnCounter = &nCounter;
     sJob.pbStop = &bStop;
     sJob.hCond = nullptr;

alg/gdalrasterize.cpp

@@ -1181,7 +1181,7 @@ static CPLErr GDALRasterizeGeometriesInternal(
             nYChunkSize = poDS->GetRasterYSize();
 
         CPLDebug("GDAL", "Rasterizer operating on %d swaths of %d scanlines.",
-                 (poDS->GetRasterYSize() + nYChunkSize - 1) / nYChunkSize,
+                 DIV_ROUND_UP(poDS->GetRasterYSize(), nYChunkSize),
                  nYChunkSize);
 
         pabyChunkBuf = static_cast<unsigned char *>(VSI_MALLOC2_VERBOSE(
@@ -1259,10 +1259,8 @@ static CPLErr GDALRasterizeGeometriesInternal(
         /*      the block size of the output file. */
         /* --------------------------------------------------------------------
          */
-        const int nXBlocks =
-            (poBand->GetXSize() + nXBlockSize - 1) / nXBlockSize;
-        const int nYBlocks =
-            (poBand->GetYSize() + nYBlockSize - 1) / nYBlockSize;
+        const int nXBlocks = DIV_ROUND_UP(poBand->GetXSize(), nXBlockSize);
+        const int nYBlocks = DIV_ROUND_UP(poBand->GetYSize(), nYBlockSize);
 
         const GDALDataType eType =
             poBand->GetRasterDataType() == GDT_Byte ? GDT_Byte : GDT_Float64;
@@ -1589,8 +1587,7 @@ CPLErr GDALRasterizeLayers(GDALDatasetH hDS, int nBandCount, int *panBandList,
         nYChunkSize = poDS->GetRasterYSize();
 
     CPLDebug("GDAL", "Rasterizer operating on %d swaths of %d scanlines.",
-             (poDS->GetRasterYSize() + nYChunkSize - 1) / nYChunkSize,
-             nYChunkSize);
+             DIV_ROUND_UP(poDS->GetRasterYSize(), nYChunkSize), nYChunkSize);
     unsigned char *pabyChunkBuf = static_cast<unsigned char *>(
         VSI_MALLOC2_VERBOSE(nYChunkSize, nScanlineBytes));
     if (pabyChunkBuf == nullptr)

alg/gdalwarper.h

@@ -499,15 +499,28 @@ void GWKThreadsEnd(void *psThreadDataIn);
 /*! @cond Doxygen_Suppress */
 typedef struct _GDALWarpChunk GDALWarpChunk;
 
+struct GDALTransformerUniquePtrReleaser
+{
+    void operator()(void *p)
+    {
+        GDALDestroyTransformer(p);
+    }
+};
+
 /*! @endcond */
 
-class CPL_DLL GDALWarpOperation
+/** Unique pointer for the argument of a GDALTransformerFunc */
+using GDALTransformerArgUniquePtr =
+    std::unique_ptr<void, GDALTransformerUniquePtrReleaser>;
+
+class CPL_DLL GDALWarpOperation final
 {
 
     CPL_DISALLOW_COPY_ASSIGN(GDALWarpOperation)
 
   private:
-    GDALWarpOptions *psOptions;
+    GDALWarpOptions *psOptions = nullptr;
+    GDALTransformerArgUniquePtr m_psOwnedTransformerArg{nullptr};
 
     void WipeOptions();
     int ValidateOptions();
@@ -528,17 +541,17 @@ class CPL_DLL GDALWarpOperation
     static CPLErr CreateKernelMask(GDALWarpKernel *, int iBand,
                                    const char *pszType);
 
-    CPLMutex *hIOMutex;
-    CPLMutex *hWarpMutex;
+    CPLMutex *hIOMutex = nullptr;
+    CPLMutex *hWarpMutex = nullptr;
 
-    int nChunkListCount;
-    int nChunkListMax;
-    GDALWarpChunk *pasChunkList;
+    int nChunkListCount = 0;
+    int nChunkListMax = 0;
+    GDALWarpChunk *pasChunkList = nullptr;
 
-    int bReportTimings;
-    unsigned long nLastTimeReported;
+    bool bReportTimings = false;
+    unsigned long nLastTimeReported = 0;
 
-    void *psThreadData;
+    void *psThreadData = nullptr;
 
     // Coordinates a few special points in target image space, to determine
     // if ComputeSourceWindow() must use a grid based sampling.
@@ -555,9 +568,12 @@ class CPL_DLL GDALWarpOperation
 
   public:
     GDALWarpOperation();
-    virtual ~GDALWarpOperation();
+    ~GDALWarpOperation();
 
-    CPLErr Initialize(const GDALWarpOptions *psNewOptions);
+    CPLErr Initialize(const GDALWarpOptions *psNewOptions,
+                      GDALTransformerFunc pfnTransformer = nullptr,
+                      GDALTransformerArgUniquePtr psOwnedTransformerArg =
+                          GDALTransformerArgUniquePtr{nullptr});
     void *CreateDestinationBuffer(int nDstXSize, int nDstYSize,
                                   int *pbWasInitialized = nullptr);
     CPLErr InitializeDestinationBuffer(void *pDstBuffer, int nDstXSize,