Update versions of tools by pre-commit

Author: rouault

.pre-commit-config.yaml

@@ -8,7 +8,7 @@ repos:
             files: \.(h|cpp|hpp|c)$
 
     -   repo: https://github.com/psf/black
-        rev: 22.3.0
+        rev: 26.1.0
         hooks:
         -   id: black
             exclude: >
@@ -20,7 +20,7 @@ repos:
                 autotest/ogr/data/
               )
     -   repo: https://github.com/timothycrosley/isort
-        rev: 5.12.0
+        rev: 7.0.0
         hooks:
         -   id: isort
             exclude: >
@@ -32,7 +32,7 @@ repos:
                 autotest/ogr/data/
               )
     -   repo: https://github.com/pycqa/flake8
-        rev: 7.0.0
+        rev: 7.3.0
         hooks:
         -   id: flake8
             exclude: >
@@ -45,7 +45,7 @@ repos:
                 autotest/ogr/data/
               )
     -   repo: https://github.com/pre-commit/mirrors-clang-format
-        rev: 'v15.0.7'
+        rev: 'v21.1.8'
         hooks:
         -   id: clang-format
             exclude: >

alg/delaunay.c

@@ -348,11 +348,11 @@ int GDALTriangulationComputeBarycentricCoefficients(GDALTriangulation *psDT,
 /************************************************************************/
 
 #define BARYC_COORD_L1(psCoeffs, dfX, dfY)                                     \
-    (psCoeffs->dfMul1X * ((dfX)-psCoeffs->dfCstX) +                            \
-     psCoeffs->dfMul1Y * ((dfY)-psCoeffs->dfCstY))
+    (psCoeffs->dfMul1X * ((dfX) - psCoeffs->dfCstX) +                          \
+     psCoeffs->dfMul1Y * ((dfY) - psCoeffs->dfCstY))
 #define BARYC_COORD_L2(psCoeffs, dfX, dfY)                                     \
-    (psCoeffs->dfMul2X * ((dfX)-psCoeffs->dfCstX) +                            \
-     psCoeffs->dfMul2Y * ((dfY)-psCoeffs->dfCstY))
+    (psCoeffs->dfMul2X * ((dfX) - psCoeffs->dfCstX) +                          \
+     psCoeffs->dfMul2Y * ((dfY) - psCoeffs->dfCstY))
 #define BARYC_COORD_L3(l1, l2) (1 - (l1) - (l2))
 
 /** Computes the barycentric coordinates of a point.

alg/gdal_crs.cpp

@@ -585,7 +585,7 @@ struct MATRIX
 
 /* CALCULATE OFFSET INTO ARRAY BASED ON R/C */
 
-#define M(row, col) m->v[(((row)-1) * (m->n)) + (col)-1]
+#define M(row, col) m->v[(((row) - 1) * (m->n)) + (col) - 1]
 
 /************************************************************************/
 /*         FUNCTION PROTOTYPES FOR STATIC (INTERNAL) FUNCTIONS          */

alg/gdalgrid.cpp

@@ -245,8 +245,8 @@ CPLErr GDALGridInverseDistanceToAPowerNearestNeighbor(
 {
     CPL_IGNORE_RET_VAL(nPoints);
 
-    const GDALGridInverseDistanceToAPowerNearestNeighborOptions
-        *const poOptions = static_cast<
+    const GDALGridInverseDistanceToAPowerNearestNeighborOptions *const
+        poOptions = static_cast<
             const GDALGridInverseDistanceToAPowerNearestNeighborOptions *>(
             poOptionsIn);
     const double dfRadius = poOptions->dfRadius;
@@ -352,8 +352,8 @@ static CPLErr GDALGridInverseDistanceToAPowerNearestNeighborPerQuadrant(
     const double *padfY, const double *padfZ, double dfXPoint, double dfYPoint,
     double *pdfValue, void *hExtraParamsIn)
 {
-    const GDALGridInverseDistanceToAPowerNearestNeighborOptions
-        *const poOptions = static_cast<
+    const GDALGridInverseDistanceToAPowerNearestNeighborOptions *const
+        poOptions = static_cast<
             const GDALGridInverseDistanceToAPowerNearestNeighborOptions *>(
             poOptionsIn);
     const double dfRadius = poOptions->dfRadius;
@@ -2609,7 +2609,7 @@ static int GDALGridProgressMonoThread(GDALGridJob *psJob)
 static void GDALGridJobProcess(void *user_data)
 {
     GDALGridJob *const psJob = static_cast<GDALGridJob *>(user_data);
-    int (*pfnProgress)(GDALGridJob * psJob) = psJob->pfnProgress;
+    int (*pfnProgress)(GDALGridJob *psJob) = psJob->pfnProgress;
     const GUInt32 nXSize = psJob->nXSize;
 
     /* -------------------------------------------------------------------- */
@@ -3862,8 +3862,8 @@ CPLErr GDALGridParseAlgorithmAndOptions(const char *pszAlgorithm,
             *ppOptions = CPLMalloc(
                 sizeof(GDALGridInverseDistanceToAPowerNearestNeighborOptions));
 
-            GDALGridInverseDistanceToAPowerNearestNeighborOptions
-                *const poPowerOpts = static_cast<
+            GDALGridInverseDistanceToAPowerNearestNeighborOptions *const
+                poPowerOpts = static_cast<
                     GDALGridInverseDistanceToAPowerNearestNeighborOptions *>(
                     *ppOptions);
 

alg/gdalwarpkernel.cpp

@@ -4366,9 +4366,9 @@ static bool GWKResampleOptimizedLanczos(const GDALWarpKernel *poWK, int iBand,
                 else
                     padfWeightsXShifted[i] = padfCst[(i + 3) % 3] / (dfX * dfX);
 #if DEBUG_VERBOSE
-                    // TODO(schwehr): AlmostEqual.
-                    // CPLAssert(fabs(padfWeightsX[i-poWK->nFiltInitX] -
-                    //               GWKLanczosSinc(dfX, 3.0)) < 1e-10);
+                // TODO(schwehr): AlmostEqual.
+                // CPLAssert(fabs(padfWeightsX[i-poWK->nFiltInitX] -
+                //               GWKLanczosSinc(dfX, 3.0)) < 1e-10);
 #endif
             }
 
@@ -4483,9 +4483,9 @@ static bool GWKResampleOptimizedLanczos(const GDALWarpKernel *poWK, int iBand,
                 else
                     padfWeightsYShifted[j] = padfCst[(j + 3) % 3] / (dfY * dfY);
 #if DEBUG_VERBOSE
-                    // TODO(schwehr): AlmostEqual.
-                    // CPLAssert(fabs(padfWeightsYShifted[j] -
-                    //               GWKLanczosSinc(dfY, 3.0)) < 1e-10);
+                // TODO(schwehr): AlmostEqual.
+                // CPLAssert(fabs(padfWeightsYShifted[j] -
+                //               GWKLanczosSinc(dfY, 3.0)) < 1e-10);
 #endif
             }
 

alg/llrasterize.cpp

@@ -742,6 +742,6 @@ void GDALdllImageLineAllTouched(
                     dfVariant += dfDeltaVariant * dfStepX;
                 }
             }  // Next step along segment.
-        }      // Next segment.
-    }          // Next part.
+        }  // Next segment.
+    }  // Next part.
 }

