From 2cda22f97ac37007c3fb90d3ef454ed4b5818cca Mon Sep 17 00:00:00 2001 From: Duncaen Date: Sat, 6 Mar 2021 01:01:44 +0100 Subject: [PATCH] libgdal: add another patch --- ...c4893e6d14d488dfed25745d79f11bee45b9.patch | 31 +++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 srcpkgs/libgdal/patches/ab72c4893e6d14d488dfed25745d79f11bee45b9.patch diff --git a/srcpkgs/libgdal/patches/ab72c4893e6d14d488dfed25745d79f11bee45b9.patch b/srcpkgs/libgdal/patches/ab72c4893e6d14d488dfed25745d79f11bee45b9.patch new file mode 100644 index 00000000000..40d0b4ec529 --- /dev/null +++ b/srcpkgs/libgdal/patches/ab72c4893e6d14d488dfed25745d79f11bee45b9.patch @@ -0,0 +1,31 @@ +From ab72c4893e6d14d488dfed25745d79f11bee45b9 Mon Sep 17 00:00:00 2001 +From: Even Rouault +Date: Mon, 10 Aug 2020 17:26:53 +0200 +Subject: [PATCH] JPEG2000: fix build with Jasper 2.0.17 (fixes #2844) + +--- + gdal/frmts/jpeg2000/jpeg2000dataset.cpp | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/gdal/frmts/jpeg2000/jpeg2000dataset.cpp b/gdal/frmts/jpeg2000/jpeg2000dataset.cpp +index 3e668ffe503..2d3f4e46876 100644 +--- frmts/jpeg2000/jpeg2000dataset.cpp ++++ frmts/jpeg2000/jpeg2000dataset.cpp +@@ -484,7 +484,7 @@ int JPEG2000Dataset::DecodeImage() + /* the JP2 boxes match the ones of the code stream */ + if (nBands != 0) + { +- if (nBands != jas_image_numcmpts( psImage )) ++ if (nBands != static_cast(jas_image_numcmpts( psImage ))) + { + CPLError(CE_Failure, CPLE_AppDefined, + "The number of components indicated in the IHDR box (%d) mismatch " +@@ -595,7 +595,7 @@ GDALDataset *JPEG2000Dataset::Open( GDALOpenInfo * poOpenInfo ) + + { + int iFormat; +- char *pszFormatName = nullptr; ++ const char *pszFormatName = nullptr; + + if (!Identify(poOpenInfo)) + return nullptr;