861ac185a6
```sh
git grep -l '^patch_args=-Np0' "srcpkgs/$1*/template" |
while read template; do
for p in ${template%/template}/patches/*; do
sed -i '
\,^[+-][+-][+-] /dev/null,b
/^[*-]\+ [0-9]\+\(,[0-9]\+\)\? [*-]\+$/b
s,^[*][*][*] ,&a/,
/^--- /{
s,\(^--- \)\(./\)*,\1a/,
s,[.][Oo][Rr][Ii][Gg]\([ /]\),\1,
s/[.][Oo][Rr][Ii][Gg]$//
s/[.]patched[.]\([^.]\)/.\1/
h
}
/^+++ -/{
g
s/^--- a/+++ b/
b
}
s,\(^+++ \)\(./\)*,\1b/,
' "$p"
done
sed -i '/^patch_args=/d' $template
done
```
31 lines
1.2 KiB
Diff
31 lines
1.2 KiB
Diff
From ab72c4893e6d14d488dfed25745d79f11bee45b9 Mon Sep 17 00:00:00 2001
|
|
From: Even Rouault <even.rouault@spatialys.com>
|
|
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
|
|
--- a/frmts/jpeg2000/jpeg2000dataset.cpp
|
|
+++ b/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;
|