5a560ebf51
imagetobmp: avoid shift by -1 (relates to #811 )
2017-08-09 09:42:30 +02:00
0c07950cb3
Fix remaining warning
...
format specifier mismatch in #975
2017-08-08 18:05:37 -07:00
0394f8d0f1
Merge pull request #975 from szukw000/changes-for-afl-tests
...
Catch images broken by AFL
2017-08-08 16:51:54 -07:00
0c1fc0593e
Complementary fix to previous commit
2017-08-07 18:32:52 +02:00
f58aab9d6a
Add opj_image_data_alloc() / opj_image_data_free()
...
As bin/common/color.c used to directly call malloc()/free(), we need
to export functions dedicated to allocating/freeing image component data.
2017-08-07 18:32:52 +02:00
bc3cb74100
Changes for converttif.c to fix tsize_t
2017-08-07 16:44:28 +02:00
57e36dbfeb
First change on changes-for-afl-tests
2017-08-02 17:27:08 +02:00
48125b0d12
src/bin/jpwl/convert.c: add missing fclose() in error code path (suggested by maddin200, #976 )
2017-07-31 17:35:10 +02:00
00f45684a8
Catch images broken by AFL
2017-07-31 13:58:08 +02:00
c22cbd8bdf
Avoid heap buffer overflow in function pnmtoimage of convert.c, and unsigned integer overflow in opj_image_create() (CVE-2016-9118, #861 )
2017-07-30 18:43:25 +02:00
517bf6fd86
src/bin/jpwl/convert.c: fix memleak (fix suggested by maddin200, #631 )
2017-07-29 21:11:23 +02:00
5a3e7aaf33
color_cielab_to_rgb(): reject images with components of different dimensions to void read heap buffer overflow ( #909 )
2017-07-29 17:56:12 +02:00
784d4d47e9
Fix breakage of 2fa0fc61f2 ( #970 )
2017-07-29 17:51:10 +02:00
2fa0fc61f2
imagetopnm(): make sure the alpha component has same dimension as other components to avoid read heap buffer overflow ( #970 )
2017-07-29 17:28:55 +02:00
5e795d90a1
Spelling fixes (patch by ka7, #890 , rebased on top of master)
2017-07-26 21:06:38 +02:00
2be20ce7d9
Reformat src/bin/wx/OPJViewer/source/OPJThreads.cpp src/bin/wx/OPJViewer/source/imagjpeg2000.cpp wrapping/java/openjp2/JavaOpenJPEG.c
2017-07-26 21:04:01 +02:00
94cc97c58a
opj_decompress: fix null pointer dereference on comps[].data on id_000167,sig_11,src_006079,op_havoc,rep_4 ( #939 )
2017-07-26 20:13:09 +02:00
6026786069
Style fix
2017-06-21 13:20:35 +02:00
93aca84731
Fix mingw related warnings
2017-06-21 12:54:40 +02:00
5f596cb283
Fix warning about unused arguments
2017-06-17 14:10:15 +02:00
36dd87cea8
Merge pull request #928 from RussellMcOrmond/master
...
Quiet mode for opj_decompress via -quiet long parameter.
2017-06-14 17:23:06 +02:00
a8ca7c51f3
CMake: add stronger warnings for openjp2 lib/bin by default, and error out on declaration-after-statement
...
And remove occurences of unused arguments in src/lib/openjp2
2017-05-23 15:47:57 +02:00
5f1e380b51
Fixed formatting issues ASTYLE
2017-05-16 09:31:07 -04:00
9d8e1ecdeb
Quiet mode for opj_decompress via -quiet long parameter.
2017-05-15 14:39:54 -04:00
3c2972f924
Reformat: apply reformattin on .h files ( #128 )
2017-05-15 12:21:30 +02:00
563bd8499e
Reformat whole codebase with astyle.options ( #128 )
2017-05-09 20:46:20 +02:00
4d5c5e7c48
Remove typos from comments and man pages
2016-09-26 11:26:55 +02:00
fac916f72a
Fix PNM file reading ( #847 )
...
Malformed PNM file could cause a crash in opj_compress.
Checks were added to prevent this.
Fixes #843
Updates #440
2016-09-22 00:30:34 +02:00
da94042481
Merge pull request #834 from trylab/issue833
...
Fix issue 833.
2016-09-20 18:59:30 +02:00
0954bc11e3
Fix some warnings ( #838 )
...
Fix warnings introduced by uclouvain/openjpeg#786
2016-09-14 00:12:43 +02:00
893143c8e1
Fix issue 833.
...
Add some overflow check operations.
2016-09-13 17:43:30 +08:00
48c16b2c19
Merge branch 'master' of https://github.com/uclouvain/openjpeg into tier1_optimizations_multithreading_2
...
Conflicts:
src/lib/openjp2/t1.c
2016-09-08 10:30:09 +02:00
e40c28c2e8
jpwl: Remove non-portable data type u_int16_t (fix issue #796 ) ( #797 )
...
The type casts which used this data type can be removed by changing
the signature of function swap16. As this function is called with
unsigned variables, this change is reasonable.
Signed-off-by: Stefan Weil <sw@weilnetz.de>
2016-07-14 10:49:17 +02:00
69497d35c0
opj_decompress: use clock_gettime() instead of getrusage() so as to get the time spent, and not to the total CPU time
2016-05-25 21:59:43 +02:00
d67cd2220a
opj_decompress: add a -threads <num_threads> option
2016-05-25 21:02:07 +02:00
162f6199c0
Fix Heap Buffer Overflow in function color_cmyk_to_rgb
...
Fix uclouvain/openjpeg#774
2016-05-08 19:18:05 +02:00
17a0a8a195
Use lowercase for cmake commands consistenly
...
Inspired from https://github.com/InsightSoftwareConsortium/ITK/blob/master/Utilities/Maintenance/HowToCreateTheCMakeCaseConversion.txt
This needs vim 7.3 and fails with vim 7.4
This also fixes a number of :
- missing empty line at end of files
- useless space at end of lines
2016-05-02 16:05:41 +02:00
f40a2ff2ad
Fix bad call to fclose with NULL pointer
2016-04-30 01:50:33 +02:00
be42e72d22
Fix warnings ( #763 )
2016-04-30 01:12:16 +02:00
15f081c896
Fix Out-Of-Bounds Read in sycc42x_to_rgb function ( #745 )
...
42x Images with an odd x0/y0 lead to subsampled component starting at the
2nd column/line.
That is offset = comp->dx * comp->x0 - image->x0 = 1
Fix #726
2016-04-30 00:33:27 +02:00
ad593c9e06
Fix heap-buffer-overflow in color_esycc_to_rgb ( #748 )
...
When all components do not have the same dx/dy, components buffer are
read beyond their end.
Do not convert in this case.
Update uclouvain/openjpeg#725
2016-04-29 23:51:14 +02:00
319fc971fe
cppcheck fix for openjp2 ( #740 )
2016-04-29 23:49:17 +02:00
e982d03966
Fix implicit float-to-bool conversions ( #752 )
2016-04-28 11:52:45 +02:00
74e814358c
Allow to write 3/5/7/9/11/13/15 bpp TIF files
...
Update uclouvain/openjpeg#729
2016-04-23 04:29:03 +02:00
54393d9e38
Allow to read 3/5/7/9/11/13/15 bpp TIF files
2016-04-23 04:24:04 +02:00
5e5f6999a8
Remove dead code in opj_dump
2016-04-09 18:34:11 +02:00
93a61459cd
opj_decompress: Update error message
...
The png format is also supported, so add it to the message.
Remove also the unneeded blank character before \n.
Signed-off-by: Stefan Weil <sw@weilnetz.de>
2015-11-01 21:01:20 +01:00
ce26e523dd
Fix compiler warnings
2015-11-01 16:56:50 +01:00
7dfcbf9d7b
convert: Fix compiler warnings
...
Fix this and other similar compiler warnings:
src/bin/jp2/convert.c: In function ‘tga_readheader’:
src/bin/jp2/convert.c:595:5: warning:
dereferencing type-punned pointer will break strict-aliasing rules
[-Wstrict-aliasing]
cmap_len = get_ushort(*(unsigned short*)(&tga[5]));
Signed-off-by: Stefan Weil <sw@weilnetz.de>
2015-11-01 16:54:38 +01:00
4ac509182a
convert: Remove unneeded type casts
...
Signed-off-by: Stefan Weil <sw@weilnetz.de>
2015-11-01 16:53:55 +01:00
ad7eb5630e
Fix format strings and unneeded assignment
...
The static code analyzer cppcheck warns about unsigned integers
which use "%d" in the format string.
It also warns about an unneeded assignment.
Fix both issues.
Signed-off-by: Stefan Weil <sw@weilnetz.de>
2015-10-18 19:52:57 +02:00
51a67a9cbf
Minor style fix to remove c++ comments
2015-10-12 21:25:53 +02:00
c8ae3c5225
Fix warnings for C++
...
g++ complains about invalid conversions like these ones:
error: invalid conversion from ‘const char*’ to ‘char*’ [-fpermissive]
error: invalid conversion from ‘void*’ to ‘opj_precision* {aka opj_prec*}’ [-fpermissive]
Signed-off-by: Stefan Weil <sw@weilnetz.de>
2015-10-07 20:53:57 +02:00
cf352af089
Fix up-scaling bit depth
...
Fixes #609
2015-09-29 09:28:34 +02:00
99fc1ab306
Fix typos in comments and string
...
Most typos were found by codespell.
Signed-off-by: Stefan Weil <sw@weilnetz.de>
2015-09-29 05:55:43 +02:00
838dfb8058
Provide safer string copy than strncpy
...
As per @boxerab suggestion in commit
b9ca882749
2015-09-25 22:04:58 +02:00
4da7e9617f
Fix resource leak
2015-09-25 00:39:05 +02:00
b9ca882749
Fix resource leaks & unchecked resource allocations
2015-09-25 00:08:34 +02:00
f9df8ba19a
Fix some resource leaks
2015-09-24 23:32:03 +02:00
f82d7f3a63
Use buffer on stack to read TGA header
...
Fixes a potential leak
Fixes #601
2015-09-23 21:17:06 +02:00
faf63fddad
Fix warning in rle4 decoding
2015-09-23 21:09:19 +02:00
c8a3117659
Fix function name
2015-09-13 14:51:00 +02:00
49cbc11a19
Correct leak in color_cielab_to_rgb
2015-09-13 14:42:56 +02:00
4f5ec07c31
Remove C++ comment
2015-09-09 23:38:46 +02:00
29c644ec49
Correct mismatching delete
...
Fixes #575
2015-09-07 19:24:20 +02:00
c31fb68ccc
fix resource leak in jpwl
...
Fixes #573
2015-09-06 17:18:37 +02:00
8a95efcd3f
Fix some UBSan warnings
2015-08-23 11:43:38 +02:00
a521472427
Add tests for CMYK/esYCC/CIELab
2015-08-21 21:41:50 +02:00
d4ac2f613d
Fix formatting
2015-08-21 20:17:55 +02:00
f98df1c715
TIFF can output CMYK
2015-08-21 19:54:22 +02:00
3109759fd7
Merge pull request #559 from szukw000/cmyk-cielab-esycc
...
Add support for CIELab, EYCC and CMYK
2015-08-21 19:48:31 +02:00
238f4419ab
Defines three new functions
...
Declares three new functions
Calls the three new functions
Collects data for CIELab, sets the color_space for EYCC and CMYK
2015-07-30 23:31:12 +00:00
acbb297a0a
Small correction + attempt to understand git-openjpeg workflow
2015-07-31 00:51:31 +02:00
15e4168ee2
Remove some warnings when building
...
Update #442
2015-07-26 19:19:31 +02:00
2452bb7c45
Remove some warnings when building
...
Update #442
2015-07-26 19:01:52 +02:00
f3dad25c77
Update convert for PNG output
...
Update uclouvain/openjpeg#264
2015-07-26 18:28:03 +02:00
e6cf1744d4
Remove some warnings when building
...
Update #442
2015-07-26 13:41:59 +02:00
c423cc84e7
Remove some warnings when building
...
Update #442
2015-07-26 02:41:39 +02:00
ffd9db9700
Remove some warnings when building
...
Update #442
2015-07-25 03:16:16 +02:00
b190a91ab5
Remove some warnings when building
...
Update #442
2015-07-24 23:55:45 +02:00
5bb074611a
Update PNG support
...
Only input modified for now
Update uclouvain/openjpeg#536
Update uclouvain/openjpeg#264
2015-07-19 17:42:11 +02:00
46c1dd22fc
Correct error message for invalid TIFF input
2015-07-19 15:01:12 +02:00
b88025b38f
Add headers to CMake target
2015-07-18 01:50:17 +02:00
8048bbc7a2
Add tests for TIFF input with Alpha channel
...
Update uclouvain/openjpeg#322
2015-07-18 00:07:04 +02:00
635a358962
Fix build warnings in converttif.c
2015-07-16 06:51:21 +02:00
8f798864a9
Update imagetotif to support more output TIF formats
...
Update uclouvain/openjpeg#322
Update uclouvain/openjpeg#264
2015-07-16 00:26:02 +02:00
ac9fb5a302
Update tiftoimage to support more input TIF formats
...
Update uclouvain/openjpeg#322
Update uclouvain/openjpeg#264
2015-07-14 23:51:02 +02:00
dc43ebf96c
Add option to force component splitting in imagetopnm
...
Update uclouvain/openjpeg#289
2015-07-11 11:35:21 +02:00
eadfad7a50
commented out printf line
2015-07-03 17:36:39 +02:00
14361eee24
commented out a printf line
2015-07-03 16:35:16 +02:00
6347686385
fixed a few bugs
2015-07-03 15:22:58 +02:00
56d3f5af6e
add timing to compress and decompress
2015-07-03 15:20:11 +02:00
6def7e38b4
[trunk] Fix wrong return value for opj_setup_encoder & opj_set_decoded_resolution_factor (fixes issue 497)
...
Thanks Aaron.
2015-05-29 21:58:08 +00:00
73881d0e52
[trunk] Fix sscanf format specifier (fixes issue 494)
...
Thanks Aaron.
2015-05-28 22:16:49 +00:00
8b5e2a5143
[trunk] fixes a bug that prevented opj_decompress to take directory as input (fixes issue 463)
...
Thanks Aaron.
2015-02-02 16:11:23 +00:00
42132ed6b5
[trunk] removed warning from convertbmp.c
...
Update issue 442
2014-12-27 11:31:43 +00:00
31f5efe453
[trunk] fixed typo in opj_decompress (fixes issue 465)
2014-12-26 15:37:16 +00:00
33f52fb611
[trunk] removed warning from convert.c
...
Update issue 442
2014-12-23 16:03:45 +00:00
81abe5b3bb
[trunk] fixed imagetoraw unsigned 16bits conversion (fixes issue 460)
2014-12-23 15:06:23 +00:00
4a09296771
[trunk] removed warning from convertbmp.c
...
Update issue 442
2014-12-23 10:13:28 +00:00
6922124c4c
[trunk] fixed colorspace mapping for raw grayscale images (fixes issue 456)
2014-12-22 18:39:14 +00:00
59b844347c
[trunk] fixed component precision upscaling in opj_decompress (fixes issue 458)
2014-12-22 15:50:32 +00:00
16240e21f9
[trunk] updated BMP format input support
...
Update issue 203
2014-12-22 14:40:31 +00:00
33a0e66eb1
[trunk] updated BMP format input support
...
Update issue 203
2014-12-22 13:14:37 +00:00
f1bae45c76
[trunk] fixed BMP reading for 8bpp when width & 3 == 1
...
Update issue 203
2014-12-20 18:45:53 +00:00
c0710f557c
[trunk] Fixed invalid check in in tiff reading method (fixes issue 449)
2014-12-11 20:21:26 +00:00
04ace2a558
[trunk] Fixed typo in opj_compress error report (fixes issue 350)
2014-12-02 20:18:50 +00:00
570dd13f55
[trunk] removed some warnings when configuring with CMake 3.x on MacOS
...
Update issue 443
Warnings related to OPJ_USE_DSYMUTIL are fixed
2014-11-25 21:52:24 +00:00
63f877769c
[trunk] removed some warnings when building src/bin/jp2/convert.c
...
Update issue 442
2014-11-25 20:06:12 +00:00
131cc98491
[trunk] added an option to upsample image components in opj_decompress
...
Update issue 289
Issue is left open since there's still one image failing the tests.
2014-11-22 17:59:07 +00:00
13bcb63b73
[trunk] fixed pnmtoimage for odd pgm files (fixes issue 294)
2014-11-22 14:09:16 +00:00
0ba5d15b58
[trunk] fixed warning in option to force rgb output in opj_decompress (fixes issue 282)
2014-11-22 12:30:04 +00:00
7e38446075
[trunk] added option to force rgb output in opj_decompress (fixes issue 282 , fixes issue 286)
2014-11-22 00:04:39 +00:00
3bc360fc9d
[trunk] added option to force output bit depth in opj_decompress (fixes issue 283)
2014-11-19 20:05:39 +00:00
b65e3ebdb6
[trunk] fixed a bug leading to jpwl build failure & add related odd width/height sYCC tests (fixes issue 422)
2014-11-18 00:07:50 +00:00
cf5153c518
[trunk] add a cdef box when alpha component is present (fixes issue 416)
2014-11-03 14:12:01 +00:00
aff9cb39ed
[trunk] fixed invalid member values from opj_read_header or opj_decode (fixes issue 411)
2014-10-21 15:22:22 +00:00
984351f86f
[trunk] Add option to call dsymutil on built binaries (fixes issue 409)
2014-10-15 10:24:49 +00:00
1acfa211ae
[trunk] fixes heap-buffer-overflow in parse_cmdline_encoder
...
Fixes issue 403
Thanks Matthieu
2014-09-30 09:48:26 +00:00
50a205d20f
[trunk] improve memory management (fixes issue 359)
2014-09-16 15:48:04 +00:00
7d21871ed8
[trunk] fixes issue #357 . MCT is automatically disabled when
...
subsamppling is detected.
2014-07-03 09:15:13 +00:00
a38b97fae0
[trunk] moved comment marker setup from opj_compress to the library
2014-07-01 13:51:55 +00:00
4bac8488df
[trunk] Properly handle failure to compress (remove file)
...
Fixes issue 323
2014-04-28 07:54:33 +00:00
de04302c15
[trunk] Missing endianess setting
...
Fixes issue 337
2014-04-28 07:44:39 +00:00
997758f91c
[trunk] properly handle pkg-config on non-UNIX hosts
...
Fixes issue 340
2014-04-28 07:34:26 +00:00
7924d3a456
[trunk]removed '-x' option for index file as long as it's broken
2014-04-23 15:19:57 +00:00
ec84bafcd8
[trunk]re-formatted help display in executables
2014-04-23 14:09:20 +00:00
08c09b74cf
[trunk]formatted some messages. Removed -version option to disambiguate
...
with -v(erbose) option, added version info in help display
2014-04-23 09:12:30 +00:00
7aece5e8e7
[trunk]Replaced deprecated opj_stream_set_user_data function from API
...
with its 'v3' version, and removed all other 'v3' suffixes from API.
2014-04-23 07:46:11 +00:00
8d93eae64a
[trunk] fixed some warning and errors formatting and add a '-version'
...
option to opj_compress and opj_decompress binaries
2014-04-22 21:22:49 +00:00
7199d9b5d3
[trunk] refactoring of rsiz, profiles, and extensions management
2014-04-17 09:31:37 +00:00
d19a4ab676
[trunk] updated copyright and added copyright notice required by ISO, in each file; updated AUTHORS, NEWS
2014-04-03 15:30:57 +00:00
4db4198722
[trunk] fixed a bug triggering SEGFAULT on debug mode (uninitialized
...
structure)
2014-04-02 16:25:40 +00:00
a54d757a3e
[trunk] fixed warnings triggered on linux related to r2802
2014-03-26 15:17:17 +00:00
f1d69068c7
[trunk] add ability in opj_compress to input subsampled images through
...
'-F' (aka raw option). Let the user input raw images with 444, 422, 420
(etc) subsampling. To be used in conjunction with '-mct 0' option to
compress subsampled YCC images.
2014-03-26 14:26:49 +00:00
9ba6bc6042
[trunk] Make sure to test value not pointer
...
Update issue 302
2014-03-25 16:34:59 +00:00
5e1a0fad08
[trunk] fixed bug related to r2791
2014-03-25 15:35:33 +00:00
666f71b2a1
[trunk] fixed warning due induced by r2791
2014-03-25 13:29:11 +00:00
2b7d5b18f3
[trunk] add "-mct {0,1,2}" option to opj_compress to allow MCT to be
...
disabled if needed.
2014-03-25 12:38:29 +00:00
18d5d25cb6
[trunk] Make sure to not use alpha pointer if it is not an RGBA input
...
Fixes issue 310
2014-03-25 11:47:34 +00:00
18c5be69e9
[trunk] Make sure to exit early instead of looping on every single pixels
2014-03-24 16:01:51 +00:00
5a70e97f51
[trunk] Fix typo in comment (this is not j2k_dump)
2014-03-24 09:49:04 +00:00
51ab074d50
[trunk] User can now control source/target java version
...
Fixes issue 303
2014-03-18 15:00:23 +00:00
ae49fd1aa9
[trunk] Update big endian handling no such thing as WORDS_BIGENDIAN (prefer OPJ_BIG_ENDIAN)
...
Update issue 302
2014-03-18 14:37:33 +00:00
866cd28ad4
[trunk] Update BSD-4 copyright into a BSD-3 copyright
...
Fixes issue 300
2014-03-17 15:02:49 +00:00
de74605777
[trunk] Fix issue with & vs &&
...
Fixes issue 277
2014-03-14 14:46:40 +00:00
e8abf1fb25
[trunk] Add internal implementation to dump all tiles/comp info
...
Eg: opj_dump -f 8 -i input.j2k
Update issue 3
2014-03-14 13:53:36 +00:00
138a65d6c1
[trunk] Move INLINE definition within openjpeg.h header since application may use it
2014-03-14 12:02:05 +00:00
5624e4a25f
[trunk] Always report when decompression failed as return code value
2014-03-13 12:31:41 +00:00
41add6882b
[trunk] Make sure to use 8bits buffer when applying the ICC profile.
...
Fixes issue 281
2014-03-12 14:18:25 +00:00
Even Rouault
Antonin Descampe
Antonin Descampe
szukw000
Russell McOrmond
Mathieu Malaterre
Matthieu Darbois
trylab
Stefan Weil
Julien Malik
julienmalik
ak-dxdy
Aaron Boxer