openjpeg/src/lib/openjp2/jp2.c, branch v2.3.0Fork of openjpeg library for JPEG2000 encoding and decodinghttps://git.carlh.net/cgit/openjpeg/atom?h=v2.3.02017-09-26T21:30:20ZMerge pull request #1022 from rouault/partial_component_decoding2017-09-26T21:30:20ZAntonin Descampeantonin@descampe.net2017-09-26T21:30:20Zurn:sha1:d45ccb048bb2166c5d975f4e1b8acaf8ba3d198d
Add capability to decode only a subset of all components of an image.Fix badly named variable in function prototype (raised by cppcheck)2017-09-19T16:35:07ZEven Rouaulteven.rouault@spatialys.com2017-09-19T16:35:07Zurn:sha1:c84e594cffb181b96f522becf1ba0302e2cc6da7Add capability to decode only a subset of all components of an image.2017-09-19T15:06:19ZEven Rouaulteven.rouault@spatialys.com2017-09-19T14:52:07Zurn:sha1:7e2b6bebff12eab8bdc17fc9af017e8c11652f4f
This adds a opj_set_decoded_components(opj_codec_t *p_codec,
OPJ_UINT32 numcomps, const OPJ_UINT32* comps_indices) function,
and equivalent "opj_decompress -c compno[,compno]*" option.
When specified, neither the MCT transform nor JP2 channel transformations
will be applied.
Tests added for various combinations of whole image vs tiled-based decoding,
full or reduced resolution, use of decode area or not.
Use opj_image_data_free() where appropriate (adapted from https://github.com/uclouvain/openjpeg/pull/1015/commits/dab9db0723a5bb9f3d745f9dd7a0b8b3b18b8054, #1014)2017-09-08T07:16:51ZEven Rouaulteven.rouault@spatialys.com2017-09-08T07:16:51Zurn:sha1:b73ce715d2a484d7355639d863d0418a0e5b8858Fix invalid access out of bounds, and bad behaviour, when calling repeatdly opj_get_decoded_tile() on an image with a color palette2017-09-06T15:33:38ZEven Rouaulteven.rouault@spatialys.com2017-09-06T15:33:38Zurn:sha1:c67e1cd73f6c1fca081f5445af4f65b240c40edcAvoid asserting on assert(i == pcol) in opj_jp2_apply_pclr() by adding new check in opj_jp2_check_color(). Fixes https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=3068. Credit to OSS Fuzz2017-08-17T09:05:53ZEven Rouaulteven.rouault@spatialys.com2017-08-17T09:05:53Zurn:sha1:09e83407fa2b53c606d3179031b8d8b31272e20cPartial revert BPC related check of #975 (#979)2017-08-09T09:34:08ZEven Rouaulteven.rouault@spatialys.com2017-08-09T09:34:08Zurn:sha1:ac375ac9f5b4ae47501b60795e905e3d25dd00f8
PR #975 introduced a check that rejects images that have different bit depth/sign
per compoment in SIZ marker if the JP2 IHDR box has BPC != 255
This didn't work properly if decoding a .j2k file since the new bit added in
opj_cp_t wasn't initialized to the right value.
For clarity, tThis new bit has also been renamed to allow_different_bit_depth_sign
But looking closer at the code, it seems we were already tolerant to inconsistencies.
For example we parsed a JP2 BPCC box even if BPC != 255 (just a warning is emitted)
So failing hard in opj_j2k_read_siz() wouldn't be very inconsistent, and that
alone cannot protect against other issues, so just emit a warning if BPC != 255
and the SIZ marker contains different bit depth/sign per component.
Note: we could also check that the content of JP2 BPCC box is consistant with the one
of the SIZ marker.
Merge pull request #975 from szukw000/changes-for-afl-tests2017-08-08T23:51:54ZAntonin Descampeantonin@descampe.net2017-08-08T23:51:54Zurn:sha1:0394f8d0f1c981e0bc587beddc14d1fb0b265b1b
Catch images broken by AFLopj_jp2_apply_pclr() also needs to use opj_image_data_alloc/opj_image_data_free2017-08-07T16:32:52ZEven Rouaulteven.rouault@spatialys.com2017-07-06T00:17:26Zurn:sha1:434ace4ff74cc3eee401d4d3c02668c1d85f2a0dFirst change on changes-for-afl-tests2017-08-02T15:27:08Zszukw000szukw000@arcor.de2017-08-02T15:27:08Zurn:sha1:57e36dbfeb57451444c5c20eab66ab0bedd3d3b3