diff options
| author | Oliver Kuster | 2021-08-10 15:06:58 -0700 |
|---|---|---|
| committer | Oliver Kuster | 2021-08-10 15:06:58 -0700 |
| commit | 8c438b837b34ac2d5f46b9feb1ccfdae1bf1dd8d (patch) | |
| tree | 6b2b23bc34c899ba47072036e950a2e30c2de167 | |
| parent | 1fab4f8a2f85318ab4a118f5a2447b9f02c22f06 (diff) | |
| download | aur-8c438b837b34ac2d5f46b9feb1ccfdae1bf1dd8d.tar.gz | |
Removing jpeg2000-issue-vendor.patch
| -rw-r--r-- | jpeg2000-issue-vendor.patch | 50 |
1 files changed, 0 insertions, 50 deletions
diff --git a/jpeg2000-issue-vendor.patch b/jpeg2000-issue-vendor.patch deleted file mode 100644 index d44f5b686aa6..000000000000 --- a/jpeg2000-issue-vendor.patch +++ /dev/null @@ -1,50 +0,0 @@ -unchanged: ---- a/gdal/frmts/jpeg2000/jpeg2000dataset.cpp -+++ b/gdal/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<int>(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; -only in patch2: -unchanged: ---- a/gdal/frmts/jpeg2000/jpeg2000_vsil_io.cpp -+++ b/gdal/frmts/jpeg2000/jpeg2000_vsil_io.cpp -@@ -94,13 +94,23 @@ typedef struct { - * File stream object. - \******************************************************************************/ - -+// PRIjas_seqent macro is defined since Jasper 2.0.17 -+ -+#ifndef PRIjas_seqent - static int JPEG2000_VSIL_read(jas_stream_obj_t *obj, char *buf, int cnt) -+#else -+static int JPEG2000_VSIL_read(jas_stream_obj_t *obj, char *buf, unsigned cnt) -+#endif - { - jas_stream_VSIFL_t *fileobj = JAS_CAST(jas_stream_VSIFL_t *, obj); - return static_cast<int>(VSIFReadL(buf, 1, cnt, fileobj->fp)); - } - -+#ifndef PRIjas_seqent --static int JPEG2000_VSIL_write(jas_stream_obj_t *obj, char *buf, int cnt) -+static int JPEG2000_VSIL_write(jas_stream_obj_t *obj, const char *buf, int cnt) -+#else -+static int JPEG2000_VSIL_write(jas_stream_obj_t *obj, const char *buf, unsigned int cnt) -+#endif - { - jas_stream_VSIFL_t *fileobj = JAS_CAST(jas_stream_VSIFL_t *, obj); - return static_cast<int>(VSIFWriteL(buf, 1, cnt, fileobj->fp)); |