diff --git a/abi-check/abi_dump/openjpeg/current/2c999/ABI.dump b/abi-check/abi_dump/openjpeg/current/2c999/ABI.dump
index 59e2b7c2..147b13f8 100644
--- a/abi-check/abi_dump/openjpeg/current/2c999/ABI.dump
+++ b/abi-check/abi_dump/openjpeg/current/2c999/ABI.dump
@@ -207,7 +207,7 @@ $VAR1 = {
'Source' => 'cio.c',
'SourceLine' => '271'
},
- '168209' => {
+ '168224' => {
'Header' => 'openjpeg.h',
'Line' => '1062',
'Return' => '156',
@@ -215,13 +215,13 @@ $VAR1 = {
'Source' => 'openjpeg.c',
'SourceLine' => '160'
},
- '168537' => {
+ '168552' => {
'Header' => 'openjpeg.h',
'Line' => '1550',
'Param' => {
'0' => {
'name' => 'cstr_info',
- 'type' => '168555'
+ 'type' => '168570'
}
},
'Reg' => {
@@ -232,12 +232,12 @@ $VAR1 = {
'Source' => 'openjpeg.c',
'SourceLine' => '924'
},
- '230605' => {
+ '230620' => {
'Header' => 'openjpeg.h',
'Param' => {
'0' => {
'name' => 'p_codec',
- 'type' => '230691'
+ 'type' => '230706'
},
'1' => {
'name' => 'p_callback',
@@ -258,12 +258,12 @@ $VAR1 = {
'Source' => 'openjpeg.c',
'SourceLine' => '44'
},
- '230703' => {
+ '230718' => {
'Header' => 'openjpeg.h',
'Param' => {
'0' => {
'name' => 'p_codec',
- 'type' => '230691'
+ 'type' => '230706'
},
'1' => {
'name' => 'p_callback',
@@ -284,12 +284,12 @@ $VAR1 = {
'Source' => 'openjpeg.c',
'SourceLine' => '59'
},
- '230789' => {
+ '230804' => {
'Header' => 'openjpeg.h',
'Param' => {
'0' => {
'name' => 'p_codec',
- 'type' => '230691'
+ 'type' => '230706'
},
'1' => {
'name' => 'p_callback',
@@ -310,23 +310,23 @@ $VAR1 = {
'Source' => 'openjpeg.c',
'SourceLine' => '74'
},
- '230904' => {
+ '230919' => {
'Header' => 'openjpeg.h',
'Param' => {
'0' => {
'name' => 'p_format',
- 'type' => '219762'
+ 'type' => '219777'
}
},
'Reg' => {
'0' => 'rdi'
},
- 'Return' => '230691',
+ 'Return' => '230706',
'ShortName' => 'opj_create_decompress',
'Source' => 'openjpeg.c',
'SourceLine' => '168'
},
- '231126' => {
+ '231141' => {
'Header' => 'openjpeg.h',
'Param' => {
'0' => {
@@ -342,12 +342,12 @@ $VAR1 = {
'Source' => 'openjpeg.c',
'SourceLine' => '352'
},
- '231257' => {
+ '231272' => {
'Header' => 'openjpeg.h',
'Param' => {
'0' => {
'name' => 'p_codec',
- 'type' => '230691'
+ 'type' => '230706'
},
'1' => {
'name' => 'num_threads',
@@ -363,12 +363,12 @@ $VAR1 = {
'Source' => 'openjpeg.c',
'SourceLine' => '375'
},
- '231375' => {
+ '231390' => {
'Header' => 'openjpeg.h',
'Param' => {
'0' => {
'name' => 'p_codec',
- 'type' => '230691'
+ 'type' => '230706'
},
'1' => {
'name' => 'parameters',
@@ -384,7 +384,7 @@ $VAR1 = {
'Source' => 'openjpeg.c',
'SourceLine' => '386'
},
- '231517' => {
+ '231532' => {
'Header' => 'openjpeg.h',
'Param' => {
'0' => {
@@ -393,7 +393,7 @@ $VAR1 = {
},
'1' => {
'name' => 'p_codec',
- 'type' => '230691'
+ 'type' => '230706'
},
'2' => {
'name' => 'p_image',
@@ -410,12 +410,12 @@ $VAR1 = {
'Source' => 'openjpeg.c',
'SourceLine' => '406'
},
- '231720' => {
+ '231735' => {
'Header' => 'openjpeg.h',
'Param' => {
'0' => {
'name' => 'p_codec',
- 'type' => '230691'
+ 'type' => '230706'
},
'1' => {
'name' => 'p_stream',
@@ -436,12 +436,12 @@ $VAR1 = {
'Source' => 'openjpeg.c',
'SourceLine' => '429'
},
- '231874' => {
+ '231889' => {
'Header' => 'openjpeg.h',
'Param' => {
'0' => {
'name' => 'p_codec',
- 'type' => '230691'
+ 'type' => '230706'
},
'1' => {
'name' => 'p_image',
@@ -477,12 +477,12 @@ $VAR1 = {
'Source' => 'openjpeg.c',
'SourceLine' => '450'
},
- '232082' => {
+ '232097' => {
'Header' => 'openjpeg.h',
'Param' => {
'0' => {
'name' => 'p_codec',
- 'type' => '230691'
+ 'type' => '230706'
},
'1' => {
'name' => 'p_stream',
@@ -538,12 +538,12 @@ $VAR1 = {
'Source' => 'openjpeg.c',
'SourceLine' => '473'
},
- '232300' => {
+ '232315' => {
'Header' => 'openjpeg.h',
'Param' => {
'0' => {
'name' => 'p_codec',
- 'type' => '230691'
+ 'type' => '230706'
},
'1' => {
'name' => 'p_tile_index',
@@ -574,12 +574,12 @@ $VAR1 = {
'Source' => 'openjpeg.c',
'SourceLine' => '504'
},
- '232500' => {
+ '232515' => {
'Header' => 'openjpeg.h',
'Param' => {
'0' => {
'name' => 'p_codec',
- 'type' => '230691'
+ 'type' => '230706'
},
'1' => {
'name' => 'p_stream',
@@ -605,12 +605,12 @@ $VAR1 = {
'Source' => 'openjpeg.c',
'SourceLine' => '530'
},
- '232677' => {
+ '232692' => {
'Header' => 'openjpeg.h',
'Param' => {
'0' => {
'name' => 'p_codec',
- 'type' => '230691'
+ 'type' => '230706'
},
'1' => {
'name' => 'res_factor',
@@ -626,23 +626,23 @@ $VAR1 = {
'Source' => 'openjpeg.c',
'SourceLine' => '554'
},
- '232786' => {
+ '232801' => {
'Header' => 'openjpeg.h',
'Param' => {
'0' => {
'name' => 'p_format',
- 'type' => '219762'
+ 'type' => '219777'
}
},
'Reg' => {
'0' => 'rdi'
},
- 'Return' => '230691',
+ 'Return' => '230706',
'ShortName' => 'opj_create_compress',
'Source' => 'openjpeg.c',
'SourceLine' => '572'
},
- '233011' => {
+ '233026' => {
'Header' => 'openjpeg.h',
'Param' => {
'0' => {
@@ -658,12 +658,12 @@ $VAR1 = {
'Source' => 'openjpeg.c',
'SourceLine' => '670'
},
- '233142' => {
+ '233157' => {
'Header' => 'openjpeg.h',
'Param' => {
'0' => {
'name' => 'p_codec',
- 'type' => '230691'
+ 'type' => '230706'
},
'1' => {
'name' => 'parameters',
@@ -684,12 +684,12 @@ $VAR1 = {
'Source' => 'openjpeg.c',
'SourceLine' => '731'
},
- '233280' => {
+ '233295' => {
'Header' => 'openjpeg.h',
'Param' => {
'0' => {
'name' => 'p_codec',
- 'type' => '230691'
+ 'type' => '230706'
},
'1' => {
'name' => 'p_image',
@@ -710,12 +710,12 @@ $VAR1 = {
'Source' => 'openjpeg.c',
'SourceLine' => '749'
},
- '233434' => {
+ '233449' => {
'Header' => 'openjpeg.h',
'Param' => {
'0' => {
'name' => 'p_info',
- 'type' => '230691'
+ 'type' => '230706'
},
'1' => {
'name' => 'p_stream',
@@ -731,12 +731,12 @@ $VAR1 = {
'Source' => 'openjpeg.c',
'SourceLine' => '768'
},
- '233565' => {
+ '233580' => {
'Header' => 'openjpeg.h',
'Param' => {
'0' => {
'name' => 'p_codec',
- 'type' => '230691'
+ 'type' => '230706'
},
'1' => {
'name' => 'p_stream',
@@ -752,12 +752,12 @@ $VAR1 = {
'Source' => 'openjpeg.c',
'SourceLine' => '785'
},
- '233696' => {
+ '233711' => {
'Header' => 'openjpeg.h',
'Param' => {
'0' => {
'name' => 'p_codec',
- 'type' => '230691'
+ 'type' => '230706'
},
'1' => {
'name' => 'p_stream',
@@ -773,7 +773,7 @@ $VAR1 = {
'Source' => 'openjpeg.c',
'SourceLine' => '802'
},
- '233827' => {
+ '233842' => {
'Header' => 'openjpeg.h',
'Param' => {
'0' => {
@@ -804,12 +804,12 @@ $VAR1 = {
'Source' => 'openjpeg.c',
'SourceLine' => '822'
},
- '234173' => {
+ '234188' => {
'Header' => 'openjpeg.h',
'Param' => {
'0' => {
'name' => 'p_codec',
- 'type' => '230691'
+ 'type' => '230706'
},
'1' => {
'name' => 'p_tile_index',
@@ -840,12 +840,12 @@ $VAR1 = {
'Source' => 'openjpeg.c',
'SourceLine' => '852'
},
- '234373' => {
+ '234388' => {
'Header' => 'openjpeg.h',
'Param' => {
'0' => {
'name' => 'p_codec',
- 'type' => '230691'
+ 'type' => '230706'
}
},
'Reg' => {
@@ -856,12 +856,12 @@ $VAR1 = {
'Source' => 'openjpeg.c',
'SourceLine' => '879'
},
- '234474' => {
+ '234489' => {
'Header' => 'openjpeg.h',
'Param' => {
'0' => {
'name' => 'p_codec',
- 'type' => '230691'
+ 'type' => '230706'
},
'1' => {
'name' => 'info_flag',
@@ -882,12 +882,12 @@ $VAR1 = {
'Source' => 'openjpeg.c',
'SourceLine' => '897'
},
- '234611' => {
+ '234626' => {
'Header' => 'openjpeg.h',
'Param' => {
'0' => {
'name' => 'p_codec',
- 'type' => '230691'
+ 'type' => '230706'
}
},
'Reg' => {
@@ -898,12 +898,12 @@ $VAR1 = {
'Source' => 'openjpeg.c',
'SourceLine' => '913'
},
- '234775' => {
+ '234790' => {
'Header' => 'openjpeg.h',
'Param' => {
'0' => {
'name' => 'p_codec',
- 'type' => '230691'
+ 'type' => '230706'
}
},
'Reg' => {
@@ -914,12 +914,12 @@ $VAR1 = {
'Source' => 'openjpeg.c',
'SourceLine' => '941'
},
- '234860' => {
+ '234875' => {
'Header' => 'openjpeg.h',
'Param' => {
'0' => {
'name' => 'p_cstr_index',
- 'type' => '234920'
+ 'type' => '234935'
}
},
'Reg' => {
@@ -930,7 +930,7 @@ $VAR1 = {
'Source' => 'openjpeg.c',
'SourceLine' => '952'
},
- '234926' => {
+ '234941' => {
'Header' => 'openjpeg.h',
'Param' => {
'0' => {
@@ -956,7 +956,7 @@ $VAR1 = {
'Source' => 'openjpeg.c',
'SourceLine' => '967'
},
- '235045' => {
+ '235060' => {
'Header' => 'openjpeg.h',
'Param' => {
'0' => {
@@ -1386,7 +1386,7 @@ $VAR1 = {
'Size' => '1',
'Type' => 'Const'
},
- '168555' => {
+ '168570' => {
'BaseType' => '76862',
'Name' => 'opj_codestream_info_v2_t**',
'Size' => '8',
@@ -1879,7 +1879,7 @@ $VAR1 = {
'Size' => '8',
'Type' => 'Pointer'
},
- '219712' => {
+ '219727' => {
'Header' => 'openjpeg.h',
'Line' => '292',
'Memb' => {
@@ -1912,15 +1912,15 @@ $VAR1 = {
'Size' => '4',
'Type' => 'Enum'
},
- '219762' => {
- 'BaseType' => '219712',
+ '219777' => {
+ 'BaseType' => '219727',
'Header' => 'openjpeg.h',
'Line' => '299',
'Name' => 'OPJ_CODEC_FORMAT',
'Size' => '4',
'Type' => 'Typedef'
},
- '221519' => {
+ '221534' => {
'BaseType' => '130',
'Header' => 'openjpeg.h',
'Line' => '578',
@@ -2093,13 +2093,13 @@ $VAR1 = {
'Size' => '216',
'Type' => 'Struct'
},
- '230691' => {
- 'BaseType' => '221519',
+ '230706' => {
+ 'BaseType' => '221534',
'Name' => 'opj_codec_t*',
'Size' => '8',
'Type' => 'Pointer'
},
- '234920' => {
+ '234935' => {
'BaseType' => '74658',
'Name' => 'opj_codestream_index_t**',
'Size' => '8',
diff --git a/abi-check/changelog/openjpeg/current/log.html b/abi-check/changelog/openjpeg/current/log.html
index 8b510ac3..023a6f25 100644
--- a/abi-check/changelog/openjpeg/current/log.html
+++ b/abi-check/changelog/openjpeg/current/log.html
@@ -20,7 +20,37 @@
commit 16b701659d7d9f72aade1d695818a645e2f603a6 +commit 113e0976e232ac2110d50405f8629787f3f53cfc +Author: Even Rouault <even.rouault@spatialys.com> +Date: 2017-09-21 14:14:32 +0200 + + Comment dead code (Coverity CID 94681) + +commit 39082fc6654553f43f6f3a73e0eeaedebc4bdf9f +Author: Even Rouault <even.rouault@spatialys.com> +Date: 2017-09-21 14:13:16 +0200 + + Workaround Coverity CID 113061 + +commit 7711307d865d46ca1bb8bb152071178b10066d05 +Author: Even Rouault <even.rouault@spatialys.com> +Date: 2017-09-21 14:10:49 +0200 + + Workaround Coverity CID 169392 + +commit 19e157871ff28bb5e8296f9e9f9aee6a17a37ace +Author: Even Rouault <even.rouault@spatialys.com> +Date: 2017-09-21 14:06:03 +0200 + + opj_j2k_get_default_thread_count(): validate value of OPJ_NUM_THREADS to fix Coverity 179465 and 179463 + +commit 68e596dada2ee38a66b01494e5a425e623688300 +Author: Even Rouault <even.rouault@spatialys.com> +Date: 2017-09-21 13:54:14 +0200 + + Fix copy&paste error (Coverity CID 169394) + +commit 16b701659d7d9f72aade1d695818a645e2f603a6 Author: Even Rouault <even.rouault@spatialys.com> Date: 2017-09-20 01:06:02 +0200 @@ -357,50 +387,6 @@ Date: 2017-09-01 16:30:41 +0200 TCD: allow tile buffer to be greater than 4GB on 64 bit hosts (but number of pixels must remain under 4 billion) -commit d1299d9670d766006a7a162a770d3b70eaeef9bd -Author: Even Rouault <even.rouault@spatialys.com> -Date: 2017-09-01 16:30:39 +0200 - - Fix compiler warning in release mode - -commit d5153ba404fa13b9c6e7b2c20d4d128aac718fba -Author: Even Rouault <even.rouault@spatialys.com> -Date: 2017-09-01 16:30:37 +0200 - - Remove limitation that prevents from opening images bigger than 4 billion pixels - - However the intermediate buffer for decoding must still be smaller than 4 - billion pixels, so this is useful for decoding at a lower resolution level, - or subtile decoding. - -commit c37e360a5112b5471168e429159f61b74c0c2f58 -Author: Even Rouault <even.rouault@spatialys.com> -Date: 2017-09-01 16:30:35 +0200 - - opj_tcd_init_tile(): fix typo on overflow detection condition (introduced in previous commit) - -commit eee5104a8885227167a349b6dabdb1f72a04d9d0 -Author: Even Rouault <even.rouault@spatialys.com> -Date: 2017-09-01 16:30:32 +0200 - - opj_dwt_decode_partial_tile(): avoid undefined behaviour in lifting operation by properly initializing working buffer - -commit f9e9942330f476b66ac4a35d0ae521200878f343 -Author: Even Rouault <even.rouault@spatialys.com> -Date: 2017-09-01 16:30:29 +0200 - - Sub-tile decoding: only allocate tile component buffer of the needed dimension - - Instead of being the full tile size. - - * Use a sparse array mechanism to store code-blocks and intermediate stages of - IDWT. - * IDWT, DC level shift and MCT stages are done just on that smaller array. - * Improve copy of tile component array to final image, by saving an intermediate - buffer. - * For full-tile decoding at reduced resolution, only allocate the tile buffer to - the reduced size, instead of the full-resolution size. - commit 6ce49bf5aebb3c45c464fa82d14cfd4bf7026a28 Author: Even Rouault <even.rouault@spatialys.com> Date: 2017-09-01 10:26:18 +0200 @@ -498,60 +484,6 @@ Date: 2017-08-21 19:02:04 +0200 j2k.c: fix comment, and remove FIXME -commit 24d069e3ffa2286930a2e7e2638431ea1de6846a -Author: Even Rouault <even.rouault@spatialys.com> -Date: 2017-08-21 17:19:13 +0200 - - Add comment - -commit e9bbc6d3dde946bdb5195f053f24b91335d5d84c -Merge: 3eed024 17a7ac4 -Author: Even Rouault <even.rouault@mines-paris.org> -Date: 2017-08-21 13:02:07 +0200 - - Merge pull request #1001 from rouault/subtile_decoding_stage2 - - Subtile decoding: only apply IDWT on areas that participate to the window of interest - -commit 17a7ac42d581c537cfc1da4324e53047ad82b13e -Author: Even Rouault <even.rouault@spatialys.com> -Date: 2017-08-21 12:25:38 +0200 - - Add comments for filter_width values - -commit f87c5ef7ebef3d7a908e98f2de1b6a0336ae57ae -Author: Even Rouault <even.rouault@spatialys.com> -Date: 2017-08-20 22:02:41 +0200 - - Subtile decoding: only do 9x7 IDWT computations on relevant areas of tile-component buffer. - -commit 3eed024eb45534f86537404e08d08fa572a40782 -Author: Even Rouault <even.rouault@spatialys.com> -Date: 2017-08-19 15:45:54 +0200 - - pgxtoimage(): avoid excessive memory allocation attempt (#999) - -commit 5d403250561398f7ba3041d9eb8c893bd680dd72 -Author: Even Rouault <even.rouault@spatialys.com> -Date: 2017-08-18 15:08:51 +0200 - - Subtile decoding: only do 5x3 IDWT computations on relevant areas of tile-component buffer. - - This lowers 'bin/opj_decompress -i ../MAPA.jp2 -o out.tif -d 0,0,256,256' - down to 0.860s - -commit e5285319229a5d77bf316bb0d3a6cbd3cb8666d9 -Author: Even Rouault <even.rouault@spatialys.com> -Date: 2017-08-18 13:39:20 +0200 - - pgxtoimage(): fix write stack buffer overflow (#997) - -commit 5597522cac96b1bc6d48a447751b1c6049248eef -Author: Even Rouault <even.rouault@spatialys.com> -Date: 2017-08-18 10:16:38 +0200 - - bmp_read_rle8_data(): avoid potential infinite loop (#996) - ...