Merge pull request #6629 from OSGeo/backport-6628-to-release/3.6

[Backport release/3.6] Add missing #include <algorithm> for std::min/std::max uses, and #include <limits> for std::numeric_limits<>
OSGeo · Nov 6, 2022 · 368e1e0 · 368e1e0
2 parents b7f4bb1 + de77c8f
commit 368e1e0
Show file tree

Hide file tree

Showing 49 changed files with 145 additions and 38 deletions.
diff --git a/.github/workflows/code_checks.yml b/.github/workflows/code_checks.yml
@@ -60,6 +60,9 @@ jobs:
       - name: Detect suspicious char digit zero
         run: ./scripts/detect_suspicious_char_digit_zero.sh
 
+      - name: Detect missing includes
+        run: ./scripts/detect_missing_include.sh
+
       - name: Shellcheck
         run: shellcheck -e SC2086,SC2046,SC2164,SC2054 $(find . -name '*.sh' -a -not -name ltmain.sh -a -not -wholename "./autotest/*" -a -not -wholename "./.github/*")
 

diff --git a/alg/gdal_rpc.cpp b/alg/gdal_rpc.cpp
@@ -36,6 +36,7 @@
 #include <cstring>
 
 #include <algorithm>
+#include <limits>
 #include <string>
 
 #include "cpl_conv.h"

diff --git a/alg/gdalrasterize.cpp b/alg/gdalrasterize.cpp
@@ -36,6 +36,7 @@
 #include <cstdlib>
 #include <cstring>
 #include <cfloat>
+#include <limits>
 #include <vector>
 #include <algorithm>
 

diff --git a/alg/gdaltransformer.cpp b/alg/gdaltransformer.cpp
@@ -41,6 +41,7 @@
 #include <cstring>
 
 #include <algorithm>
+#include <limits>
 #include <utility>
 
 #include "cpl_conv.h"

diff --git a/alg/marching_squares/square.h b/alg/marching_squares/square.h
@@ -28,6 +28,7 @@
 #ifndef MARCHING_SQUARE_SQUARE_H
 #define MARCHING_SQUARE_SQUARE_H
 
+#include <algorithm>
 #include <cassert>
 #include <cstdint>
 #include <math.h>
@@ -39,15 +40,15 @@ namespace marching_squares {
 struct Square
 {
     // Bit flags to determine borders around pixel
-    static const uint8_t NO_BORDER    = 0;      // 0000 0000 
-    static const uint8_t LEFT_BORDER  = 1 << 0; // 0000 0001 
+    static const uint8_t NO_BORDER    = 0;      // 0000 0000
+    static const uint8_t LEFT_BORDER  = 1 << 0; // 0000 0001
     static const uint8_t LOWER_BORDER = 1 << 1; // 0000 0010
     static const uint8_t RIGHT_BORDER = 1 << 2; // 0000 0100
     static const uint8_t UPPER_BORDER = 1 << 3; // 0000 1000
 
     // Bit flags for marching square case
-    static const uint8_t ALL_LOW     = 0;      // 0000 0000 
-    static const uint8_t UPPER_LEFT  = 1 << 0; // 0000 0001 
+    static const uint8_t ALL_LOW     = 0;      // 0000 0000
+    static const uint8_t UPPER_LEFT  = 1 << 0; // 0000 0001
     static const uint8_t LOWER_LEFT  = 1 << 1; // 0000 0010
     static const uint8_t LOWER_RIGHT = 1 << 2; // 0000 0100
     static const uint8_t UPPER_RIGHT = 1 << 3; // 0000 1000
@@ -107,27 +108,27 @@ struct Square
         assert(lowerLeft.y == lowerRight.y);
         assert(lowerLeft.x == upperLeft.x);
         assert(lowerRight.x == upperRight.x);
-        assert(!split || nanCount == 0); 
+        assert(!split || nanCount == 0);
     }
 
-    Square upperLeftSquare() const 
-    { 
+    Square upperLeftSquare() const
+    {
         assert(!std::isnan(upperLeft.value));
         return Square(
-                    upperLeft, upperCenter(), 
+                    upperLeft, upperCenter(),
                     leftCenter(), center(),
-                    (std::isnan(upperRight.value) ? RIGHT_BORDER: NO_BORDER) 
-                    | (std::isnan(lowerLeft.value) ? LOWER_BORDER : NO_BORDER), true); 
+                    (std::isnan(upperRight.value) ? RIGHT_BORDER: NO_BORDER)
+                    | (std::isnan(lowerLeft.value) ? LOWER_BORDER : NO_BORDER), true);
     }
 
     Square lowerLeftSquare() const
-    { 
+    {
         assert(!std::isnan(lowerLeft.value));
         return Square(
-                    leftCenter(), center(), 
+                    leftCenter(), center(),
                     lowerLeft, lowerCenter(),
-                    (std::isnan(lowerRight.value) ? RIGHT_BORDER: NO_BORDER) 
-                    | (std::isnan(upperLeft.value) ? UPPER_BORDER : NO_BORDER), true); 
+                    (std::isnan(lowerRight.value) ? RIGHT_BORDER: NO_BORDER)
+                    | (std::isnan(upperLeft.value) ? UPPER_BORDER : NO_BORDER), true);
     }
 
     Square lowerRightSquare() const
@@ -137,7 +138,7 @@ struct Square
                     center(), rightCenter(),
                     lowerCenter(), lowerRight,
                     (std::isnan(lowerLeft.value) ? LEFT_BORDER: NO_BORDER)
-                    | (std::isnan(upperRight.value) ? UPPER_BORDER : NO_BORDER), true); 
+                    | (std::isnan(upperRight.value) ? UPPER_BORDER : NO_BORDER), true);
     }
 
     Square upperRightSquare() const
