summaryrefslogtreecommitdiff
path: root/src/lib/openjp2/j2k.h
diff options
context:
space:
mode:
authorEven Rouault <even.rouault@spatialys.com>2017-08-09 11:34:08 +0200
committerEven Rouault <even.rouault@spatialys.com>2017-08-09 11:34:08 +0200
commitac375ac9f5b4ae47501b60795e905e3d25dd00f8 (patch)
tree8652897719b54db0a388fde6efe88d0ab1d72101 /src/lib/openjp2/j2k.h
parentc38bdbef4f3a5888948903247532fc8cf4284c00 (diff)
Partial revert BPC related check of #975 (#979)
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.
Diffstat (limited to 'src/lib/openjp2/j2k.h')
-rw-r--r--src/lib/openjp2/j2k.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/lib/openjp2/j2k.h b/src/lib/openjp2/j2k.h
index eeef6a9e..d61c96db 100644
--- a/src/lib/openjp2/j2k.h
+++ b/src/lib/openjp2/j2k.h
@@ -446,7 +446,8 @@ typedef struct opj_cp {
OPJ_BITFIELD ppm : 1;
/** tells if the parameter is a coding or decoding one */
OPJ_BITFIELD m_is_decoder : 1;
- OPJ_BITFIELD bpc_is_255 : 1;
+ /** whether different bit depth or sign per component is allowed. Decoder only for ow */
+ OPJ_BITFIELD allow_different_bit_depth_sign : 1;
/* <<UniPG */
} opj_cp_t;