6daf5f3e1e
Encoder: avoid global buffer overflow on irreversible conversion when too many decomposition levels are specified ( fixes #1286 )
2020-11-30 23:29:06 +01:00
2d119d03a0
Merge pull request #1291 from rouault/tnsot_zero_missing_eoc
...
Decoding: deal with some SPOT6 images that have tiles with a single tile-part with TPsot == 0 and TNsot == 0, and with missing EOC
2020-11-30 23:28:31 +01:00
b2072402b7
pngtoimage(): fix wrong computation of x1,y1 if -d option is used, that would result in a heap buffer overflow ( fixes #1284 )
2020-11-30 22:31:51 +01:00
1aa3c60859
Decoding: deal with some SPOT6 images that have tiles with a single tile-part with TPsot == 0 and TNsot == 0, and with missing EOC
2020-11-30 17:53:04 +01:00
a2b2980a4b
Merge pull request #1288 from zodf0055980/master
...
Free p_tcd_marker_info to avoid memory leak
2020-11-27 14:25:11 +01:00
4f487798ba
Free p_tcd_marker_info to avoid memory leak
2020-11-26 00:22:49 +08:00
0c0f27f17d
Merge pull request #1287 from zodf0055980/master
...
Encoder: grow again buffer size
2020-11-25 16:59:46 +01:00
649298dcf8
Encoder: grow again buffer size in opj_tcd_code_block_enc_allocate_data() ( fixes #1283 )
2020-11-25 20:41:39 +08:00
15cf3d9581
Encoder: grow again buffer size in opj_tcd_code_block_enc_allocate_data() ( fixes #1283 )
2020-11-23 18:14:02 +01:00
eaa098b59b
Encoder: grow buffer size in opj_tcd_code_block_enc_allocate_data() to avoid write heap buffer overflow in opj_mqc_flush ( fixes #1283 )
2020-11-23 13:49:05 +01:00
67ec360f48
Fix typo in internal function name
2020-11-23 13:38:27 +01:00
491299eb07
Merge pull request #1253 from rouault/floating_point_irreversible_encoding
...
Single-threaded performance improvements in forward DWT for 5-3 and 9-7 (and other improvements)
2020-10-09 13:25:27 +02:00
65c8f577d2
Bump Java compatibility from 1.5 to 1.6 ( #1263 )
2020-09-23 11:34:31 +02:00
0f16986738
Merge pull request #1276 from rouault/fix_1243
...
Encoder: avoid uint32 overflow when allocating memory for codestream buffer (fixes #1243 )
2020-09-16 11:52:10 +02:00
0863ccf291
Encoder: avoid uint32 overflow when allocating memory for codestream buffer ( fixes #1243 )
2020-09-16 11:27:53 +02:00
cbee7891a0
Merge pull request #1262 from rouault/fix_1261
...
opj_decompress: fix double-free on input directory with mix of valid and invalid images
2020-06-30 22:05:13 +02:00
e8e258ab04
opj_decompress: fix double-free on input directory with mix of valid and invalid images (CVE-2020-15389)
...
Fixes #1261
Credits to @Ruia-ruia for reporting and analysis.
2020-06-30 21:31:19 +02:00
172c8ae5cf
Merge pull request #1260 from sebras/fix-issue-1259
...
openjp2: Plug image leak when failing to allocate codestream index.
2020-06-22 22:35:44 +02:00
e252438d5e
Merge pull request #1258 from sebras/fix-issue-1257
...
openjp2: Plug memory leak when setting data as TLS fails.
2020-06-22 22:12:08 +02:00
b028e8d1ce
openjp2: Plug image leak when failing to allocate codestream index.
...
This fixes issue #1259 .
2020-06-23 03:42:25 +08:00
79b199a8fe
openjp2: Plug memory leak when setting data as TLS fails.
...
Previously the Tier 1 handle was not freed when setting it as
TLS failed.
This fixes issue #1257 .
2020-06-23 03:21:31 +08:00
98150d0942
Merge pull request #1256 from sebras/master
...
openjp2: Error out if failing to create Tier 1 handle.
2020-06-22 21:03:23 +02:00
93b9f7236c
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.
This fixes issue #1255 .
2020-06-23 02:32:31 +08:00
25fb144c42
Testing for invalid values of width, height, numcomps ( #1254 )
2020-06-10 17:40:50 +02:00
1c5627ee74
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
2020-05-24 15:38:48 +02:00
1e931fdb36
Forward DWT 9-7: major speed up by vectorizing vertical pass
...
`bench_dwt -I -encode` times goes from 8.6s to 2.1s
2020-05-23 01:01:05 +02:00
a38e970fa5
Forward DWT 5-3: major speed up by vectorizing vertical pass
...
`bench_dwt -encode` times goes from 7.9s to 1.7s
2020-05-23 01:01:05 +02:00
e69fa09f60
Forward DWT: small code refactoring to allow future improvements for the vertical pass
2020-05-22 16:01:45 +02:00
33d3d0de07
dwt.c: remove unused typedef
2020-05-22 15:06:29 +02:00
97b384aecd
Forward DWT 5x3: performance improvements in horizontal pass, and modest in vertical pass
2020-05-22 15:03:40 +02:00
bd5f5ee7de
Forward DWT: small code refactoring to allow future improvements for the horizontal pass
2020-05-22 15:02:33 +02:00
45a35223b7
Speed-up 9x7 IDWD by ~30% with OPJ_NUM_THREADS=2
...
"bench_dwt -I" time goes from 2.2s to 1.5s
2020-05-21 17:21:55 +02:00
272b3e0fb2
Remove useless + 5U margin in opj_dwt_decode_tile_97()
...
Nothing in code analysis nor test suite shows that this margin is
needed.
It dates back to commit dbeebe72b9
2020-05-21 15:42:51 +02:00
47943daa15
Speed-up 9x7 IDWD by ~20%
...
"bench_dwt -I" time goes from 2.8s to 2.2s
2020-05-21 15:42:51 +02:00
0c09062464
bench_dwt.c: add a -I switch to test irreversible FWDT/IDWT
2020-05-20 23:20:48 +02:00
19ef7f26c4
Merge pull request #1211 from sebras/master
...
Add check to validate SGcod/SPcoc/SPcod parameter values.
2020-05-20 21:10:55 +02:00
adccbc8336
Irreversible decoding: partially revert previous commit, to fix failures in test suite
2020-05-20 20:31:28 +02:00
3cd1305596
Irreversible compression/decompression DWT: use 1/K constant as per standard
...
The previous constant opj_c13318 was mysteriously equal to 2/K , and in
the DWT, we had to divide K and opj_c13318 by 2... The issue was that the
band->stepsize computation in tcd.c didn't take into account the log2gain of
the band.
The effect of this change is expected to be mostly equivalent to the previous
situation, except some difference in rounding. But it leads to a dramatic
reduction of the mean square error and peak error in the irreversible encoding
of issue141.tif !
2020-05-20 20:31:28 +02:00
f38c069547
Irreversible decoding: align code more closely to the standard by avoid messing up with stepsize (no functional change)
2020-05-20 20:31:28 +02:00
e46e300de5
opj_dwt_encode_1_real(): avoid many bound comparisons, similarly to decoding side
2020-05-20 20:31:28 +02:00
4ab2ed0907
opj_j2k_setup_encoder(): add validation of tile width and height to avoid potential division by zero
2020-05-20 20:31:28 +02:00
c6a413a423
opj_mct_encode_real(): add SSE optimization
2020-05-20 20:31:28 +02:00
fe4c15f12c
Testing: revise testing of lossy encoding by comparing PEAK and MSE with original image
2020-05-20 20:31:28 +02:00
c2b9d09c65
compare_images.c: code reformatting
2020-05-20 20:31:28 +02:00
3d35d0f3af
tcd.c: add comment
2020-05-20 20:31:28 +02:00
00cff6f5c0
Encoder: use floating-point operations for irreversible transformation
2020-05-20 20:31:28 +02:00
99107d5e46
dwt.c: change sign of constants to match standard and compensate (no functional change)
2020-05-20 20:31:28 +02:00
07d1f775a1
Add multithreaded support in the DWT encoder.
...
Update the bench_dwt utility to have a -decode/-encode switch
Measured performance gains for DWT encoder on a
Intel(R) Core(TM) i7-6700HQ CPU @ 2.60GHz (4 cores, hyper threaded)
Encoding time:
$ ./bin/bench_dwt -encode -num_threads 1
time for dwt_encode: total = 8.348 s, wallclock = 8.352 s
$ ./bin/bench_dwt -encode -num_threads 2
time for dwt_encode: total = 9.776 s, wallclock = 4.904 s
$ ./bin/bench_dwt -encode -num_threads 4
time for dwt_encode: total = 13.188 s, wallclock = 3.310 s
$ ./bin/bench_dwt -encode -num_threads 8
time for dwt_encode: total = 30.024 s, wallclock = 4.064 s
Scaling is probably limited by memory access patterns causing
memory access to be the bottleneck.
The slightly worse results with threads==8 than with thread==4
is due to hyperthreading being not appropriate here.
2020-05-20 20:30:21 +02:00
97eb7e0bf1
Add multithreading support in the T1 (entropy phase) encoder
...
- API wise, opj_codec_set_threads() can be used on the encoding side
- opj_compress has a -threads switch similar to opj_uncompress
2020-05-20 20:30:21 +02:00
1d358f25c8
Merge pull request #1246 from rouault/write_plt
...
Add support for generation of PLT markers in encoder
2020-05-20 20:29:31 +02:00
Even Rouault
yuan
Pei JIA
Sebastian Rasmussen
szukw000