GraphicsMagick: PGX codec in libjasper was not compilled into gm...
GraphicsMagick Commits <[email protected]>
| Newsgroups | gmane.comp.video.graphicsmagick.cvs |
|---|---|
| Message-ID | <mailman.38480.1672700907.1459.graphicsmagick-commit@lists.sourceforge.net> |
changeset e146691d7b85 in /hg/GraphicsMagick details: http://hg.GraphicsMagick.org/hg/GraphicsMagick?cmd=changeset;node=e146691d7b85 summary: PGX codec in libjasper was not compilled into gm, now added. diffstat: ChangeLog | 6 ++++++ VisualMagick/jp2/src/libjasper/pgx/LIBRARY.txt | 1 + jp2/src/appl/fuzz.c | 7 +++++-- jp2/src/libjasper/include/jasper/jas_config.h | 2 +- jp2/src/libjasper/pgx/pgx_dec.c | 4 ++-- 5 files changed, 15 insertions(+), 5 deletions(-) diffs (74 lines): diff -r 8e37ec0e9e8b -r e146691d7b85 ChangeLog --- a/ChangeLog Mon Jan 02 15:50:25 2023 -0600 +++ b/ChangeLog Tue Jan 03 00:07:42 2023 +0100 @@ -1,3 +1,9 @@ +2023-01-03 Fojtik Jaroslav <[email protected]> + + + VisualMagick/jp2/src/libjasper/pgx/LIBRARY.txt + * jp2/src/libjasper/include/jasper/jas_config.h + PGX codec was not compilled into gm, now added. + 2023-01-02 Bob Friesenhahn <[email protected]> * coders/pict.c: Add more tracing. diff -r 8e37ec0e9e8b -r e146691d7b85 VisualMagick/jp2/src/libjasper/pgx/LIBRARY.txt --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/VisualMagick/jp2/src/libjasper/pgx/LIBRARY.txt Tue Jan 03 00:07:42 2023 +0100 @@ -0,0 +1,1 @@ +This is a placeholder to make sure that this directory exists. diff -r 8e37ec0e9e8b -r e146691d7b85 jp2/src/appl/fuzz.c --- a/jp2/src/appl/fuzz.c Mon Jan 02 15:50:25 2023 -0600 +++ b/jp2/src/appl/fuzz.c Tue Jan 03 00:07:42 2023 +0100 @@ -88,15 +88,18 @@ int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) { + jas_stream_t *stream; + jas_image_t *image; + if (size == 0) /* avoid the assertion failure */ data = NULL; - jas_stream_t *stream = jas_stream_memopen((char *)data, size); + stream = jas_stream_memopen((char *)data, size); if (stream == NULL) abort(); - jas_image_t *image = jas_image_decode(stream, -1, NULL); + image = jas_image_decode(stream, -1, NULL); jas_stream_close(stream); if (image != NULL) diff -r 8e37ec0e9e8b -r e146691d7b85 jp2/src/libjasper/include/jasper/jas_config.h --- a/jp2/src/libjasper/include/jasper/jas_config.h Mon Jan 02 15:50:25 2023 -0600 +++ b/jp2/src/libjasper/include/jasper/jas_config.h Tue Jan 03 00:07:42 2023 +0100 @@ -15,7 +15,7 @@ #define JAS_INCLUDE_JP2_CODEC 1 #define JAS_INCLUDE_JPC_CODEC 1 /* #define JAS_INCLUDE_JPG_CODEC 1 */ -/* #define JAS_INCLUDE_PGX_CODEC 1 */ +#define JAS_INCLUDE_PGX_CODEC 1 /* The preprocessor symbol JAS_WIN_MSVC_BUILD should not be defined diff -r 8e37ec0e9e8b -r e146691d7b85 jp2/src/libjasper/pgx/pgx_dec.c --- a/jp2/src/libjasper/pgx/pgx_dec.c Mon Jan 02 15:50:25 2023 -0600 +++ b/jp2/src/libjasper/pgx/pgx_dec.c Tue Jan 03 00:07:42 2023 +0100 @@ -344,14 +344,14 @@ static int_fast32_t pgx_getword(jas_stream_t *in, bool bigendian, int prec) { - assert(prec <= 32); - uint_fast32_t val; int i; int j; int c; int wordsize; + assert(prec <= 32); + wordsize = (prec + 7) / 8; val = 0;