From 139e891b9b4a7b928c66e3daef83361fa530e6ac Mon Sep 17 00:00:00 2001 From: Even Rouault Date: Mon, 20 May 2024 17:17:12 +0200 Subject: [PATCH 1/5] GDALCopyWords(): adjust documentation --- gcore/rasterio.cpp | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/gcore/rasterio.cpp b/gcore/rasterio.cpp index a7049681eac1..bafbee5b2b0a 100644 --- a/gcore/rasterio.cpp +++ b/gcore/rasterio.cpp @@ -3270,15 +3270,27 @@ void CPL_STDCALL GDALCopyWords(const void *CPL_RESTRICT pSrcData, * * This function is used to copy pixel word values from one memory buffer * to another, with support for conversion between data types, and differing - * step factors. The data type conversion is done using the normal GDAL - * rules. Values assigned to a lower range integer type are clipped. For + * step factors. The data type conversion is done using the following + * rules: + * * * No assumptions are made about the source or destination words occurring * on word boundaries. It is assumed that all values are in native machine From 7f4b42bdda194ba0fab2ee7c9f111022554c197a Mon Sep 17 00:00:00 2001 From: Even Rouault Date: Mon, 20 May 2024 17:23:50 +0200 Subject: [PATCH 2/5] Link RasterIO() doc to GDALCopyWords64() --- gcore/gdaldataset.cpp | 3 ++- gcore/gdalrasterband.cpp | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/gcore/gdaldataset.cpp b/gcore/gdaldataset.cpp index 37b3bf02692e..b7c69334e986 100644 --- a/gcore/gdaldataset.cpp +++ b/gcore/gdaldataset.cpp @@ -2656,7 +2656,8 @@ CPLErr GDALDataset::ValidateRasterIOOrAdviseReadParameters( * * @param eBufType the type of the pixel values in the pData data buffer. The * pixel values will automatically be translated to/from the GDALRasterBand - * data type as needed. + * data type as needed. Most driver implementations will use GDALCopyWords64() + * to perform data type translation. * * @param nBandCount the number of bands being read or written. * diff --git a/gcore/gdalrasterband.cpp b/gcore/gdalrasterband.cpp index d9303bfe9a74..d971f38f8dac 100644 --- a/gcore/gdalrasterband.cpp +++ b/gcore/gdalrasterband.cpp @@ -199,7 +199,8 @@ GDALRasterBand::~GDALRasterBand() * * @param eBufType the type of the pixel values in the pData data buffer. The * pixel values will automatically be translated to/from the GDALRasterBand - * data type as needed. + * data type as needed. Most driver implementations will use GDALCopyWords64() + * to perform data type translation. * * @param nPixelSpace The byte offset from the start of one pixel value in * pData to the start of the next pixel value within a scanline. If defaulted From f2434e7ea5b6ec2fa100dbe8f54a881a904ee247 Mon Sep 17 00:00:00 2001 From: AbelPau Date: Mon, 20 May 2024 18:06:23 +0200 Subject: [PATCH 3/5] Fixing chromium bug 68809 correctly When first feature fails, the creation of the table MMDB has to be destroyed --- ogr/ogrsf_frmts/miramon/mm_wrlayr.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/ogr/ogrsf_frmts/miramon/mm_wrlayr.c b/ogr/ogrsf_frmts/miramon/mm_wrlayr.c index c0d30b761513..51899ba919cf 100644 --- a/ogr/ogrsf_frmts/miramon/mm_wrlayr.c +++ b/ogr/ogrsf_frmts/miramon/mm_wrlayr.c @@ -4409,7 +4409,10 @@ static int MMCreateRecordDBF(struct MiraMonVectLayerInfo *hMiraMonLayer, if (hMiraMonLayer->TopHeader.nElemCount == 0) { if (MMCreateMMDB(hMiraMonLayer, nullptr)) + { + MMDestroyMMDB(hMiraMonLayer); return MM_FATAL_ERROR_WRITING_FEATURES; + } } result = MMAddDBFRecordToMMDB(hMiraMonLayer, hMMFeature); From 1000cfaa950a18bd14b0c72109439cad58c789d5 Mon Sep 17 00:00:00 2001 From: Even Rouault Date: Mon, 20 May 2024 18:56:44 +0200 Subject: [PATCH 4/5] CI: fix Conda builds --- ci/travis/conda/setup.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/ci/travis/conda/setup.sh b/ci/travis/conda/setup.sh index c3bc9ca1491a..b4cd637babee 100755 --- a/ci/travis/conda/setup.sh +++ b/ci/travis/conda/setup.sh @@ -6,6 +6,9 @@ conda config --show-sources rm -f ~/.condarc +# Cf https://github.com/conda-forge/gdal-feedstock/pull/939 +conda config --add channels conda-forge/label/numpy_rc + conda config --show-sources conda config --show From d83bcce76c2ee750184359141ecf695e3b91798f Mon Sep 17 00:00:00 2001 From: Even Rouault Date: Mon, 20 May 2024 22:22:40 +0200 Subject: [PATCH 5/5] CI: workaround issue with latest version of coverallsapp/coverage-reporter --- .github/workflows/linux_build.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/linux_build.yml b/.github/workflows/linux_build.yml index 921aca5540f7..73a61732709c 100644 --- a/.github/workflows/linux_build.yml +++ b/.github/workflows/linux_build.yml @@ -338,11 +338,13 @@ jobs: ${TEST_CMD} - name: Coveralls - uses: coverallsapp/github-action@3dfc5567390f6fa9267c0ee9c251e4c8c3f18949 # v2.2.3 + uses: coverallsapp/github-action@643bc377ffa44ace6394b2b5d0d3950076de9f63 # v2.3.0 if: ${{ matrix.id == 'coverage' }} with: format: lcov file: build-coverage/gdal_filtered.info + # Pin to v0.6.10 because of issue with v0.6.11 (https://github.com/coverallsapp/coverage-reporter/issues/127) + coverage-reporter-version: v0.6.10 - name: Push build environment if: github.event_name == 'push'