Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[pull] master from OSGeo:master #109

Merged
merged 3 commits into from
Dec 6, 2024
Merged

[pull] master from OSGeo:master #109

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b37cb29
Docker: update Alpine based images to 3.21
rouault Dec 6, 2024
b44a419
KEA: use native chunksize for copying RAT (#11443)
gillins Dec 6, 2024
3c5232b
Merge pull request #11444 from rouault/docker_alpine_3_21
rouault Dec 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions docker/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion docker/alpine-normal/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
# Public domain
# or licensed under MIT (LICENSE.TXT) Copyright 2019 Even Rouault <[email protected]>

ARG ALPINE_VERSION=3.20
ARG ALPINE_VERSION=3.21
FROM alpine:${ALPINE_VERSION} AS builder

# Derived from osgeo/proj by Howard Butler <[email protected]>
Expand Down
2 changes: 1 addition & 1 deletion docker/alpine-small/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
# Public domain
# or licensed under MIT (LICENSE.TXT) Copyright 2019 Even Rouault <[email protected]>

ARG ALPINE_VERSION=3.20
ARG ALPINE_VERSION=3.21
FROM alpine:${ALPINE_VERSION} AS builder

# Derived from osgeo/proj by Howard Butler <[email protected]>
Expand Down
12 changes: 5 additions & 7 deletions frmts/kea/keacopy.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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;
Expand Down
Loading