-
Notifications
You must be signed in to change notification settings - Fork 120
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- use https HOMEPAGE - bump major - cf https://github.com/uclouvain/openjpeg/blob/v2.5.2/CHANGELOG.md#v252-2024-02-28 & https://github.com/uclouvain/openjpeg/blob/v2.5.2/CHANGELOG.md#v251-2024-02-26 for details, including CVE-2021-3575 - drop now unneeded patches, last one remaining upstreamed in uclouvain/openjpeg#1520 - similar diff sent by brad tested in a bulk by tb@
- Loading branch information
Showing
6 changed files
with
33 additions
and
73 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,2 +1,2 @@ | ||
SHA256 (openjp2-2.5.0.tar.gz) = AzOAbWrezG96kSQ7K4Of9NIFOCNjTU9u16WbyHQJEio= | ||
SIZE (openjp2-2.5.0.tar.gz) = 1867111 | ||
SHA256 (openjp2-2.5.2.tar.gz) = kOOJb+2RDDdqr3nN2Yvf2vmMZHLv2OHevwqFSTjL2mo= | ||
SIZE (openjp2-2.5.2.tar.gz) = 1871948 |
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,12 +1,28 @@ | ||
fix build on big endian | ||
|
||
https://github.com/uclouvain/openjpeg/pull/1520 | ||
https://github.com/uclouvain/openjpeg/commit/995d8c96b51f3e510457cf71b5b5902de11dc08c | ||
|
||
Index: src/bin/jp2/convert.c | ||
--- src/bin/jp2/convert.c.orig | ||
+++ src/bin/jp2/convert.c | ||
@@ -662,7 +662,7 @@ static int tga_readheader(FILE *fp, unsigned int *bits | ||
return 1; | ||
} | ||
@@ -664,7 +664,7 @@ static int tga_readheader(FILE *fp, unsigned int *bits | ||
|
||
-#ifdef OPJ_BIG_ENDIAN | ||
+#if defined(OPJ_BIG_ENDIAN) && !defined(swap16) | ||
#ifdef OPJ_BIG_ENDIAN | ||
|
||
static INLINE OPJ_UINT16 swap16(OPJ_UINT16 x) | ||
-static INLINE OPJ_UINT16 swap16(OPJ_UINT16 x) | ||
+static INLINE OPJ_UINT16 opj_swap16(OPJ_UINT16 x) | ||
{ | ||
return (OPJ_UINT16)(((x & 0x00ffU) << 8) | ((x & 0xff00U) >> 8)); | ||
} | ||
@@ -733,8 +733,8 @@ static int tga_writeheader(FILE *fp, int bits_per_pixe | ||
goto fails; | ||
} | ||
#else | ||
- image_w = swap16(image_w); | ||
- image_h = swap16(image_h); | ||
+ image_w = opj_swap16(image_w); | ||
+ image_h = opj_swap16(image_h); | ||
if (fwrite(&image_w, 2, 1, fp) != 1) { | ||
goto fails; | ||
} |
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters