<br/>
<h1>Changelog from Git</h1><br/><br/>
<div class='changelog'>
-<pre class='wrap'>commit 9c1cfb034a8cf24eb5e35fe9c7074fd079d14b80
-Merge: 563ecfb 1c54024
+<pre class='wrap'>commit c28965f255c711a7b2f84a08b1398e5a0f807b0e
+Merge: 2624908 a36ae03
Author: Even Rouault <even.rouault@spatialys.com>
-Date: 2020-04-01 22:00:19 +0200
+Date: 2021-06-08 11:11:04 +0200
- Merge pull request #1240 from rouault/fix_crash_opj_decompress
+ Merge pull request #1359 from rouault/TLM
- opj_decompress: add sanity checks to avoid segfault in case of decoding error
+ Add support for enabling generation of TLM markers in encoder
-commit 1c54024165fd5db0e6047f28903274eb27d0980f
+commit a36ae0386066c9ddd089788930be5a42a176446e
Author: Even Rouault <even.rouault@spatialys.com>
-Date: 2020-04-01 20:58:55 +0200
+Date: 2021-06-07 15:16:53 +0200
- opj_decompress: add sanity checks to avoid segfault in case of decoding error
+ Add support for enabling generation of TLM markers in encoder
- Prevent crashes like:
- opj_decompress -i 0722_5-1_2019.jp2 -o out.ppm -r 4 -t 0
+ Support was already there, but restricted to Cinema and IMF profiles,
+ and 255 tiles
- where 0722_5-1_2019.jp2 is
- https://drive.google.com/file/d/1ZxOUZg2-FKjYwa257VFLMpTXRWxEoP0a/view?usp=sharing
+ * Add -TLM switch added to opj_compress
+ * Make opj_encoder_set_extra_options() function accept a TLM=YES option.
-commit 563ecfb55ca77c0fc5ea19e4885e00f55ec82ca9
+commit 2624908517ac0489ff1b5471f423dfe84d79da08
+Merge: e7d908d b5ec98f
Author: Even Rouault <even.rouault@spatialys.com>
-Date: 2020-02-13 09:59:17 +0100
+Date: 2021-06-07 15:48:42 +0200
- opj_compress: improve help message regarding new IMF switch
+ Merge pull request #1360 from rouault/travis_gcc_4_8_fix
+
+ .travis.yml: try to fix gcc 4.8 config by updating to xenial
-commit 4e5501b3c72a98b3117e68263afb922092c309cf
-Merge: 2888145 84f3beb
+commit b5ec98f14f1947bc75eb76969ad5322490ae8e4c
Author: Even Rouault <even.rouault@spatialys.com>
-Date: 2020-02-13 09:54:20 +0100
+Date: 2021-06-07 15:41:39 +0200
- Merge pull request #1235 from rouault/imf
-
- Implement writing of IMF profiles
+ .travis.yml: try to fix gcc 4.8 config by updating to xenial
-commit 84f3bebbff515f2b00ccf0c817930ebb10b91760
+commit e7d908d201a0fef9a619a537dae241341975cab9
+Merge: 7e4e09a f0629cb
Author: Even Rouault <even.rouault@spatialys.com>
-Date: 2020-02-12 15:55:16 +0100
+Date: 2021-06-07 13:56:11 +0200
- Implement writing of IMF profiles
+ Merge pull request #1358 from rouault/compiler_warning_fixes
- Add -IMF switch to opj_compress as well
+ Fix various compiler warnings
-commit fffe32adcb9f41a00805f4120012be9625ba450a
+commit f0629cb1c4c485d905936413556deb2872ac51e5
Author: Even Rouault <even.rouault@spatialys.com>
-Date: 2020-02-12 15:55:02 +0100
+Date: 2021-06-07 13:28:26 +0200
- openjpeg.h: fix values of OPJ_PROFILE_IMF_ constants
+ Fix various compiler warnings
-commit 28881453f6b1ae68a357557999498a11a2bc8b7e
-Merge: 647f9b1 b5cb419
+commit 7e4e09a7fb2ee0de857227771b22abff54448cd4
Author: Even Rouault <even.rouault@spatialys.com>
-Date: 2020-02-10 11:20:20 +0100
+Date: 2021-06-07 12:57:30 +0200
- Merge pull request #1234 from rouault/md5_libtiff_4_1
-
- tests: add alternate checksums for libtiff 4.1
+ openjpeg.c: avoid casts of function pointers
-commit b5cb419faff300fdbc0b4e98dab5c9010db6f39d
+commit adb888920edb8477a271e640e5640237e2b4c0bb
+Merge: b6b8d28 99c28c9
Author: Even Rouault <even.rouault@spatialys.com>
-Date: 2020-02-07 21:53:10 +0100
+Date: 2021-06-01 22:59:11 +0200
- tests: add alternate checksums for libtiff 4.1
+ Merge pull request #1354 from msabwat/emscripten
- Fixes #1233
-
- libtiff 4.1 slightly modifies the way it generates files. So
- add the new expected md5sum.
-
- Not super elegant solution admitedly.
+ fix #1345: don't remove big endian test for other platforms
-commit 647f9b118d12819c63635eea65909b0e49e0f201
-Merge: b63a433 05f9b91
-Author: Even Rouault <even.rouault@spatialys.com>
-Date: 2020-01-30 13:07:31 +0100
+commit 99c28c960c18bfc0a4da5ec24adcedff1f1b143c
+Author: Mehdi Sabwat <mehdi@videolabs.io>
+Date: 2021-06-01 22:39:27 +0200
- Merge pull request #1232 from rouault/fix_1231
+ fix #1345: don't remove big endian test for other platforms
- opj_tcd_init_tile(): avoid integer overflow
+ thanks to @ePirat, it turns out that !EMSCRIPTEN does not evaluate to 1 on other platforms, so the the #1345 actually disabled the test for all platforms.
-commit 05f9b91e60debda0e83977e5e63b2e66486f7074
+commit b6b8d28b3a85b74ff5415565cff2c20c019ca3c5
+Merge: 8aaafe6 238e849
Author: Even Rouault <even.rouault@spatialys.com>
-Date: 2020-01-30 00:59:57 +0100
+Date: 2021-05-07 11:22:13 +0200
- opj_tcd_init_tile(): avoid integer overflow
+ Merge pull request #1345 from msabwat/emscripten
- That could lead to later assertion failures.
-
- Fixes #1231 / CVE-2020-8112
+ emscripten: disable big endian test
-commit b63a433ba168bad5fa10e83de04d6305e6a222e2
-Author: Max Moroz <dor3s1@gmail.com>
-Date: 2020-01-13 09:07:54 -0800
+commit 238e849746e35232134533d826fdd2420d2e0274
+Author: Mehdi Sabwat <mehdisabwat@gmail.com>
+Date: 2021-04-26 15:37:44 +0200
- tests/fuzzers: link fuzz binaries using $LIB_FUZZING_ENGINE. (#1230)
-
- This was changed some time ago (https://google.github.io/oss-fuzz/getting-started/new-project-guide/) but the build didn't fail as there is a fallback mechanism. The main advantage of the new approach is that for libFuzzer this produces more performant binaries (as `$LIB_FUZZING_ENGINE` expands into `-fsanitize=fuzzer`, which links libFuzzer from the compiler-rt, allowing better optimization tricks).
+ emscripten: disable big endian test
- I'm also experimenting with dataflow (https://github.com/google/oss-fuzz/issues/1632) on your project, and the dataflow config doesn't have a fallback (as it's a new configuration), therefore I'm proposing a change to migrate from `-lFuzzingEngine` to `$LIB_FUZZING_ENGINE`.
+ This test should not run on the emscripten platform because of :
+ https://github.com/emscripten-core/emscripten/blob/dff33368427fba16745c8ce52f11484a67b2855d/cmake/Modules/TestBigEndian.cmake#L5
+
+commit 8aaafe69958f3528db4e59b50cbc49494262c7b5
+Author: Jamaika1 <lukaszcz18@wp.pl>
+Date: 2021-05-06 19:30:34 +0200
-commit 46c1eff9e98bbcf794d042f7b2e3d45556e805ce
-Merge: ac37373 024b840
+ Import files tiff and yuv(raw) (#1316)
+
+commit 5f653ad673cf0f141801c1c4a810028a9876b5e5
+Merge: 05263ee 85a87cd
Author: Even Rouault <even.rouault@spatialys.com>
-Date: 2020-01-11 11:29:11 +0100
+Date: 2021-05-06 13:40:43 +0200
- Merge pull request #1229 from rouault/fix_1228
+ Merge pull request #1350 from rouault/remove_jpwl_jp3d_mj2
- opj_j2k_update_image_dimensions(): reject images whose coordinates are beyond INT_MAX (fixes #1228)
+ Remove obsolete components JPWL, JP3D and MJ2
-commit 024b8407392cb0b82b04b58ed256094ed5799e04
+commit 85a87cd505f37027c4b74363b529a1e166e32651
Author: Even Rouault <even.rouault@spatialys.com>
-Date: 2020-01-11 01:51:19 +0100
+Date: 2021-05-04 19:21:45 +0200
- opj_j2k_update_image_dimensions(): reject images whose coordinates are beyond INT_MAX (fixes #1228)
+ Remove obsolete components JPWL, JP3D and MJ2
-commit ac3737372a00b8778b528094dd5bd58a74f67d42
-Merge: 9701b33 4cb1f66
+commit 05263eeee9bc666184a39cd2a83a7214cc83ec27
+Merge: 0bda718 9727f3a
Author: Even Rouault <even.rouault@spatialys.com>
-Date: 2019-11-17 13:08:41 +0100
+Date: 2021-05-04 19:15:06 +0200
- Merge pull request #1217 from rouault/fix_ossfuzz_18979
+ Merge pull request #1348 from rouault/fix_kdu
- pi.c: avoid integer overflow, resulting in later invalid access to memory in opj_t2_decode_packets()
+ tools/travis-ci/install.sh: fix links to Kakadu and jpylyzer binaries
-commit 9701b3305db58d35e4446946309f88937e2f5342
-Author: Robert Ancell <robert.ancell@gmail.com>
-Date: 2019-11-17 15:09:59 +1300
+commit 9727f3ac69a7cd1ca00518c56ef1071881c03c71
+Author: Even Rouault <even.rouault@spatialys.com>
+Date: 2021-05-04 18:55:43 +0200
- JPWL: convert: Fix buffer overflow reading an image file less than four characters (#1196)
-
- Fixes #1068
+ .travis.yml: disable tests that no longer pass for unknown reason
-commit cb332992a7c84316824b1c4810103ee4f190937c
-Merge: 5875a6b 016f80a
+commit 92c0471154960d50ebe68b363f4bb1e2c1e4d775
Author: Even Rouault <even.rouault@spatialys.com>
-Date: 2019-11-17 02:47:26 +0100
+Date: 2021-05-04 16:27:05 +0200
- Merge pull request #1218 from rouault/fix_broken_abi_check
-
- abi-check.sh: fix false postive ABI error, and display output error log
+ tools/travis-ci/install.sh: fix links to Kakadu and jpylyzer binaries
-commit 016f80ae2106c2b1b5bca08a684b0bd082e231e6
+commit 0bda7188b7b545232a341f1d978b1e4feda46fc2
+Merge: 0782cd0 4d0b49e
Author: Even Rouault <even.rouault@spatialys.com>
-Date: 2019-11-17 01:35:26 +0100
+Date: 2021-01-10 23:58:37 +0100
- abi-check.sh: fix false postive ABI error, and display output error log
+ Merge pull request #1321 from ffontaine/master
- There is currently a false positive ABI check failure between v2.3.1
- and current. It disappears when removing the generated reports of v2.3.1
- and recreating them. It is likely that some tooling has evolved since
- the initial v2.3.1 report generation.
+ Fix cmake file with DESTDIR
-commit 4cb1f663049aab96e122d1ff16f601d0cc0be976
-Author: Even Rouault <even.rouault@spatialys.com>
-Date: 2019-11-17 01:18:26 +0100
+commit 4d0b49edad7fb31ebbf03c60a45b72aaa7b7412b
+Author: Fabrice Fontaine <fontaine.fabrice@gmail.com>
+Date: 2021-01-07 14:11:26 +0100
- pi.c: avoid integer overflow, resulting in later invalid access to memory in opj_t2_decode_packets(). Fixes https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=18979
+ cmake/OpenJPEGConfig.cmake: replace ABSOLUTE by REALPATH
+
+ Fix #1174 by replacing ABSOLUTE by REALPATH which will resolve symlinks:
+ https://cmake.org/cmake/help/latest/command/get_filename_component.html
+
+ Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
-commit 5875a6b44618fb7dfd5cd6d742533eaee2014060
-Author: Even Rouault <even.rouault@spatialys.com>
-Date: 2019-10-03 11:04:30 +0200
+commit 14f4c27e7c91f745a1dda9991b5deea3cbef2072
+Author: Fabrice Fontaine <fontaine.fabrice@gmail.com>
+Date: 2021-01-07 14:09:50 +0100
- opj_tcd_mct_decode()/opj_mct_decode()/opj_mct_encode_real()/opj_mct_decode_real(): proper deal with a number of samples larger than 4 billion (refs #1151)
+ Revert "Use INC_DIR for OPENJPEG_INCLUDE_DIRS (fixes uclouvain#1174)"
+
+ This reverts commit 65586374d639cfc0104419992f9022174b412594 which
+ breaks cross-compilation of poppler under buildroot (because of
+ DESTDIR usage).
-commit e66125fe260deee49fdf6e9978d9bd29871dd5bb
-Merge: 8db9d25 b275196
+commit 0782cd075d7e9678bf1cb448c1f3d048fabe4489
+Merge: 07a4543 b6f0e41
Author: Even Rouault <even.rouault@spatialys.com>
-Date: 2019-09-03 17:03:54 +0200
+Date: 2021-01-04 19:42:30 +0100
- Merge pull request #1164 from sebras/master
+ Merge pull request #867 from pseiderer/fix-lcms2-static-linking-using-pgk-config
- openjp2/j2k: Report error if all wanted components are not decoded.
+ Fix lcms2 static linking using pgk config
-commit 8db9d25dcf360528fd1e094e4f9274c0635e90cc
-Author: Even Rouault <even.rouault@spatialys.com>
-Date: 2019-06-15 09:55:16 +0200
+commit b6f0e41399f2e67117de2641b169f4400260be57
+Author: Peter Seiderer <ps.report@gmx.net>
+Date: 2016-11-11 23:35:13 +0100
- opj_decompress_fuzzer: remove checks regarding input dimensions (fixes #1079)
+ thirdparty: lcms2: append flags found by pkg-config if available
+
+ This change allows to get all required CFLAGS/LDFLAGS in case of static only
+ build.
+
+ Fixes a buildroot build failure (see [1], [2] and [3]).
+
+ [1] http://autobuild.buildroot.net/results/5ce/5cee20afd8bef5268832cddcb3a5270746be7a57
+ [2] http://lists.busybox.net/pipermail/buildroot/2016-November/177187.html
+ [3] http://lists.busybox.net/pipermail/buildroot/2016-November/177188.html
+
+ Signed-off-by: Peter Seiderer <ps.report@gmx.net>
+ ---
+ Depends on https://github.com/uclouvain/openjpeg/pull/866
-commit f4d65783593fd0490e0fdb9f323f2d5aff81a21d
+commit 07a454324cfeb431ee3fc3799df522dff252b12b
+Merge: eb27272 75a7f1a
Author: Even Rouault <even.rouault@spatialys.com>
-Date: 2019-05-26 11:06:01 +0200
+Date: 2021-01-04 14:06:43 +0100
- test_decode_area.c: assign tdy to *ptileh instead of *ptilew (fixes #1195)
+ Merge pull request #866 from tSed/master
+
+ fix static build only against tiff and its indirect dependencies
-commit 9b7620ee7a3d72bfcdbebd78e607c5ee8aa7fade
-Merge: 4f447c6 3aef207
+commit eb27272a79cd81256e475b9aad8461fda8b7f989
+Merge: 2519439 4d147d9
Author: Even Rouault <even.rouault@spatialys.com>
-Date: 2019-04-26 19:52:52 +0200
+Date: 2021-01-04 10:45:52 +0100
- Merge pull request #1185 from Young-X/fix
+ Merge pull request #1317 from ffontaine/master
- Fix several potential vulnerabilities
+ CMakeLists.txt: Don't require a C++ compiler
-commit 4f447c6e18444a4182f7844d25033861eee8df55
-Merge: 5dd75f6 a94cfbd
-Author: Even Rouault <even.rouault@spatialys.com>
-Date: 2019-04-25 15:32:22 +0200
+commit 4d147d9630653e4c93a70a2a8026c323ed1042d2
+Author: Peter Korsgaard <peter@korsgaard.com>
+Date: 2021-01-04 09:05:42 +0100
- Merge pull request #1192 from rouault/poc_fixes
+ CMakeLists.txt: Don't require a C++ compiler
- compression: emit POC marker when only one single POC is requested (f…
+ By default, CMake assumes that the project is using both C and C++. By
+ explicitly passing 'C' as argument of the project() macro, we tell CMake
+ that only C is used, which prevents CMake from erroring out if a C++
+ compiler doesn't exist.
+
+ Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
+ [Retrieved (and slightly updated by adding enable_language(CXX) if
+ WITH_ASTYLE is set) from:
+ https://git.buildroot.net/buildroot/tree/package/openjpeg/0003-CMakeLists.txt-Don-t-require-a-C-compiler.patch]
+ Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
-commit a94cfbd5334922ca5b63cfac9d2e5e0ec98155be
+commit 2519439d7d4d0e51abf479afe73f30b1c7c70530
Author: Even Rouault <even.rouault@spatialys.com>
-Date: 2019-04-25 14:07:46 +0200
+Date: 2020-12-31 14:54:59 +0100
- Change opj_j2k_check_poc_val() to take into account tile number
+ Fix Windows build
-commit bdec5ae2723369be5abba7aaae398aa4ae3225cc
-Author: Even Rouault <even.rouault@spatialys.com>
-Date: 2019-04-25 01:29:38 +0200
+commit 433edd0eea934e25f6e97aaf912ebed191fa41d1
+Author: Antonin Descampe <antonin@descampe.net>
+Date: 2020-12-31 11:06:28 +0100
- Add test for previous commit
+ patch provided 3rdparty zlib to work with MacOS
-commit 6423163141412cb93364de4e33d90bcffefa0885
+commit 4db0c8d5aef53dd6eebc730e5a189cf9bf9bae6c
Author: Even Rouault <even.rouault@spatialys.com>
-Date: 2019-04-25 01:27:02 +0200
+Date: 2020-12-29 15:34:19 +0100
- Fix POC in multi-tile scenarios: avoid almost endless loop when a tile has no POC settings
+ Add HOWTO-RELEASE
-commit b86717fdd36b628ea7ecb5c24f7a086bf5bcd3a7
+commit 43b8ddc6af015715b2fbda2052a17b29d1538df7
Author: Even Rouault <even.rouault@spatialys.com>
-Date: 2019-04-25 00:40:04 +0200
+Date: 2020-12-29 15:01:40 +0100
- Add test for previous commit
+ Comment back opj_previous_version in abi_check.sh
-commit 23883458b9de2c57fc1890b42efbd0832c8fbe3b
+commit b93996d5e018b3d9525acf406053d8b46240f914
Author: Even Rouault <even.rouault@spatialys.com>
-Date: 2019-04-25 00:34:44 +0200
+Date: 2020-12-29 14:46:50 +0100
- opj_j2k_check_poc_val(): prevent potential write outside of allocated array
+ abi_check.sh: Update version number for automatic abi check
-commit 6589c609f6d6b3743715fceefbdac6e4ecb76aee
+commit b897e2cb369b6944d791209f491f382a983cda87
+Merge: 37ac30c 7dd5497
Author: Even Rouault <even.rouault@spatialys.com>
-Date: 2019-04-25 00:28:05 +0200
+Date: 2020-12-28 22:58:58 +0100
- opj_j2k_check_poc_val(): fix starting index for checking layer dimension
+ Merge pull request #1312 from stweil/news
- The standard mandates that the layer index always starts at zero for every
- progression.
+ Fix year in NEWS
-commit 1e3a57563defb6aa7cf24ffd2394d4a820e13bda
-Author: Even Rouault <even.rouault@spatialys.com>
-Date: 2019-04-25 00:17:13 +0200
+commit 7dd5497b15a33a8020bf1ab116f649328b037a89
+Author: Stefan Weil <sw@weilnetz.de>
+Date: 2020-12-28 22:52:34 +0100
- compression: emit POC marker when only one single POC is requested (fixes #1191)
+ Fix year in NEWS
+
+ Signed-off-by: Stefan Weil <sw@weilnetz.de>
-commit 5dd75f62e20efff9f094fd1dbd0d4d00e8b37689
+commit 37ac30ceff6640bbab502388c5e0fa0bff23f505
Author: Even Rouault <even.rouault@spatialys.com>
-Date: 2019-04-23 16:52:21 +0200
-
- j2k.c: use correct naming convention for total_data_size variable
+Date: 2020-12-28 21:55:55 +0100
-commit 3aef207f90e937d4931daf6d411e092f76d82e66
-Author: Young Xiao <YangX92@hotmail.com>
-Date: 2019-03-16 20:09:59 +0800
+ Prepare for v2.4.0
- bmp_read_rle4_data(): avoid potential infinite loop
-
-commit 21399f6b7d318fcdf4406d5e88723c4922202aa3
-Author: Young Xiao <YangX92@hotmail.com>
-Date: 2019-03-16 19:57:27 +0800
+commit a335b4d008359a32656026fa6780ef185b35cf0a
+Merge: 4980f46 0c2b633
+Author: Even Rouault <even.rouault@spatialys.com>
+Date: 2020-12-28 21:49:48 +0100
- convertbmp: detect invalid file dimensions early
-
- width/length dimensions read from bmp headers are not necessarily
- valid. For instance they may have been maliciously set to very large
- values with the intention to cause DoS (large memory allocation, stack
- overflow). In these cases we want to detect the invalid size as early
- as possible.
-
- This commit introduces a counter which verifies that the number of
- written bytes corresponds to the advertized width/length.
-
- See commit 8ee335227bbc for details.
+ Merge pull request #1310 from Jamaika1/patch-1
- Signed-off-by: Young Xiao <YangX92@hotmail.com>
+ Change defined WIN32
-commit d0dd894ae24d0f2f09072adf1b966033dd64672d
-Author: Antonin Descampe <antonin@gmail.com>
-Date: 2019-04-02 15:37:38 +0200
-
- Comment back opj_previous_version in abi_check.sh
-
-commit 291e45bb045e63334729ad9a894595f8e1e2b2c7
-Author: Antonin Descampe <antonin@gmail.com>
-Date: 2019-04-02 15:12:59 +0200
+commit 4980f46210f19bd2d83dffdfeb8496f29d68b9c9
+Merge: 6c5acd4 aaddbc7
+Author: Even Rouault <even.rouault@spatialys.com>
+Date: 2020-12-28 19:05:14 +0100
- Update version number for automatic abi check
+ Merge pull request #1307 from cygwin-lem/pr_use-OPENJPEG_INSTALL_DOC_DIR-to-DESTINATION-of-HTMLs
+
+ Set ${OPENJPEG_INSTALL_DOC_DIR} to DESTINATION of HTMLs
-commit 57096325457f96d8cd07bd3af04fe81d7a2ba788
-Author: Antonin Descampe <antonin@gmail.com>
-Date: 2019-04-02 14:45:15 +0200
+commit 6c5acd4d656870882432ff28d4103de80d109a8d
+Merge: 98a4c5c 5d494a7
+Author: Even Rouault <even.rouault@spatialys.com>
+Date: 2020-12-28 19:04:28 +0100
- update token for appveyor auto release
+ Merge pull request #1308 from timgates42/bugfix_typo_produced
+
+ docs: fix simple typo, producted -> produced
-commit 8b9a89bc2e61652d30bbc56673f8f03ef464430f
-Author: Antonin Descampe <antonin@gmail.com>
-Date: 2019-04-02 14:25:09 +0200
+commit 0c2b633992417c8794470c9932e3c75447c8ab13
+Author: Jamaika1 <lukaszcz18@wp.pl>
+Date: 2020-12-21 07:59:12 +0100
- update token for automatic release
+ Change defined WIN32
-commit d1d422c126cbc2a5435340bd85f4b52ff0477101
-Author: Antonin Descampe <antonin@gmail.com>
-Date: 2019-04-02 12:08:52 +0200
+commit 5d494a7e8b9591a8923f387679c692b5c1f45e5a
+Author: Tim Gates <tim.gates@iress.com>
+Date: 2020-12-16 21:19:17 +1100
- Update for release 2.3.1
+ docs: fix simple typo, producted -> produced
+
+ There is a small typo in thirdparty/include/zlib.h, thirdparty/libz/zlib.h.
+
+ Should read `produced` rather than `producted`.
-commit d3b0b8927acf2e050a6379320d36fc3bb3751fe3
-Author: Antonin Descampe <info@openjpeg.org>
-Date: 2019-04-02 11:03:16 +0200
+commit aaddbc7c07f00f0704da4db7616e6dc7448e5f07
+Author: Lemures Lemniscati <lemures.lemniscati@gmail.com>
+Date: 2020-12-14 23:00:04 +0900
- Update for release 2.3.1
+ Set ${OPENJPEG_INSTALL_DOC_DIR} to DESTINATION of HTMLs
+
+ Use ${OPENJPEG_INSTALL_DOC_DIR} as DESTINATION of HTML documents,
+ instead of share/doc.
-commit c7798bb0c636c89ab7f0bab4d89e7f0136e0e55a
-Author: Antonin Descampe <info@openjpeg.org>
-Date: 2019-04-02 11:02:20 +0200
+commit 98a4c5c3709e0cc43b0a1c151ed5bd85a2d607fa
+Merge: 5d0a8b0 6558637
+Author: Even Rouault <even.rouault@spatialys.com>
+Date: 2020-12-10 15:55:41 +0100
- update for release 2.3.1
+ Merge pull request #1306 from matthew-sharp/master
+
+ Use INC_DIR for OPENJPEG_INCLUDE_DIRS (fixes uclouvain#1174)
-commit 8196ab531e79602fe3c947d09d3240c25c358731
-Author: Antonin Descampe <info@openjpeg.org>
-Date: 2019-04-02 11:00:58 +0200
+commit 65586374d639cfc0104419992f9022174b412594
+Author: Matthew Sharp <sharpshopter@gmail.com>
+Date: 2020-12-10 10:17:46 +1100
- Update BUILD version for release 2.3.1
+ Use INC_DIR for OPENJPEG_INCLUDE_DIRS (fixes uclouvain#1174)
+ This fixes the case where the cmake file is accessed via a symlink.
-commit 69a7a312dccebc8b5f28f8a5e4a703cb8d447d44
-Merge: d6b8aed 5151426
-Author: Even Rouault <even.rouault@mines-paris.org>
-Date: 2019-03-29 12:25:39 +0100
+commit 5d0a8b08dcd3bcdf532c54702b5a88ec61b17918
+Merge: 43dd9ee 8f5aff1
+Author: Even Rouault <even.rouault@spatialys.com>
+Date: 2020-12-05 11:39:23 +0100
- Merge pull request #1188 from rouault/fix_abi_check
+ Merge pull request #1304 from rouault/fix_1302
- abi-check.sh: fix broken download URL
+ pi.c: avoid out of bounds access with POC (fixes #1302)
-commit 5151426d6e6f7f0e1ae6f050aaa7cec6bc4ffd08
+commit 8f5aff1dff510a964d3901d0fba281abec98ab63
Author: Even Rouault <even.rouault@spatialys.com>
-Date: 2019-03-29 11:53:23 +0100
+Date: 2020-12-04 20:45:25 +0100
- abi-check.sh: fix broken download URL
+ pi.c: avoid out of bounds access with POC (fixes #1302)
-commit d6b8aed5612e6be6d3a4053867fbd2ae0cb7c8af
-Merge: 25b815d a1d32a5
-Author: Even Rouault <even.rouault@mines-paris.org>
-Date: 2019-03-29 11:52:38 +0100
+commit 43dd9ee17894a22fa3df88b1e561274632d9ab43
+Merge: aaff099 4ce7d28
+Author: Even Rouault <even.rouault@spatialys.com>
+Date: 2020-12-04 20:37:43 +0100
- Merge pull request #1187 from rouault/fix_ubsan_in_opj_t1_encode_cblks
+ Merge pull request #1303 from zodf0055980/fix#1283
- opj_t1_encode_cblks: fix UBSAN signed integer overflow
+ Encoder: grow again buffer size
-commit a1d32a596a94280178c44a55d7e7f1acd992ed5d
-Author: Even Rouault <even.rouault@spatialys.com>
-Date: 2019-03-29 11:17:39 +0100
+commit 4ce7d285a55d29b79880d0566d4b010fe1907aa9
+Author: yuan <zodf0055980@gmail.com>
+Date: 2020-12-04 19:00:22 +0800
- opj_t1_encode_cblks: fix UBSAN signed integer overflow
-
- Fixes #1053 / CVE-2018-5727
-
- Note: I don't consider this issue to be a security vulnerability, in
- practice.
- At least with gcc or clang compilers on x86_64 which generate the same
- assembly code with or without that fix.
+ Encoder: grow again buffer size in opj_tcd_code_block_enc_allocate_data() (fixes #1283)
-commit 25b815dc460dbf9def7e6b822c8998727094f85a
+commit aaff099b49365cfecfc475ada48b9244c6eefc9c
+Merge: fb9eae5 73fdf28
Author: Even Rouault <even.rouault@spatialys.com>
-Date: 2019-03-29 10:44:35 +0100
+Date: 2020-12-02 23:56:57 +0100
- Revert "[JPWL] tgatoimage(): avoid excessive memory allocation attempt,"
-
- This reverts commit 05be3084460e46282ee63f04c72c451f3271fd28.
+ Merge pull request #1301 from rouault/fix_1299
- This commit doesn't compile due to missing OPJ_UINT64 type
+ opj_j2k_write_sod(): avoid potential heap buffer overflow (fixes #1299) (probably master only)
-commit e1740e7ce79d0a1676db4da0f4189b64e85f52cb
+commit fb9eae5d637d06209a6cb9ca57960ac72179ee14
+Merge: fc6abdb 00383e1
Author: Even Rouault <even.rouault@spatialys.com>
-Date: 2019-03-29 10:40:58 +0100
+Date: 2020-12-02 23:56:39 +0100
- Revert "[MJ2] Avoid index out of bounds access to pi->include[]"
-
- This reverts commit c277159986c80142180fbe5efb256bbf3bdf3edc.
+ Merge pull request #1300 from rouault/complement_1293
- The commit didn't compile. include_size is not defined in openmj2
+ pi.c: avoid out of bounds access with POC (refs https://github.com/uclouvain/openjpeg/issues/1293#issuecomment-737122836)
-commit b2751967ecabf8d8856e85ab91e25d4f235e2eb3
-Author: Sebastian Rasmussen <sebras@gmail.com>
-Date: 2018-10-31 20:22:11 +0100
+commit fc6abdbeb7aa427685c28a9ebfd2e653c10999b3
+Merge: 18b1138 38d661a
+Author: Even Rouault <even.rouault@spatialys.com>
+Date: 2020-12-02 23:56:30 +0100
- openjp2/j2k: Report error if all wanted components are not decoded.
-
- Previously the caller had to check whether each component data had
- been decoded. This means duplicating the checking in every user of
- openjpeg which is unnecessary. If the caller wantes to decode all
- or a set of, or a specific component then openjpeg ought to error
- out if it was unable to do so.
+ Merge pull request #1298 from rouault/fix_1297
- Fixes #1158.
+ opj_t2_encode_packet(): avoid out of bound access of #1297, but likely not the proper fix
-commit 51f097e6d5754ddae93e716276fe8176b44ec548
-Merge: e7640f5 8ee3352
-Author: Even Rouault <even.rouault@mines-paris.org>
-Date: 2018-12-21 16:41:00 +0100
+commit 73fdf28342e4594019af26eb6a347a34eceb6296
+Author: Even Rouault <even.rouault@spatialys.com>
+Date: 2020-12-02 14:10:16 +0100
- Merge pull request #1172 from hlef/master
-
- convertbmp: detect invalid file dimensions early (CVE-2018-6616)
+ opj_j2k_write_sod(): avoid potential heap buffer overflow (fixes #1299) (probably master only)
-commit 8ee335227bbcaf1614124046aa25e53d67b11ec3
-Author: Hugo Lefeuvre <hle@debian.org>
-Date: 2018-12-14 04:58:40 +0100
+commit 00383e162ae2f8fc951f5745bf1011771acb8dce
+Author: Even Rouault <even.rouault@spatialys.com>
+Date: 2020-12-02 14:02:17 +0100
- convertbmp: detect invalid file dimensions early
-
- width/length dimensions read from bmp headers are not necessarily
- valid. For instance they may have been maliciously set to very large
- values with the intention to cause DoS (large memory allocation, stack
- overflow). In these cases we want to detect the invalid size as early
- as possible.
-
- This commit introduces a counter which verifies that the number of
- written bytes corresponds to the advertized width/length.
-
- Fixes #1059 (CVE-2018-6616).
+ pi.c: avoid out of bounds access with POC (refs https://github.com/uclouvain/openjpeg/issues/1293#issuecomment-737122836)
-commit e7640f58f122d1228f3d750864543ad4703e18fc
-Merge: e0f5212 05be308
-Author: Even Rouault <even.rouault@mines-paris.org>
-Date: 2018-12-07 21:27:38 +0100
+commit 38d661a3897052c7ff0b39b30c29cb067e130121
+Author: Even Rouault <even.rouault@spatialys.com>
+Date: 2020-12-02 13:13:26 +0100
- Merge pull request #1168 from Young-X/fix_dev
-
- Fix multiple potential vulnerabilities and bugs
+ opj_t2_encode_packet(): avoid out of bound access of #1297, but likely not the proper fix
-commit 05be3084460e46282ee63f04c72c451f3271fd28
-Author: Young Xiao <YangX92@hotmail.com>
-Date: 2018-11-28 14:44:06 +0800
+commit 18b1138fbe3bb0ae4aa2bf1369f9430a8ec6fa00
+Merge: 630b485 c9380ed
+Author: Even Rouault <even.rouault@spatialys.com>
+Date: 2020-12-02 10:05:39 +0100
- [JPWL] tgatoimage(): avoid excessive memory allocation attempt,
- and fixes unaligned load
+ Merge pull request #1295 from rouault/fix_1293
- Signed-off-by: Young Xiao <YangX92@hotmail.com>
+ opj_j2k_setup_encoder(): validate POC compno0 and compno1 (fixes #1293)
-commit bd88611ed9ad7144ec4f3de54790cd848175891b
-Author: Young_X <YangX92@hotmail.com>
-Date: 2018-11-23 17:15:05 +0800
+commit 630b485f86a6b0bb6fa03b698b8c5358df88d055
+Merge: 61ff143 fbd30b0
+Author: Even Rouault <even.rouault@spatialys.com>
+Date: 2020-12-02 10:05:31 +0100
- [JP3D] To avoid divisions by zero / undefined behaviour on shift (CVE-2018-14423
+ Merge pull request #1296 from rouault/workaround_1294
- Signed-off-by: Young_X <YangX92@hotmail.com>
+ opj_t2_encode_packet(): avoid out of bound access of #1294, but likely not the proper fix
-commit ce9583d1d7627e007a34a31ae4e22a00d78bd153
-Author: Young_X <YangX92@hotmail.com>
-Date: 2018-11-23 17:12:06 +0800
+commit c9380ed0f8cc4794fc71d556ea23ae61e32247af
+Author: Even Rouault <even.rouault@spatialys.com>
+Date: 2020-12-01 19:39:09 +0100
- [JPWL] opj_compress: reorder checks related to code block dimensions to avoid potential int overflow
-
- Signed-off-by: Young_X <YangX92@hotmail.com>
+ opj_j2k_setup_encoder(): validate POC compno0 (fixes #1293)
-commit c58df149900df862806d0e892859b41115875845
-Author: Young_X <YangX92@hotmail.com>
-Date: 2018-11-23 16:24:19 +0800
+commit fbd30b064f8f9607d500437b6fedc41431fd6cdc
+Author: Even Rouault <even.rouault@spatialys.com>
+Date: 2020-12-01 19:51:35 +0100
- [OPENJP2] change the way to compute *p_tx0, *p_tx1, *p_ty0, *p_ty1 in function
- opj_get_encoding_parameters
-
- Signed-off-by: Young_X <YangX92@hotmail.com>
+ opj_t2_encode_packet(): avoid out of bound access of #1294, but likely not the proper fix
-commit c277159986c80142180fbe5efb256bbf3bdf3edc
-Author: Young_X <YangX92@hotmail.com>
-Date: 2018-11-23 16:12:53 +0800
+commit 61ff143ad63b9bbe12b6da266f8619b2cb2c3559
+Merge: 2d119d0 6daf5f3
+Author: Even Rouault <even.rouault@spatialys.com>
+Date: 2020-12-01 11:35:59 +0100
- [MJ2] Avoid index out of bounds access to pi->include[]
+ Merge pull request #1292 from rouault/fix_1286
- Signed-off-by: Young_X <YangX92@hotmail.com>
+ Encoder: avoid global buffer overflow on irreversible conversion when…
-commit e0f5212888c0c1abc5e060a75a3a4a5ff99afd1a
-Merge: 92023cd 2e5ab1d
-Author: Even Rouault <even.rouault@mines-paris.org>
-Date: 2018-11-28 00:04:30 +0100
+commit 6daf5f3e1ec6eff03b7982889874a3de6617db8d
+Author: Even Rouault <even.rouault@spatialys.com>
+Date: 2020-11-30 22:37:07 +0100
- Merge pull request #1170 from rouault/fix_color_apply_icc_profile
-
- color_apply_icc_profile: avoid potential heap buffer overflow
+ Encoder: avoid global buffer overflow on irreversible conversion when too many decomposition levels are specified (fixes #1286)
-commit 2e5ab1d9987831c981ff05862e8ccf1381ed58ea
+commit 2d119d03a0c9f5e3b6c2a70c30cbdcea4857b40a
+Merge: b207240 1aa3c60
Author: Even Rouault <even.rouault@spatialys.com>
-Date: 2018-11-27 23:31:30 +0100
+Date: 2020-11-30 23:28:31 +0100
- color_apply_icc_profile: avoid potential heap buffer overflow
+ Merge pull request #1291 from rouault/tnsot_zero_missing_eoc
- Derived from a patch by Thuan Pham
+ Decoding: deal with some SPOT6 images that have tiles with a single tile-part with TPsot == 0 and TNsot == 0, and with missing EOC
-commit 46822d0eddc3324b2a056bc60ffa997027bebd66
-Author: Young_X <YangX92@hotmail.com>
-Date: 2018-11-23 15:58:23 +0800
+commit b2072402b7e14d22bba6fb8cde2a1e9996e9a919
+Author: Even Rouault <even.rouault@spatialys.com>
+Date: 2020-11-30 22:31:51 +0100
- [JPWL] imagetotga(): fix read heap buffer overflow if numcomps < 3 (#987)
-
- Signed-off-by: Young_X <YangX92@hotmail.com>
+ pngtoimage(): fix wrong computation of x1,y1 if -d option is used, that would result in a heap buffer overflow (fixes #1284)
-commit 619e1b086eaa21ebd9b23eb67deee543b07bf06f
-Author: Young_X <YangX92@hotmail.com>
-Date: 2018-11-23 15:02:26 +0800
+commit 1aa3c60859ab2a3edb7a68682f131c6b3a91da72
+Author: Even Rouault <even.rouault@spatialys.com>
+Date: 2020-11-30 17:36:27 +0100
- [JPWL] fix CVE-2018-16375
-
- Signed-off-by: Young_X <YangX92@hotmail.com>
+ Decoding: deal with some SPOT6 images that have tiles with a single tile-part with TPsot == 0 and TNsot == 0, and with missing EOC
-commit c5bd64ea146162967c29bd2af0cbb845ba3eaaaf
-Author: Young_X <YangX92@hotmail.com>
-Date: 2018-11-23 14:47:36 +0800
+commit a2b2980a4bcb4d3903375de31495f99dde0e98a8
+Merge: 0c0f27f 4f48779
+Author: Even Rouault <even.rouault@spatialys.com>
+Date: 2020-11-27 14:25:11 +0100
- [MJ2] To avoid divisions by zero / undefined behaviour on shift
+ Merge pull request #1288 from zodf0055980/master
- Signed-off-by: Young_X <YangX92@hotmail.com>
+ Free p_tcd_marker_info to avoid memory leak
-commit 92023cd6c377e0384a7725949b25655d4d94dced
-Merge: c196b23 cab352e
-Author: Even Rouault <even.rouault@mines-paris.org>
-Date: 2018-11-16 09:42:19 +0100
+commit 4f487798bac3eea5ffa07d3cc542f675c4b4d9ae
+Author: yuan <zodf0055980@gmail.com>
+Date: 2020-11-26 00:22:49 +0800
- Merge pull request #1160 from hlef/master
-
- jp3d/jpwl convert: fix write stack buffer overflow
+ Free p_tcd_marker_info to avoid memory leak
-commit c196b23b90321b5c7e3238294607a2e8626c503f
-Author: ichlubna <43234438+ichlubna@users.noreply.github.com>
-Date: 2018-11-16 09:40:31 +0100
+commit 0c0f27f17d431d98d190f30bec3879f434512158
+Merge: 15cf3d9 649298d
+Author: Even Rouault <even.rouault@spatialys.com>
+Date: 2020-11-25 16:59:46 +0100
- openjp3d: Int overflow fixed (#1159)
+ Merge pull request #1287 from zodf0055980/master
- When compressing a lot of slices (starting from 44 FullHD slices with 3 8bit components in our experiments) the rate values are high enough to cause an int overflow that leads to negative lengths and wrong results. The cast happens too late.
+ Encoder: grow again buffer size
-commit cab352e249ed3372dd9355c85e837613fff98fa2
-Author: Hugo Lefeuvre <hle@debian.org>
-Date: 2018-11-07 18:48:29 +0100
+commit 649298dcf84b2f20cfe458d887c1591db47372a6
+Author: yuan <zodf0055980@gmail.com>
+Date: 2020-11-25 20:41:39 +0800
- jp2: convert: fix null pointer dereference
-
- Tile components in a JP2 image might have null data pointer by defining a
- zero component size (for example using large horizontal or vertical
- sampling periods). This null data pointer leads to null image component
- data pointer, causing crash when dereferenced without != null check in
- imagetopnm.
-
- Add != null check.
-
- This commit addresses #1152 (CVE-2018-18088).
+ Encoder: grow again buffer size in opj_tcd_code_block_enc_allocate_data() (fixes #1283)
-commit 0bc90e4062a5f9258c91eca018c019b179066c62
-Author: Hugo Lefeuvre <hle@debian.org>
-Date: 2018-10-22 16:59:41 +0200
+commit 15cf3d95814dc931ca0ecb132f81cb152e051bae
+Author: Even Rouault <even.rouault@spatialys.com>
+Date: 2020-11-23 18:14:02 +0100
- jp3d/jpwl convert: fix write stack buffer overflow
-
- Missing buffer length formatter in fscanf call might lead to write
- stack buffer overflow.
-
- fixes #1044 (CVE-2017-17480)
+ Encoder: grow again buffer size in opj_tcd_code_block_enc_allocate_data() (fixes #1283)
-commit 948332e6ed17565100d1df5f6fdbf66865218e36
-Author: Stefan Weil <sw@weilnetz.de>
-Date: 2018-10-31 20:44:30 +0100
+commit eaa098b59b346cb88e4d10d505061f669d7134fc
+Author: Even Rouault <even.rouault@spatialys.com>
+Date: 2020-11-23 13:49:05 +0100
- Fix some potential overflow issues (#1161)
-
- * Fix some potential overflow issues
-
- Put sizeof to the beginning of the multiplication to enforce that
- size_t instead of smaller integer types is used for the calculation.
-
- This fixes warnings from LGTM:
-
- Multiplication result may overflow 'unsigned int'
- before it is converted to 'unsigned long'.
-
- It also allows removing some type casts.
-
- Signed-off-by: Stefan Weil <sw@weilnetz.de>
-
- * Fix code indentation
-
- Signed-off-by: Stefan Weil <sw@weilnetz.de>
+ Encoder: grow buffer size in opj_tcd_code_block_enc_allocate_data() to avoid write heap buffer overflow in opj_mqc_flush (fixes #1283)
-commit e52909f4c7896c5efff3340d707c12d0df55d3f9
-Merge: cd900d9 943db0f
-Author: Even Rouault <even.rouault@mines-paris.org>
-Date: 2018-10-31 20:41:52 +0100
+commit 67ec360f48aeded95d06578e717bdf40a8e6d16f
+Author: Even Rouault <even.rouault@spatialys.com>
+Date: 2020-11-23 13:38:27 +0100
- Merge pull request #1163 from nforro/memory-and-resource-leaks
-
- Fix several memory and resource leaks
+ Fix typo in internal function name
-commit 943db0f1c28ca6a7df6d18483f97166a03be9bf7
-Author: Nikola Forró <nforro@redhat.com>
-Date: 2018-10-31 13:39:05 +0100
+commit 491299eb073c80602ca8ee333303a31a581d3fa8
+Merge: 65c8f57 1c5627e
+Author: Even Rouault <even.rouault@spatialys.com>
+Date: 2020-10-09 13:25:27 +0200
- Fix several memory and resource leaks
+ Merge pull request #1253 from rouault/floating_point_irreversible_encoding
- Signed-off-by: Nikola Forró <nforro@redhat.com>
+ Single-threaded performance improvements in forward DWT for 5-3 and 9-7 (and other improvements)
-commit cd900d96618ab77e79812db654731dd6b5fc7bd8
-Author: Even Rouault <even.rouault@spatialys.com>
-Date: 2018-10-18 11:45:45 +0200
+commit 65c8f577d2f057e80040e98958eae80ca76c6b94
+Author: Pei JIA <jiapei@longervision.com>
+Date: 2020-09-23 02:34:31 -0700
- opj_thread_pool_setup(): fix infinite waiting if a thread creation failed
+ Bump Java compatibility from 1.5 to 1.6 (#1263)
-commit 0e6a5553cfef21b764d289585af2c6934a95456b
-Merge: 8fc09e5 ca16fe5
-Author: Even Rouault <even.rouault@mines-paris.org>
-Date: 2018-09-22 23:54:12 +0200
+commit 0f16986738725799237548ce6a2ea12516850e72
+Merge: cbee789 0863ccf
+Author: Even Rouault <even.rouault@spatialys.com>
+Date: 2020-09-16 11:52:10 +0200
- Merge pull request #1148 from hlef/master
+ Merge pull request #1276 from rouault/fix_1243
- CVE-2018-5785: fix issues with zero bitmasks
+ Encoder: avoid uint32 overflow when allocating memory for codestream buffer (fixes #1243)
-commit 8fc09e50e557fa6af4c099b9c6d36bb1071ee1ed
+commit 0863ccf291238de15ca00da366b4c40fa9ffb673
Author: Even Rouault <even.rouault@spatialys.com>
-Date: 2018-09-22 23:47:56 +0200
+Date: 2020-09-16 11:27:53 +0200
- opj_jp2_apply_pclr(): remove useless assert that can trigger on some files (fixes #1125)
+ Encoder: avoid uint32 overflow when allocating memory for codestream buffer (fixes #1243)
-commit aaf48ee6bae91032f025f9ac11592c4085a0d96b
-Merge: ee827ad cc38247
+commit cbee7891a0ee664dd83ca09553d2e30da716a883
+Merge: 172c8ae e8e258a
Author: Even Rouault <even.rouault@spatialys.com>
-Date: 2018-09-22 23:12:50 +0200
+Date: 2020-06-30 22:05:13 +0200
- Merge branch 'pr1095'
+ Merge pull request #1262 from rouault/fix_1261
+
+ opj_decompress: fix double-free on input directory with mix of valid and invalid images
-commit cc3824767bde397fedb8a1ae4786a222ba860c8d
-Author: Karol Babioch <kbabioch@suse.de>
-Date: 2018-03-02 14:40:58 +0100
+commit e8e258ab049240c2dd1f1051b4e773b21e2d3dc0
+Author: Even Rouault <even.rouault@spatialys.com>
+Date: 2020-06-28 14:19:59 +0200
- opj_mj2_extract: Check provided output prefix for length
+ opj_decompress: fix double-free on input directory with mix of valid and invalid images (CVE-2020-15389)
- This uses snprintf() with correct buffer length instead of sprintf(), which
- prevents a buffer overflow when providing a long output prefix. Furthermore
- the program exits with an error when the provided output prefix is too long.
+ Fixes #1261
- Fixes #1088.
+ Credits to @Ruia-ruia for reporting and analysis.
-commit ee827ad3f32469d4854b2da71c9703a2af359f9f
-Merge: 5d94bcd 1eb9a57
+commit 172c8ae5cf230ff74b5814daf29e5b577aa30a9b
+Merge: e252438 b028e8d
Author: Even Rouault <even.rouault@spatialys.com>
-Date: 2018-09-22 23:05:54 +0200
-
- Merge branch 'pr1107'
-
-commit 1eb9a57ac1216209a4d9adf87bc47ba19810d3b3
-Author: szukw000 <szukw000@arcor.de>
-Date: 2018-03-13 18:11:54 +0100
-
- opj_mj2_extract: Avoid segfault for long filenames
-
-commit 5d94bcd89c6e281614955c56cbfebb11b866a9dd
-Merge: b54c06f 0fa7ebe
-Author: Even Rouault <even.rouault@mines-paris.org>
-Date: 2018-09-22 22:59:36 +0200
+Date: 2020-06-22 22:35:44 +0200
- Merge pull request #1136 from reverson/master
+ Merge pull request #1260 from sebras/fix-issue-1259
- Cast on uint ceildiv
+ openjp2: Plug image leak when failing to allocate codestream index.
-commit b54c06fb350d318c8e74755710b3480eae3b9911
-Merge: 17bbb0e 4aaf52e
-Author: Even Rouault <even.rouault@mines-paris.org>
-Date: 2018-09-22 22:59:17 +0200
+commit e252438d5e23e6ba9561e73a5a4754713bfd626a
+Merge: 98150d0 79b199a
+Author: Even Rouault <even.rouault@spatialys.com>
+Date: 2020-06-22 22:12:08 +0200
- Merge pull request #1119 from stweil/ssize_t
+ Merge pull request #1258 from sebras/fix-issue-1257
- Use local type declaration for POSIX standard type only for MS compiler
+ openjp2: Plug memory leak when setting data as TLS fails.
-commit 17bbb0e23ff03bb722914841a9b962b21fe7a310
-Merge: ccc4441 3d6ffaf
-Author: Even Rouault <even.rouault@mines-paris.org>
-Date: 2018-09-22 22:55:33 +0200
+commit b028e8d1ce7798f61c35b1b20d836f80d78a35d0
+Author: Sebastian Rasmussen <sebras@gmail.com>
+Date: 2020-06-23 02:18:19 +0800
- Merge pull request #1128 from stweil/typos
+ openjp2: Plug image leak when failing to allocate codestream index.
- Fix some typos in code comments and documentation
+ This fixes issue #1259.
-commit ccc4441aeb7bf4928e55bd543fab8de662f6d5e7
-Merge: c6ee006 24fd3ce
-Author: Even Rouault <even.rouault@mines-paris.org>
-Date: 2018-09-22 22:54:51 +0200
+commit 79b199a8fee2a0d51d4389fcde3f5f4dd01971eb
+Author: Sebastian Rasmussen <sebras@gmail.com>
+Date: 2020-06-23 02:18:19 +0800
- Merge pull request #1140 from bukatlib/fix_relpath
+ openjp2: Plug memory leak when setting data as TLS fails.
- Relative path to header files is hardcoded in OpenJPEGConfig.cmake.in file
+ Previously the Tier 1 handle was not freed when setting it as
+ TLS failed.
+
+ This fixes issue #1257.
-commit c6ee006250b093f443e226288c6c866c5ebe12f5
-Merge: 2d28610 98363e2
-Author: Even Rouault <even.rouault@mines-paris.org>
-Date: 2018-09-22 22:47:27 +0200
+commit 98150d09422149305c9c8648337a744df5786fbe
+Merge: 25fb144 93b9f72
+Author: Even Rouault <even.rouault@spatialys.com>
+Date: 2020-06-22 21:03:23 +0200
- Merge pull request #1141 from szukw000/changes-in-pnmtoimage
+ Merge pull request #1256 from sebras/master
- Changes in pnmtoimage if image data are missing
+ openjp2: Error out if failing to create Tier 1 handle.
-commit 2d2861036cfb68560e0cf21340760781ea78595d
-Merge: 1b9a81d 31a03b3
-Author: Even Rouault <even.rouault@mines-paris.org>
-Date: 2018-09-22 22:28:04 +0200
+commit 93b9f7236ce09614ea5edcb0f616f1b4095c4830
+Author: Sebastian Rasmussen <sebras@gmail.com>
+Date: 2020-06-23 02:18:19 +0800
- Merge pull request #1143 from stweil/format
+ openjp2: Error out if failing to create Tier 1 handle.
+
+ Previously when the handle failed to be created (e.g. when
+ opj_calloc returned NULL due to low memory), the code still
+ assumed that the t1 handle pointer was valid and dereferenced
+ NULL, causing a crash. After this commit OpenJPEG will instead
+ error out under this condition.
- openjp2/jp2: Fix two format strings
+ This fixes issue #1255.
-commit 1b9a81dff7c22ed0cb22bf1033e6dfee1292da31
-Merge: 9d1a9dc c28ed52
-Author: Even Rouault <even.rouault@mines-paris.org>
-Date: 2018-09-22 22:27:14 +0200
+commit 25fb144c42f97489594302e1e6ff886791e0a5b3
+Author: szukw000 <szukw000@arcor.de>
+Date: 2020-06-10 17:40:50 +0200
- Merge pull request #1149 from rouault/fix_knownfailures
-
- Update knownfailures- files given current configurations
+ Testing for invalid values of width, height, numcomps (#1254)
-commit c28ed521633c074f1e4891208028fe97f7602a14
+commit 1c5627ee7406f84cfb40809b7ac31c63342427df
Author: Even Rouault <even.rouault@spatialys.com>
-Date: 2018-09-22 21:56:50 +0200
+Date: 2020-05-24 15:38:21 +0200
- Update knownfailures- files given current configurations
+ T1 encoder: speed-up by aggressive inlining and more cache friendly data organization
+
+ ~ 9% speed improvement seen on 10980x10980 uint16 image, T36JTT_20160914T074612_B02.tif
+ opj_compress time from 17.2s to 15.8s
-commit ca16fe55014c57090dd97369256c7657aeb25975
-Author: Hugo Lefeuvre <hle@debian.org>
-Date: 2018-09-22 14:33:19 -0400
+commit 1e931fdb3655c64ab60ea5657f79309331a86485
+Author: Even Rouault <even.rouault@spatialys.com>
+Date: 2020-05-22 23:57:51 +0200
- convertbmp: fix issues with zero bitmasks
-
- In the case where a BMP file declares compression 3 (BI_BITFIELDS)
- with header size <= 56, all bitmask values keep their initialization
- value 0. This may lead to various undefined behavior later e.g. when
- doing 1 << (l_comp->prec - 1).
-
- This issue does not affect files with bit count 16 because of a check
- added in 16240e2 which sets default values to the color masks if they
- are all 0.
-
- This commit adds similar checks for the 32 bit case.
-
- Also, if a BMP file declares compression 3 with header size >= 56 and
- intentional 0 bitmasks, the same issue will be triggered in both the
- 16 and 32 bit count case.
+ Forward DWT 9-7: major speed up by vectorizing vertical pass
- This commit adds checks to bmp_read_info_header() rejecting BMP files
- with "intentional" 0 bitmasks. These checks might be removed in the
- future when proper handling of zero bitmasks will be available in
- openjpeg2.
-
- fixes #1057 (CVE-2018-5785)
+ `bench_dwt -I -encode` times goes from 8.6s to 2.1s
-commit 31a03b390a77bfbe4b0f140121d1296acb611f76
-Author: Stefan Weil <sw@weilnetz.de>
-Date: 2018-09-05 21:51:30 +0200
+commit a38e970fa59abd796c703ec469e578b09f7ffa33
+Author: Even Rouault <even.rouault@spatialys.com>
+Date: 2020-05-22 17:50:15 +0200
- openjp2/jp2: Fix two format strings
+ Forward DWT 5-3: major speed up by vectorizing vertical pass
- Compiler warnings:
-
- src/lib/openjp2/jp2.c:1008:35: warning:
- too many arguments for format [-Wformat-extra-args]
- src/lib/openjp2/j2k.c:1928:73: warning:
- format ‘%d’ expects argument of type ‘int’, but argument 4 has type ‘OPJ_OFF_T {aka long int}’ [-Wformat=]
-
- Signed-off-by: Stefan Weil <sw@weilnetz.de>
+ `bench_dwt -encode` times goes from 7.9s to 1.7s
-commit 3d6ffaf3f3463b62830f88f50a8c1b510f555eb5
-Author: Stefan Weil <sw@weilnetz.de>
-Date: 2018-07-30 21:04:28 +0200
+commit e69fa09f604bc472f9fbff5c2b2db65e8dbe2418
+Author: Even Rouault <even.rouault@spatialys.com>
+Date: 2020-05-22 15:58:47 +0200
- Fix some typos in code comments and documentation
-
- All typos were found by Codespell.
-
- Signed-off-by: Stefan Weil <sw@weilnetz.de>
+ Forward DWT: small code refactoring to allow future improvements for the vertical pass
-commit 98363e244e027c731f73ee8239d3c19451a9153b
-Author: szukw000 <szukw000@arcor.de>
-Date: 2018-08-31 16:24:41 +0200
+commit 33d3d0de07be710f53940c7548b9f2bd58ff3210
+Author: Even Rouault <even.rouault@spatialys.com>
+Date: 2020-05-22 15:06:29 +0200
- Changes in pnmtoimage if image data are missing
+ dwt.c: remove unused typedef
-commit 24fd3ce777a64b8b315cfe1ee642ec7b1cc6aa97
-Author: Libor Bukata <libor.bukata@oracle.com>
-Date: 2018-08-31 12:57:40 +0200
+commit 97b384aecdeea0c286213f5caf6244ec08ea32d7
+Author: Even Rouault <even.rouault@spatialys.com>
+Date: 2020-05-22 15:03:40 +0200
- The change makes a relative path to header files
- always correct regardless of the number of sub-
- directories in OPENJPEG_INSTALL_PACKAGE_DIR variable.
+ Forward DWT 5x3: performance improvements in horizontal pass, and modest in vertical pass
-commit 0fa7ebe2540990f590c2247b3505ac1dc84b6eec
-Author: Robert Everson <robert@reverson.net>
-Date: 2018-08-27 15:28:53 -0700
+commit bd5f5ee7dea851aedae630fee094ef3b0ff0c888
+Author: Even Rouault <even.rouault@spatialys.com>
+Date: 2020-05-21 21:20:19 +0200
- Cast on uint ceildiv
+ Forward DWT: small code refactoring to allow future improvements for the horizontal pass
-commit 9d1a9dc20dd5155bab977a4f53d05c4bbd66533a
-Merge: d2205ba 56f23b2
-Author: Even Rouault <even.rouault@mines-paris.org>
-Date: 2018-08-11 23:35:35 +0200
+commit 45a35223b79dee65a0059f999b690072e829669f
+Author: Even Rouault <even.rouault@spatialys.com>
+Date: 2020-05-21 16:54:48 +0200
- Merge pull request #1133 from robe2/robe2-pkgconfig-instructions
+ Speed-up 9x7 IDWD by ~30% with OPJ_NUM_THREADS=2
- Add -DBUILD_PKGCONFIG_FILES to install instructions
+ "bench_dwt -I" time goes from 2.2s to 1.5s
-commit 56f23b29a075467fc2377ba086c0263a3eb70fe6
-Author: Regina Obe <lr@pcorp.us>
-Date: 2018-08-11 16:59:30 -0400
+commit 272b3e0fb2530ca8bffdc8c64f1505a8ff5f6ecc
+Author: Even Rouault <even.rouault@spatialys.com>
+Date: 2020-05-21 11:24:29 +0200
- Add -DBUILD_PKGCONFIG_FILES to install instructions
+ Remove useless + 5U margin in opj_dwt_decode_tile_97()
- Building under msys/mingw doesn't automatically install the pkg config files needed to build GDAL and other libraries
+ Nothing in code analysis nor test suite shows that this margin is
+ needed.
+ It dates back to commit dbeebe72b9d35f6ff807c21c7f217b569fa894f6
+ where vector 9x7 decoding was introduced.
-commit d2205ba2ee78faeea659263383446c4472b1f9df
-Merge: fd205f4 4170681
-Author: Even Rouault <even.rouault@mines-paris.org>
-Date: 2018-06-20 16:26:24 +0200
+commit 47943daa15983d20ab1ffd0a237125f1493c5658
+Author: Even Rouault <even.rouault@spatialys.com>
+Date: 2020-05-21 11:23:00 +0200
- Merge pull request #1121 from rouault/fix_tnsot_zero
+ Speed-up 9x7 IDWD by ~20%
- Fix regression in reading files with TNsot == 0 (refs #1120)
+ "bench_dwt -I" time goes from 2.8s to 2.2s
-commit 4170681661126bc9c1348a0183633dc2f4fc8b05
+commit 0c09062464fe74f62fb9a4da829992c6a8bd7920
Author: Even Rouault <even.rouault@spatialys.com>
-Date: 2018-06-20 15:06:16 +0200
+Date: 2020-05-20 23:20:48 +0200
+
+ bench_dwt.c: add a -I switch to test irreversible FWDT/IDWT
- Add test cases for https://github.com/uclouvain/openjpeg/issues/1120 and https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=2785
+commit 19ef7f26c43f689b627aad642da7f6150893b863
+Merge: 1d358f2 f3ee448
+Author: Even Rouault <even.rouault@spatialys.com>
+Date: 2020-05-20 21:10:55 +0200
+
+ Merge pull request #1211 from sebras/master
+
+ Add check to validate SGcod/SPcoc/SPcod parameter values.
-commit 0c913b0aba409148b51ca43d45c50ae595449723
+commit adccbc8336ce5c46ca7de85ac364d9c992d337c7
Author: Even Rouault <even.rouault@spatialys.com>
-Date: 2018-06-20 14:54:09 +0200
+Date: 2020-05-20 19:24:09 +0200
- Avoid assertion when running opj_j2k_merge_ppt() several time due to e6674f7ed66abdb32a0be5944f618722b6a7b5d5 revert. Fixes https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=2785
+ Irreversible decoding: partially revert previous commit, to fix failures in test suite
-commit 832dfd18665da08745748bde2d2563f00c7cd9e7
+commit 1d358f25c8eabbc7c274bcc148f4f5d594ec13fe
+Merge: 64689d0 4edb8c8
Author: Even Rouault <even.rouault@spatialys.com>
-Date: 2018-06-20 14:38:41 +0200
+Date: 2020-05-20 20:29:31 +0200
- Revert "Avoid assertion in opj_j2k_merge_ppt() in case premature EOC is encountered in opj_j2k_read_tile_header(). Fixes https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=2785. Credit to OSS Fuzz" (fixes #1120)
+ Merge pull request #1246 from rouault/write_plt
- This reverts commit 9906fbf737692486cebabe98169988d818e2e66a.
- which broke decoding of images where TNsot == 0
+ Add support for generation of PLT markers in encoder
-commit 4aaf52ec8d8ec7b94c73f77f9c0029a3d3cabbf9
-Author: Stefan Weil <sw@weilnetz.de>
-Date: 2018-06-18 14:06:25 +0200
+commit 4edb8c83374f52cd6a8f2c7c875e8ffacccb5fa5
+Author: Even Rouault <even.rouault@spatialys.com>
+Date: 2020-04-21 15:55:44 +0200
- Use local type declaration for POSIX standard type only for MS compiler
+ Add support for generation of PLT markers in encoder
- ssize_t is a POSIX type which is declared in POSIX include files.
- Mingw-w64 provides it also for Windows.
+ * -PLT switch added to opj_compress
+ * Add a opj_encoder_set_extra_options() function that
+ accepts a PLT=YES option, and could be expanded later
+ for other uses.
- Use the local declaration only with MS compilers.
+ -------
- Signed-off-by: Stefan Weil <sw@weilnetz.de>
+ Testing with a Sentinel2 10m band, T36JTT_20160914T074612_B02.jp2,
+ coming from S2A_MSIL1C_20160914T074612_N0204_R135_T36JTT_20160914T081456.SAFE
+
+ Decompress it to TIFF:
+ ```
+ opj_uncompress -i T36JTT_20160914T074612_B02.jp2 -o T36JTT_20160914T074612_B02.tif
+ ```
+
+ Recompress it with similar parameters as original:
+ ```
+ opj_compress -n 5 -c [256,256],[256,256],[256,256],[256,256],[256,256] -t 1024,1024 -PLT -i T36JTT_20160914T074612_B02.tif -o T36JTT_20160914T074612_B02_PLT.jp2
+ ```
+
+ Dump codestream detail with GDAL dump_jp2.py utility (https://github.com/OSGeo/gdal/blob/master/gdal/swig/python/samples/dump_jp2.py)
+ ```
+ python dump_jp2.py T36JTT_20160914T074612_B02.jp2 > /tmp/dump_sentinel2_ori.txt
+ python dump_jp2.py T36JTT_20160914T074612_B02_PLT.jp2 > /tmp/dump_sentinel2_openjpeg_plt.txt
+ ```
+
+ The diff between both show very similar structure, and identical number of packets in PLT markers
+
+ Now testing with Kakadu (KDU803_Demo_Apps_for_Linux-x86-64_200210)
+
+ Full file decompression:
+ ```
+ kdu_expand -i T36JTT_20160914T074612_B02_PLT.jp2 -o tmp.tif
+
+ Consumed 121 tile-part(s) from a total of 121 tile(s).
+ Consumed 80,318,806 codestream bytes (excluding any file format) = 5.329697
+ bits/pel.
+ Processed using the multi-threaded environment, with
+ 8 parallel threads of execution
+ ```
+
+ Partial decompresson (presumably using PLT markers):
+ ```
+ kdu_expand -i T36JTT_20160914T074612_B02.jp2 -o tmp.pgm -region "{0.5,0.5},{0.01,0.01}"
+ kdu_expand -i T36JTT_20160914T074612_B02_PLT.jp2 -o tmp2.pgm -region "{0.5,0.5},{0.01,0.01}"
+ diff tmp.pgm tmp2.pgm && echo "same !"
+ ```
+
+ -------
+
+ Funded by ESA for S2-MPC project
-commit fd205f457b157e925e2a6eb03aba397b45b0ed4e
+commit 64689d05dfaaf52105581d93fb1eb173b20829a4
Author: Even Rouault <even.rouault@spatialys.com>
-Date: 2018-06-16 16:17:58 +0200
+Date: 2020-04-18 18:25:44 +0200
- opj_compress: try to make help message of -c switch clearer (fixes #1117)
+ struct opj_j2k: remove unused fields, and add some documentation
-commit 2c7eb4fed9cbed43ae402840f6706998ce2dd1c4
+commit 774889a328abd5d3c280d9a897f1ac4c672cb0e5
+Merge: b6b7e96 271a71e
Author: Even Rouault <even.rouault@spatialys.com>
-Date: 2018-03-12 14:24:20 +0100
+Date: 2020-04-17 00:39:46 +0200
- opj_compress: fix help message regarding default precinct size
+ Merge pull request #1244 from rouault/fix_pi_warnings
+
+ Fix warnings about signed/unsigned casts in pi.c
-commit a59512e0990c5923de77a542a1386edee32acd47
-Merge: 3910be8 8ad94f6
-Author: Even Rouault <even.rouault@mines-paris.org>
-Date: 2018-03-04 23:54:09 +0100
+commit b6b7e96b0cf7819ef6a2e8ba2f8bdaaf938326ed
+Author: szukw000 <szukw000@arcor.de>
+Date: 2020-04-17 00:37:33 +0200
- Merge pull request #1104 from rouault/macos_fix
-
- Fix Mac builds
+ color_apply_icc_profile: add checks on the number of components (#1236)
+
+commit 271a71ef0f1dd4740c9f4474279c7da8d15850c9
+Author: Even Rouault <even.rouault@spatialys.com>
+Date: 2020-04-16 20:52:44 +0200
+
+ Fix warnings about signed/unsigned casts in pi.c
+
+commit f3ee448815eb992b8d4746e32c05e8289f30415f
+Author: Sebastian Rasmussen <sebras@gmail.com>
+Date: 2018-10-31 15:56:11 +0100
+
+ openjp2/j2k: Validate all SGcod/SPcod/SPcoc parameter values.
+
+ Previously the multiple component transformation SGcod(C)
+ and wavelet transformation SPcod(H)/SPcoc(E) parameter
+ values were never checked, allowing for out of range values.
+
+ The lack of validation allowed the bit stream provided in
+ issue #1158 through. After this commit an error message
+ points to the marker segments' parameters as being out of
+ range.
+
+ input/nonregression/edf_c2_20.jp2 contains an SPcod(H) value
+ of 17, but according to Table A-20 of the specification only
+ values 0 and 1 are valid. input/nonregression/issue826.jp2
+ contains a SGcod(B) value of 2, but according to Table A-17
+ of the specification only values 0 and 1 are valid.
+ input/nonregression/oss-fuzz2785.jp2 contains a SGcod(B)
+ value of 32, but it is likewise limited to 0 or 1. These test
+ cases have been updated to consistently fail to parse the
+ headers since they contain out of bounds values.
+
+ This fixes issue #1210.
...</pre></div>
projects / openjpeg.git / blobdiff