rpms
/
gdal
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Add gdal_jasper.patch

This commit is contained in:
Sandro Mani 2020-07-22 15:15:22 +02:00
parent 84d61b00f4
commit ddfbc54eb4
2 changed files with 33 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gdal.spec
View File

@ -74,6 +74,8 @@ Patch5: gdal_sphinx.patch
Patch6: gdal_installapps.patch
# Don't refer to PDF manual which is not built
Patch7: gdal_nopdf.patch
# Adapt to jasper 2.0.17
Patch8: gdal_jasper.patch
BuildRequires: gcc
BuildRequires: gcc-c++

31
gdal_jasper.patch Normal file
View File

@ -0,0 +1,31 @@
diff -rupN gdal-3.1.2-fedora/frmts/jpeg2000/jpeg2000dataset.cpp gdal-3.1.2-fedora-new/frmts/jpeg2000/jpeg2000dataset.cpp
--- gdal-3.1.2-fedora/frmts/jpeg2000/jpeg2000dataset.cpp 2020-07-07 13:46:27.000000000 +0200
+++ gdal-3.1.2-fedora-new/frmts/jpeg2000/jpeg2000dataset.cpp 2020-07-22 12:26:50.419482813 +0200
@@ -595,7 +595,7 @@ GDALDataset *JPEG2000Dataset::Open( GDAL
{
int iFormat;
- char *pszFormatName = nullptr;
+ const char *pszFormatName = nullptr;
if (!Identify(poOpenInfo))
return nullptr;
diff -rupN gdal-3.1.2-fedora/frmts/jpeg2000/jpeg2000_vsil_io.cpp gdal-3.1.2-fedora-new/frmts/jpeg2000/jpeg2000_vsil_io.cpp
--- gdal-3.1.2-fedora/frmts/jpeg2000/jpeg2000_vsil_io.cpp 2020-07-07 13:46:27.000000000 +0200
+++ gdal-3.1.2-fedora-new/frmts/jpeg2000/jpeg2000_vsil_io.cpp 2020-07-22 13:29:02.017426423 +0200
@@ -94,13 +94,13 @@ typedef struct {
* File stream object.
\******************************************************************************/
-static int JPEG2000_VSIL_read(jas_stream_obj_t *obj, char *buf, int cnt)
+static int JPEG2000_VSIL_read(jas_stream_obj_t *obj, char *buf, unsigned int cnt)
{
jas_stream_VSIFL_t *fileobj = JAS_CAST(jas_stream_VSIFL_t *, obj);
return static_cast<int>(VSIFReadL(buf, 1, cnt, fileobj->fp));
}
-static int JPEG2000_VSIL_write(jas_stream_obj_t *obj, char *buf, int cnt)
+static int JPEG2000_VSIL_write(jas_stream_obj_t *obj, char *buf, unsigned int cnt)
{
jas_stream_VSIFL_t *fileobj = JAS_CAST(jas_stream_VSIFL_t *, obj);
return static_cast<int>(VSIFWriteL(buf, 1, cnt, fileobj->fp));