1 From 3c5cb6266a01a607ee7560807465bc833240d793 Mon Sep 17 00:00:00 2001
2 From: Even Rouault <even.rouault@spatialys.com>
3 Date: Mon, 10 Aug 2020 17:26:53 +0200
4 Subject: [PATCH] JPEG2000: fix build with Jasper 2.0.17 (fixes #2844)
7 gdal/frmts/jpeg2000/jpeg2000dataset.cpp | 4 ++--
8 1 file changed, 2 insertions(+), 2 deletions(-)
10 diff --git a/gdal/frmts/jpeg2000/jpeg2000dataset.cpp b/gdal/frmts/jpeg2000/jpeg2000dataset.cpp
11 index 3e668ffe503..2d3f4e46876 100644
12 --- a/gdal/frmts/jpeg2000/jpeg2000dataset.cpp
13 +++ b/gdal/frmts/jpeg2000/jpeg2000dataset.cpp
14 @@ -484,7 +484,7 @@ int JPEG2000Dataset::DecodeImage()
15 /* the JP2 boxes match the ones of the code stream */
18 - if (nBands != jas_image_numcmpts( psImage ))
19 + if (nBands != static_cast<int>(jas_image_numcmpts( psImage )))
21 CPLError(CE_Failure, CPLE_AppDefined,
22 "The number of components indicated in the IHDR box (%d) mismatch "
23 @@ -595,7 +595,7 @@ GDALDataset *JPEG2000Dataset::Open( GDALOpenInfo * poOpenInfo )
27 - char *pszFormatName = nullptr;
28 + const char *pszFormatName = nullptr;
30 if (!Identify(poOpenInfo))
32 From e236eeaed1be45a4af457565085e3db1f2fc489f Mon Sep 17 00:00:00 2001
33 From: Even Rouault <even.rouault@spatialys.com>
34 Date: Tue, 11 Aug 2020 09:26:41 +0200
35 Subject: [PATCH] JPEG2000: follow-up fix to build with Jasper 2.0.17 (fixes
39 gdal/frmts/jpeg2000/jpeg2000_vsil_io.cpp | 10 ++++++++++
40 1 file changed, 10 insertions(+)
42 diff --git a/gdal/frmts/jpeg2000/jpeg2000_vsil_io.cpp b/gdal/frmts/jpeg2000/jpeg2000_vsil_io.cpp
43 index e780d2bcaed..10a4f96f0ee 100644
44 --- a/gdal/frmts/jpeg2000/jpeg2000_vsil_io.cpp
45 +++ b/gdal/frmts/jpeg2000/jpeg2000_vsil_io.cpp
46 @@ -94,13 +94,23 @@ typedef struct {
48 \******************************************************************************/
50 +// PRIjas_seqent macro is defined since Jasper 2.0.17
52 +#ifndef PRIjas_seqent
53 static int JPEG2000_VSIL_read(jas_stream_obj_t *obj, char *buf, int cnt)
55 +static int JPEG2000_VSIL_read(jas_stream_obj_t *obj, char *buf, unsigned cnt)
58 jas_stream_VSIFL_t *fileobj = JAS_CAST(jas_stream_VSIFL_t *, obj);
59 return static_cast<int>(VSIFReadL(buf, 1, cnt, fileobj->fp));
62 +#ifndef PRIjas_seqent
63 static int JPEG2000_VSIL_write(jas_stream_obj_t *obj, char *buf, int cnt)
65 +static int JPEG2000_VSIL_write(jas_stream_obj_t *obj, char *buf, unsigned int cnt)
68 jas_stream_VSIFL_t *fileobj = JAS_CAST(jas_stream_VSIFL_t *, obj);
69 return static_cast<int>(VSIFWriteL(buf, 1, cnt, fileobj->fp));