From b37cb299b73b694c1e690f3700312c2860b0dbd6 Mon Sep 17 00:00:00 2001 From: Even Rouault Date: Fri, 6 Dec 2024 02:57:40 +0100 Subject: [PATCH 1/2] Docker: update Alpine based images to 3.21 --- docker/README.md | 1 + docker/alpine-normal/Dockerfile | 2 +- docker/alpine-small/Dockerfile | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/docker/README.md b/docker/README.md index ff8835e0b8c8..81bf0802130e 100644 --- a/docker/README.md +++ b/docker/README.md @@ -10,6 +10,7 @@ best of our knowledge and not guaranteed. Users should check by themselves. # Alpine based Alpine version: +* 3.21 for GDAL 3.11 * 3.20 for GDAL 3.10 * 3.19 for GDAL 3.9 * 3.18 for GDAL 3.8 diff --git a/docker/alpine-normal/Dockerfile b/docker/alpine-normal/Dockerfile index b68d001eef16..03f8852c11b9 100644 --- a/docker/alpine-normal/Dockerfile +++ b/docker/alpine-normal/Dockerfile @@ -7,7 +7,7 @@ # Public domain # or licensed under MIT (LICENSE.TXT) Copyright 2019 Even Rouault -ARG ALPINE_VERSION=3.20 +ARG ALPINE_VERSION=3.21 FROM alpine:${ALPINE_VERSION} AS builder # Derived from osgeo/proj by Howard Butler diff --git a/docker/alpine-small/Dockerfile b/docker/alpine-small/Dockerfile index 1a19574efb44..1add1c3d1c01 100644 --- a/docker/alpine-small/Dockerfile +++ b/docker/alpine-small/Dockerfile @@ -7,7 +7,7 @@ # Public domain # or licensed under MIT (LICENSE.TXT) Copyright 2019 Even Rouault -ARG ALPINE_VERSION=3.20 +ARG ALPINE_VERSION=3.21 FROM alpine:${ALPINE_VERSION} AS builder # Derived from osgeo/proj by Howard Butler From b44a419a392103fd020d6cbec3d85b17d7c05562 Mon Sep 17 00:00:00 2001 From: Sam Gillingham Date: Fri, 6 Dec 2024 16:04:16 +1300 Subject: [PATCH 2/2] KEA: use native chunksize for copying RAT (#11443) Changes the chunksize used for copying the RAT to be the default native HDF5 chunksize (10000) rather and 1000. This should improve performance while copying to a KEA file. --- frmts/kea/keacopy.cpp | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/frmts/kea/keacopy.cpp b/frmts/kea/keacopy.cpp index bab8945a14d5..d69368f2ed5d 100644 --- a/frmts/kea/keacopy.cpp +++ b/frmts/kea/keacopy.cpp @@ -111,8 +111,6 @@ static bool KEACopyRasterData(GDALRasterBand *pBand, return true; } -constexpr int RAT_CHUNKSIZE = 1000; - // copies the raster attribute table static void KEACopyRAT(GDALRasterBand *pBand, kealib::KEAImageIO *pImageIO, int nBand) @@ -233,12 +231,12 @@ static void KEACopyRAT(GDALRasterBand *pBand, kealib::KEAImageIO *pImageIO, int numRows = gdalAtt->GetRowCount(); keaAtt->addRows(numRows); - int *pnIntBuffer = new int[RAT_CHUNKSIZE]; - int64_t *pnInt64Buffer = new int64_t[RAT_CHUNKSIZE]; - double *pfDoubleBuffer = new double[RAT_CHUNKSIZE]; - for (int ni = 0; ni < numRows; ni += RAT_CHUNKSIZE) + int *pnIntBuffer = new int[kealib::KEA_ATT_CHUNK_SIZE]; + int64_t *pnInt64Buffer = new int64_t[kealib::KEA_ATT_CHUNK_SIZE]; + double *pfDoubleBuffer = new double[kealib::KEA_ATT_CHUNK_SIZE]; + for (int ni = 0; ni < numRows; ni += kealib::KEA_ATT_CHUNK_SIZE) { - int nLength = RAT_CHUNKSIZE; + int nLength = kealib::KEA_ATT_CHUNK_SIZE; if ((ni + nLength) > numRows) { nLength = numRows - ni;