@@ -147,20 +148,20 @@ struct Square
                     upperCenter(), upperRight,
                     center(), rightCenter(),
                     (std::isnan(lowerRight.value) ? LOWER_BORDER: NO_BORDER)
-                    | (std::isnan(upperLeft.value) ? LEFT_BORDER : NO_BORDER), true); 
-    } 
+                    | (std::isnan(upperLeft.value) ? LEFT_BORDER : NO_BORDER), true);
+    }
 
     double maxValue() const
     {
         assert(nanCount==0);
-        return std::max(std::max(upperLeft.value, upperRight.value), 
+        return std::max(std::max(upperLeft.value, upperRight.value),
                         std::max(lowerLeft.value, lowerRight.value));
     }
-        
+
     double minValue() const
     {
         assert(nanCount==0);
-        return std::min(std::min(upperLeft.value, upperRight.value), 
+        return std::min(std::min(upperLeft.value, upperRight.value),
                         std::min(lowerLeft.value, lowerRight.value));
     }
 
@@ -277,7 +278,7 @@ struct Square
                 // bitwise AND to test which borders we have on the square
                 if ( ( border & borders ) == 0 )
                     continue;
-                
+
                 // convention: for a level = L, store borders for the previous level up to
                 // (and including) L in the border of level "L".
                 // For fixed sets of level, this means there is an "Inf" slot for borders of the highest level
@@ -353,7 +354,7 @@ struct Square
 
     ValuedPoint center() const
     {
-        return ValuedPoint( 
+        return ValuedPoint(
                 .5*(upperLeft.x + lowerRight.x),
                 .5*(upperLeft.y + lowerRight.y),
                 (  (std::isnan(lowerLeft.value) ? 0 : lowerLeft.value)
@@ -365,39 +366,39 @@ struct Square
 
     ValuedPoint leftCenter() const
     {
-        return ValuedPoint( 
+        return ValuedPoint(
                 upperLeft.x,
-                .5*(upperLeft.y + lowerLeft.y), 
+                .5*(upperLeft.y + lowerLeft.y),
                 std::isnan(upperLeft.value)
                 ?  lowerLeft.value
                 : (std::isnan(lowerLeft.value) ? upperLeft.value : .5*(upperLeft.value + lowerLeft.value)));
     }
 
     ValuedPoint lowerCenter() const
     {
-        return ValuedPoint( 
+        return ValuedPoint(
                 .5*(lowerLeft.x + lowerRight.x),
-                lowerLeft.y, 
+                lowerLeft.y,
                 std::isnan(lowerRight.value)
                 ? lowerLeft.value
                 : (std::isnan(lowerLeft.value) ? lowerRight.value : .5*(lowerRight.value + lowerLeft.value)));
     }
 
     ValuedPoint rightCenter() const
     {
-        return ValuedPoint( 
+        return ValuedPoint(
                 upperRight.x,
-                .5*(upperRight.y + lowerRight.y), 
+                .5*(upperRight.y + lowerRight.y),
                 std::isnan(lowerRight.value)
                 ? upperRight.value
                 : (std::isnan(upperRight.value) ? lowerRight.value : .5*(lowerRight.value + upperRight.value)));
     }
 
     ValuedPoint upperCenter() const
     {
-        return ValuedPoint( 
+        return ValuedPoint(
                 .5*(upperLeft.x + upperRight.x),
-                upperLeft.y, 
+                upperLeft.y,
                 std::isnan(upperLeft.value)
                 ? upperRight.value
                 : (std::isnan(upperRight.value) ? upperLeft.value : .5*(upperLeft.value + upperRight.value)));
@@ -446,16 +447,16 @@ struct Square
         switch (border)
         {
             case LEFT_BORDER:
-                return Point(upperLeft.x, interpolate_(level, lowerLeft.y, upperLeft.y, 
+                return Point(upperLeft.x, interpolate_(level, lowerLeft.y, upperLeft.y,
                             lowerLeft.value, upperLeft.value, !split));
             case LOWER_BORDER:
-                return Point(interpolate_(level, lowerLeft.x, lowerRight.x, 
+                return Point(interpolate_(level, lowerLeft.x, lowerRight.x,
                             lowerLeft.value, lowerRight.value, !split), lowerLeft.y);
             case RIGHT_BORDER:
-                return Point(upperRight.x, interpolate_(level, lowerRight.y, upperRight.y, 
+                return Point(upperRight.x, interpolate_(level, lowerRight.y, upperRight.y,
                             lowerRight.value, upperRight.value, !split));
             case UPPER_BORDER:
-                return Point(interpolate_(level, upperLeft.x, upperRight.x, 
+                return Point(interpolate_(level, upperLeft.x, upperRight.x,
                             upperLeft.value, upperRight.value, !split), upperLeft.y);
         }
         assert(false);

diff --git a/apps/gdalinfo_lib.cpp b/apps/gdalinfo_lib.cpp
@@ -33,6 +33,7 @@
 #include "gdal_utils_priv.h"
 
 #include <cmath>
+#include <limits>
 #include <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>

diff --git a/autotest/cpp/test_cpl.cpp b/autotest/cpp/test_cpl.cpp
@@ -57,6 +57,7 @@
 #include "cpl_threadsafe_queue.hpp"
 
 #include <atomic>
+#include <limits>
 #include <fstream>
 #include <string>
 

diff --git a/frmts/adrg/srpdataset.cpp b/frmts/adrg/srpdataset.cpp
@@ -35,6 +35,7 @@
 
 #include <cstdlib>
 #include <algorithm>
+#include <limits>
 
 // Uncomment to recognize also .gen files in addition to .img files
 // #define OPEN_GEN

diff --git a/frmts/basisu_ktx2/common.cpp b/frmts/basisu_ktx2/common.cpp
@@ -30,6 +30,7 @@
 #include "common.h"
 #include "include_basisu_sdk.h"
 
+#include <algorithm>
 #include <mutex>
 
 /************************************************************************/

diff --git a/frmts/exr/exrdataset.cpp b/frmts/exr/exrdataset.cpp
@@ -29,6 +29,7 @@
 #include "ogr_spatialref.h"
 
 #include <algorithm>
+#include <limits>
 #include <mutex>
 
 #include "openexr_headers.h"

diff --git a/frmts/fit/fitdataset.cpp b/frmts/fit/fitdataset.cpp
@@ -35,7 +35,7 @@
 #include "cpl_safemaths.hpp"
 
 #include <algorithm>
-
+#include <limits>
 
 constexpr size_t FIT_PAGE_SIZE = 128;
 

diff --git a/frmts/grib/gribcreatecopy.cpp b/frmts/grib/gribcreatecopy.cpp
@@ -36,6 +36,7 @@
 #include "gdal_priv_templates.hpp"
 #include "memdataset.h"
 
+#include <algorithm>
 #include <limits>
 
 #include "degrib/degrib/meta.h"

diff --git a/frmts/gtiff/geotiff.cpp b/frmts/gtiff/geotiff.cpp
@@ -48,6 +48,7 @@
 #endif
 
 #include <algorithm>
+#include <limits>
 #include <map>
 #include <memory>
 #include <mutex>

diff --git a/frmts/hfa/hfadataset.cpp b/frmts/hfa/hfadataset.cpp
@@ -43,6 +43,7 @@
 #  include <fcntl.h>
 #endif
 #include <algorithm>
+#include <limits>
 #include <memory>
 #include <string>
 #include <vector>

diff --git a/frmts/jpeg/jpgdataset.cpp b/frmts/jpeg/jpgdataset.cpp
@@ -43,6 +43,7 @@
 #if HAVE_FCNTL_H
 #  include <fcntl.h>
 #endif
+#include <limits>
 #include <setjmp.h>
 
 #include <algorithm>

diff --git a/frmts/pdf/pdfcreatefromcomposition.cpp b/frmts/pdf/pdfcreatefromcomposition.cpp
@@ -30,6 +30,7 @@
 #include "gdal_pdf.h"
 #include "pdfcreatecopy.h"
 
+#include <algorithm>
 #include <cmath>
 #include <cstdlib>
 

diff --git a/frmts/raw/byndataset.cpp b/frmts/raw/byndataset.cpp
@@ -37,7 +37,7 @@
 #include "ogr_srs_api.h"
 
 #include <cstdlib>
-
+#include <limits>
 
 // Specification at
 // https://www.nrcan.gc.ca/sites/www.nrcan.gc.ca/files/earthsciences/pdf/gpshgrid_e.pdf

diff --git a/frmts/rdb/rdbdataset.cpp b/frmts/rdb/rdbdataset.cpp
@@ -31,6 +31,8 @@
 
 #include "rdbdataset.hpp"
 
+#include <algorithm>
+#include <limits>
 #include <cmath>
 #include <sstream>
 

diff --git a/frmts/rdb/rdbdataset.hpp b/frmts/rdb/rdbdataset.hpp
@@ -36,6 +36,7 @@
 #include <riegl/rdb.hpp>
 
 #include <algorithm>
+#include <limits>
 #include <memory>
 #include <mutex>
 #include <string>
@@ -147,4 +148,4 @@ class RDBRasterBand CPL_NON_FINAL: public GDALPamRasterBand
 }  // namespace rdb
 void GDALRegister_RDB();
 
-#endif  // RDB_DATASET_INCLUDED
+#endif  // RDB_DATASET_INCLUDED
diff --git a/frmts/rmf/rmfdataset.cpp b/frmts/rmf/rmfdataset.cpp
@@ -27,6 +27,7 @@
  * DEALINGS IN THE SOFTWARE.
  ****************************************************************************/
 #include <algorithm>
+#include <limits>
 
 #include "cpl_string.h"
 #include "gdal_frmts.h"

diff --git a/frmts/rmf/rmfdem.cpp b/frmts/rmf/rmfdem.cpp
@@ -31,6 +31,7 @@
 
 #include "rmfdataset.h"
 
+#include <limits>
 
 /*
  * The encoded data stream is a series of records.

diff --git a/frmts/sigdem/sigdemdataset.cpp b/frmts/sigdem/sigdemdataset.cpp
@@ -30,7 +30,7 @@
 #include "rawdataset.h"
 
 #include <algorithm>
-
+#include <limits>
 
 #ifdef CPL_IS_LSB
 #define SWAP_SIGDEM_HEADER(abyHeader) { \

diff --git a/frmts/wms/gdalwmsrasterband.cpp b/frmts/wms/gdalwmsrasterband.cpp
@@ -31,6 +31,7 @@
 
 #include "wmsdriver.h"
 
+#include <algorithm>
 
 GDALWMSRasterBand::GDALWMSRasterBand(GDALWMSDataset *parent_dataset, int band,
                                         double scale):

diff --git a/gcore/gdalmultidim.cpp b/gcore/gdalmultidim.cpp
@@ -30,6 +30,7 @@
 
 #include <assert.h>
 #include <algorithm>
+#include <limits>
 #include <queue>
 #include <set>
 

diff --git a/gcore/tilematrixset.cpp b/gcore/tilematrixset.cpp
@@ -31,6 +31,7 @@
 
 #include <cmath>
 #include <cfloat>
+#include <limits>
 
 #include "tilematrixset.hpp"