alg/viewshed/cumulative.cpp

@@ -78,7 +78,8 @@ bool Cumulative::run(const std::string &srcFilename,
     CPLWorkerThreadPool executorPool(numThreads);
     for (int i = 0; i < numThreads; ++i)
         executorPool.SubmitJob(
-            [this, &srcFilename, &progress, &err, &running, &hasFoundNoData] {
+            [this, &srcFilename, &progress, &err, &running, &hasFoundNoData]
+            {
                 runExecutor(srcFilename, progress, err, running,
                             hasFoundNoData);
             });

alg/viewshed/viewshed_types.h

@@ -78,7 +78,7 @@ struct Options
         90.0};  //!< maximum pitch (vertical angle) of observable points
     double curveCoeff{.85714};  //!< coefficient for atmospheric refraction
     OutputMode outputMode{OutputMode::Normal};  //!< Output information.
-        //!< Normal, Height from DEM or Height from ground
+    //!< Normal, Height from DEM or Height from ground
     std::string outputFormat{};         //!< output raster format
     std::string outputFilename{};       //!< output raster filename
     CPLStringList creationOpts{};       //!< options for output raster creation

apps/gdal2ogr.c

@@ -258,9 +258,9 @@ int main(int argc, char *argv[])
     padfBuffer = (double *)CPLMalloc(nXSize * sizeof(double));
 
 #define GET_X(j, i)                                                            \
-    adfGeotransform[0] + (j)*adfGeotransform[1] + (i)*adfGeotransform[2]
+    adfGeotransform[0] + (j) * adfGeotransform[1] + (i) * adfGeotransform[2]
 #define GET_Y(j, i)                                                            \
-    adfGeotransform[3] + (j)*adfGeotransform[4] + (i)*adfGeotransform[5]
+    adfGeotransform[3] + (j) * adfGeotransform[4] + (i) * adfGeotransform[5]
 #define GET_XY(j, i) GET_X(j, i), GET_Y(j, i)
 
     /* -------------------------------------------------------------------- */

apps/gdal_rasterize_lib.cpp

@@ -105,7 +105,8 @@ GDALRasterizeOptionsGetParser(GDALRasterizeOptions *psOptions,
     argParser->add_argument("-at")
         .flag()
         .action(
-            [psOptions](const std::string &) {
+            [psOptions](const std::string &)
+            {
                 psOptions->aosRasterizeOptions.SetNameValue("ALL_TOUCHED",
                                                             "TRUE");
             })
@@ -135,7 +136,8 @@ GDALRasterizeOptionsGetParser(GDALRasterizeOptions *psOptions,
             .flag()
             .store_into(psOptions->b3D)
             .action(
-                [psOptions](const std::string &) {
+                [psOptions](const std::string &)
+                {
                     psOptions->aosRasterizeOptions.SetNameValue(
                         "BURN_VALUE_FROM", "Z");
                 })
@@ -146,7 +148,8 @@ GDALRasterizeOptionsGetParser(GDALRasterizeOptions *psOptions,
     argParser->add_argument("-add")
         .flag()
         .action(
-            [psOptions](const std::string &) {
+            [psOptions](const std::string &)
+            {
                 psOptions->aosRasterizeOptions.SetNameValue("MERGE_ALG", "ADD");
             })
         .help(_("Instead of burning a new value, this adds the new value to "
@@ -157,7 +160,8 @@ GDALRasterizeOptionsGetParser(GDALRasterizeOptions *psOptions,
         .flag()
         .hidden()
         .action(
-            [psOptions](const std::string &s) {
+            [psOptions](const std::string &s)
+            {
                 psOptions->aosRasterizeOptions.SetNameValue("CHUNKYSIZE",
                                                             s.c_str());
             });
@@ -286,7 +290,8 @@ GDALRasterizeOptionsGetParser(GDALRasterizeOptions *psOptions,
     argParser->add_argument("-optim")
         .metavar("AUTO|VECTOR|RASTER")
         .action(
-            [psOptions](const std::string &s) {
+            [psOptions](const std::string &s)
+            {
                 psOptions->aosRasterizeOptions.SetNameValue("OPTIM", s.c_str());
             })
         .help(_("Force the algorithm used."));