update GDAL to 3.8.3 (#131)

CHANGELOG.md

@@ -5,6 +5,12 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [3.8.3] 2024-01-09
+
+### Added
+ - GDAL 3.8.3
+
+
 ## [3.8.2] 2024-01-08
 
 ### Added

deps/libgdal.sh

@@ -5,7 +5,7 @@ set -eu
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 cd "$DIR/libgdal"
 
-GDAL_VERSION=3.8.2
+GDAL_VERSION=3.8.3
 GDAL_VERSION_SUFFIX=
 dir_gdal=./gdal
 dir_formats_gyp=./gyp-formats

deps/libgdal/gdal/CITATION

@@ -1,6 +1,6 @@
 To cite GDAL/OGR in publications use:
 
- GDAL/OGR contributors (2023). GDAL/OGR Geospatial Data Abstraction
+ GDAL/OGR contributors (2024). GDAL/OGR Geospatial Data Abstraction
  software Library. Open Source Geospatial Foundation. URL https://gdal.org
  DOI: 10.5281/zenodo.5884351
 
@@ -10,7 +10,7 @@ A BibTeX entry for LaTeX users is
  title = {{GDAL/OGR} Geospatial Data Abstraction software Library},
  author = {{GDAL/OGR contributors}},
  organization = {Open Source Geospatial Foundation},
- year = {2023},
+ year = {2024},
  url = {https://gdal.org},
  doi = {10.5281/zenodo.5884351},
  }

deps/libgdal/gdal/CITATION.cff

@@ -2,8 +2,8 @@ cff-version: 1.2.0
 message: Please cite this software using these metadata or in the CITATION file.
 type: software
 title: GDAL
-version: 3.8.2
-date-released: 2023-12-16
+version: 3.8.3
+date-released: 2024-01-02
 doi: 10.5281/zenodo.5884351
 abstract: GDAL is a translator library for raster and vector geospatial data
  formats that is released under an MIT style Open Source License by the Open

deps/libgdal/gdal/VERSION

@@ -1 +1 @@
-3.8.2
+3.8.3

deps/libgdal/gdal/apps/gdal2ogr.c

@@ -104,7 +104,7 @@ int main(int argc, char *argv[])
  /* -------------------------------------------------------------------- */
  for (i = 1; i < argc; i++)
  {
- if (EQUAL(argv[i], "--help")
+ if (EQUAL(argv[i], "--help"))
  Usage();
  else if (EQUAL(argv[i], "-b") && i < argc - 1)
  iBand = atoi(argv[++i]);

deps/libgdal/gdal/apps/gdalbuildvrt_lib.cpp

@@ -1088,7 +1088,9 @@ void VRTBuilder::CreateVRTSeparate(VRTDatasetH hVRTDS)
  }
 
  VRTSimpleSource *poSimpleSource;
- if (bAllowSrcNoData)
+ if (bAllowSrcNoData &&
+ (nSrcNoDataCount > 0 ||
+ psDatasetProperties->abHasNoData[nSrcBandIdx]))
  {
  auto poComplexSource = new VRTComplexSource();
  poSimpleSource = poComplexSource;
@@ -1101,7 +1103,7 @@ void VRTBuilder::CreateVRTSeparate(VRTDatasetH hVRTDS)
  poComplexSource->SetNoDataValue(
  padfSrcNoData[nSrcNoDataCount - 1]);
  }
- else if (psDatasetProperties->abHasNoData[nSrcBandIdx])
+ else /* if (psDatasetProperties->abHasNoData[nSrcBandIdx]) */
  {
  poComplexSource->SetNoDataValue(
  psDatasetProperties->adfNoDataValues[nSrcBandIdx]);

deps/libgdal/gdal/apps/ogr2ogr_lib.cpp

@@ -3860,6 +3860,8 @@ bool SetupTargetLayer::CanUseWriteArrowBatch(
  CPLTestBool(CPLGetConfigOption("OGR2OGR_USE_ARROW_API", "YES"))) ||
  CPLTestBool(CPLGetConfigOption("OGR2OGR_USE_ARROW_API", "NO"))) &&
  !psOptions->bSkipFailures && !psOptions->bTransform &&
+ !psOptions->poClipSrc && !psOptions->poClipDst &&
+ psOptions->oGCPs.nGCPCount == 0 && !psOptions->bWrapDateline &&
  !m_papszSelFields && !m_bAddMissingFields &&
  m_eGType == GEOMTYPE_UNCHANGED && psOptions->eGeomOp == GEOMOP_NONE &&
  m_eGeomTypeConversion == GTC_DEFAULT && m_nCoordDim < 0 &&

deps/libgdal/gdal/cmake/helpers/configure.cmake

@@ -144,6 +144,12 @@ else ()
  check_function_exists(getrlimit HAVE_GETRLIMIT)
  check_symbol_exists(RLIMIT_AS "sys/resource.h" HAVE_RLIMIT_AS)
 
+ # For internal libjson-c
+ check_include_file(sys/random.h HAVE_SYS_RANDOM_H)
+ if (HAVE_SYS_RANDOM_H)
+ check_symbol_exists(getrandom "sys/random.h" HAVE_GETRANDOM)
+ endif()
+
  check_function_exists(ftell64 HAVE_FTELL64)
  if (HAVE_FTELL64)
  set(VSI_FTELL64 "ftell64")

deps/libgdal/gdal/frmts/vrt/vrtderivedrasterband.cpp

@@ -908,7 +908,7 @@ CPLErr VRTDerivedRasterBand::IRasterIO(
  (!m_bNoDataValueSet || m_dfNoDataValue == 0))
  {
  memset(pData, 0,
- static_cast<size_t>(nBufXSize * nBufYSize * nPixelSpace));
+ static_cast<size_t>(nBufXSize) * nBufYSize * nBufTypeSize);
  }
  else if (m_bNoDataValueSet)
  {
@@ -1136,23 +1136,28 @@ CPLErr VRTDerivedRasterBand::IRasterIO(
  (nYShiftInBuffer * nExtBufXSize + nXShiftInBuffer) *
  nSrcTypeSize,
  nExtBufXSizeReq, nExtBufYSizeReq, eSrcType, nSrcTypeSize,
- nSrcTypeSize * nExtBufXSize, &sExtraArg);
+ static_cast<GSpacing>(nSrcTypeSize) * nExtBufXSize,
+ &sExtraArg);
 
  // Extend first lines
  for (int iY = 0; iY < nYShiftInBuffer; iY++)
  {
- memcpy(pabyBuffer + iY * nExtBufXSize * nSrcTypeSize,
- pabyBuffer + nYShiftInBuffer * nExtBufXSize * nSrcTypeSize,
- nExtBufXSize * nSrcTypeSize);
+ memcpy(pabyBuffer +
+ static_cast<size_t>(iY) * nExtBufXSize * nSrcTypeSize,
+ pabyBuffer + static_cast<size_t>(nYShiftInBuffer) *
+ nExtBufXSize * nSrcTypeSize,
+ static_cast<size_t>(nExtBufXSize) * nSrcTypeSize);
  }
  // Extend last lines
  for (int iY = nYShiftInBuffer + nExtBufYSizeReq; iY < nExtBufYSize;
  iY++)
  {
- memcpy(pabyBuffer + iY * nExtBufXSize * nSrcTypeSize,
- pabyBuffer + (nYShiftInBuffer + nExtBufYSizeReq - 1) *
+ memcpy(pabyBuffer +
+ static_cast<size_t>(iY) * nExtBufXSize * nSrcTypeSize,
+ pabyBuffer + static_cast<size_t>(nYShiftInBuffer +
+ nExtBufYSizeReq - 1) *
  nExtBufXSize * nSrcTypeSize,
- nExtBufXSize * nSrcTypeSize);
+ static_cast<size_t>(nExtBufXSize) * nSrcTypeSize);
  }
  // Extend first cols
  if (nXShiftInBuffer)
@@ -1161,9 +1166,13 @@ CPLErr VRTDerivedRasterBand::IRasterIO(
  {
  for (int iX = 0; iX < nXShiftInBuffer; iX++)
  {
- memcpy(pabyBuffer + (iY * nExtBufXSize + iX) * nSrcTypeSize,
- pabyBuffer + (iY * nExtBufXSize + nXShiftInBuffer) *
- nSrcTypeSize,
+ memcpy(pabyBuffer +
+ static_cast<size_t>(iY * nExtBufXSize + iX) *
+ nSrcTypeSize,
+ pabyBuffer +
+ (static_cast<size_t>(iY) * nExtBufXSize +
+ nXShiftInBuffer) *
+ nSrcTypeSize,
  nSrcTypeSize);
  }
  }
@@ -1176,10 +1185,13 @@ CPLErr VRTDerivedRasterBand::IRasterIO(
  for (int iX = nXShiftInBuffer + nExtBufXSizeReq;
  iX < nExtBufXSize; iX++)
  {
- memcpy(pabyBuffer + (iY * nExtBufXSize + iX) * nSrcTypeSize,
- pabyBuffer + (iY * nExtBufXSize + nXShiftInBuffer +
- nExtBufXSizeReq - 1) *
- nSrcTypeSize,
+ memcpy(pabyBuffer +
+ (static_cast<size_t>(iY) * nExtBufXSize + iX) *
+ nSrcTypeSize,
+ pabyBuffer +
+ (static_cast<size_t>(iY) * nExtBufXSize +
+ nXShiftInBuffer + nExtBufXSizeReq - 1) *
+ nSrcTypeSize,
  nSrcTypeSize);
  }
  }

deps/libgdal/gdal/frmts/zlib/contrib/infback9/infback9.c

@@ -8,6 +8,7 @@
 #include "inftree9.h"
 #include "inflate9.h"
 #include <assert.h>
+#include <string.h>
 
 #undef ZEXPORT
 #define ZEXPORT
@@ -357,7 +358,7 @@ int ZEXPORT inflateBack9(z_stream FAR *strm, in_func in, void FAR *in_desc, out_
  ROOM();
  if (copy > have) copy = have;
  if (copy > left) copy = left;
- zmemcpy(put, next, copy);
+ zmemcpy(put, next, (unsigned)copy);
  have -= copy;
  next += copy;
  left -= copy;

deps/libgdal/gdal/frmts/zlib/contrib/infback9/minified_zutil.c

@@ -7,11 +7,7 @@
 
 #include "minified_zutil.h"
 
-#ifndef STDC
-extern voidp malloc OF((uInt size));
-extern voidp calloc OF((uInt items, uInt size));
-extern void free OF((voidpf ptr));
-#endif
+#include <stdlib.h>
 
 voidpf ZLIB_INTERNAL zcalloc(voidpf opaque, unsigned items, unsigned size)
 {

deps/libgdal/gdal/frmts/zlib/contrib/infback9/minified_zutil.h

@@ -27,7 +27,7 @@
 #define OF(args) args
 #endif
 
-#if defined(STDC) && !defined(Z_SOLO)
+#if !defined(Z_SOLO)
 # if !(defined(_WIN32_WCE) && defined(_MSC_VER))
 # include <stddef.h>
 # endif
@@ -48,7 +48,7 @@ typedef unsigned short ush;
 typedef ush FAR ushf;
 typedef unsigned long ulg;
 
-#if !defined(Z_U8) && !defined(Z_SOLO) && defined(STDC)
+#if !defined(Z_U8) && !defined(Z_SOLO)
 # include <limits.h>
 # if (ULONG_MAX == 0xffffffffffffffff)
 # define Z_U8 unsigned long
@@ -213,35 +213,9 @@ extern z_const char * const z_errmsg[10]; /* indexed by 2-zlib_error */
 #endif
 
  /* functions */
-
-#if defined(pyr) || defined(Z_SOLO)
-# define NO_MEMCPY
-#endif
-#if defined(SMALL_MEDIUM) && !defined(_MSC_VER) && !defined(__SC__)
- /* Use our own functions for small and medium model with MSC <= 5.0.
- * You may have to use the same strategy for Borland C (untested).
- * The __SC__ check is for Symantec.
- */
-# define NO_MEMCPY
-#endif
-#if defined(STDC) && !defined(HAVE_MEMCPY) && !defined(NO_MEMCPY)
-# define HAVE_MEMCPY
-#endif
-#ifdef HAVE_MEMCPY
-# ifdef SMALL_MEDIUM /* MSDOS small or medium model */
-# define zmemcpy _fmemcpy
-# define zmemcmp _fmemcmp
-# define zmemzero(dest, len) _fmemset(dest, 0, len)
-# else
 # define zmemcpy memcpy
 # define zmemcmp memcmp
 # define zmemzero(dest, len) memset(dest, 0, len)
-# endif
-#else
- void ZLIB_INTERNAL zmemcpy OF((Bytef* dest, const Bytef* source, uInt len));
- int ZLIB_INTERNAL zmemcmp OF((const Bytef* s1, const Bytef* s2, uInt len));
- void ZLIB_INTERNAL zmemzero OF((Bytef* dest, uInt len));
-#endif
 
 /* Diagnostic functions */
 #ifdef ZLIB_DEBUG

deps/libgdal/gdal/gcore/gdal_version.h

@@ -7,7 +7,7 @@
 #ifndef GDAL_VERSION_MAJOR
 # define GDAL_VERSION_MAJOR 3
 # define GDAL_VERSION_MINOR 8
-# define GDAL_VERSION_REV 2
+# define GDAL_VERSION_REV 3
 # define GDAL_VERSION_BUILD 0
 #endif
 
@@ -24,9 +24,9 @@
 
 #if !defined(DO_NOT_DEFINE_GDAL_DATE_NAME)
 #ifndef GDAL_RELEASE_DATE
-# define GDAL_RELEASE_DATE 20231612
+# define GDAL_RELEASE_DATE 20240104
 #endif
 #ifndef GDAL_RELEASE_NAME
-# define GDAL_RELEASE_NAME "3.8.2"
+# define GDAL_RELEASE_NAME "3.8.3"
 #endif
 #endif

deps/libgdal/gdal/gcore/gdal_version_full/gdal_version.h

@@ -7,7 +7,7 @@
 #ifndef GDAL_VERSION_MAJOR
 # define GDAL_VERSION_MAJOR 3
 # define GDAL_VERSION_MINOR 8
-# define GDAL_VERSION_REV 2
+# define GDAL_VERSION_REV 3
 # define GDAL_VERSION_BUILD 0
 #endif
 
@@ -24,9 +24,9 @@
 
 #if !defined(DO_NOT_DEFINE_GDAL_DATE_NAME)
 #ifndef GDAL_RELEASE_DATE
-# define GDAL_RELEASE_DATE 20231612
+# define GDAL_RELEASE_DATE 20240104
 #endif
 #ifndef GDAL_RELEASE_NAME
-# define GDAL_RELEASE_NAME "3.8.2"
+# define GDAL_RELEASE_NAME "3.8.3"
 #endif
 #endif