5c5ae1d51a
fixed tile numbering
...
Fixes #245
2016-01-25 17:30:43 +01:00
3767af52de
Merge pull request #648 from stweil/alloc
...
Fix support of posix_memalloc for Linux
2016-01-23 19:43:09 +01:00
a42d03df79
Merge pull request #551 from mayeut/coc-qcc
...
Add COC/QCC in main header when needed
2016-01-11 00:23:44 +01:00
6a1974d40d
Add comment explaining bj is not use when l_data_size == 0
2016-01-09 14:30:48 +01:00
87c0d7dc1e
[git/2.1 regression] Fix opj_write_tile() failure when numresolutions=1
...
When trying the GDAL OpenJPEG driver against openjpeg current master HEAD,
I get failures when trying to create .jp2 files. The driver uses
opj_write_tile() and in some tests numresolutions = 1.
In openjp2/dwt.c:410, l_data_size = opj_dwt_max_resolution( tilec->resolutions,tilec->numresolutions) * (OPJ_UINT32)sizeof(OPJ_INT32);
is called and returns l_data_size = 0. Now in git opj_malloc() has a special case
for 0 to return a NULL pointer whereas previously it relied on system malloc(),
which in my case didn't return NULL.
So only test the pointer value if l_data_size != 0. This makes the GDAL
autotest suite to pass again.
2016-01-08 19:38:45 +01:00
9cad6bc1f6
Fix fatal crash on 64 bit Linux
...
By default, OpenJPEG uses the function memalign to allocate aligned
memory on Linux systems. That function needs malloc.h which was
missing. This results in a compiler warning:
openjpeg/src/lib/openjp2/opj_malloc.c:63:3: warning:
implicit declaration of function ‘memalign’
[-Wimplicit-function-declaration]
On hosts where sizeof(int) < sizeof(void *) the return value of memalign
will be truncated which results in an invalid pointer.
That caused "make test" to produce lots of segmentation faults when
running on a 64 bit Linux host.
Signed-off-by: Stefan Weil <sw@weilnetz.de>
2016-01-06 21:40:09 +01:00
79b1c4cc85
Fix whitespace issues in opj_malloc.c
...
Some lines ended with spaces. Remove them.
Signed-off-by: Stefan Weil <sw@weilnetz.de>
2016-01-06 21:40:01 +01:00
c00ee8bff7
Fix support of posix_memalign for Linux
...
posix_memalign is only declared conditionally in stdlib.h,
so add one of the possible definitions to get the declaration.
Signed-off-by: Stefan Weil <sw@weilnetz.de>
2016-01-06 18:06:45 +01:00
99c4f621bd
Fix duplicate article in comments
...
Signed-off-by: Stefan Weil <sw@weilnetz.de>
2016-01-06 08:55:29 +01:00
a834ab305f
Fix grammar in comment
...
Signed-off-by: Stefan Weil <sw@weilnetz.de>
2015-12-31 10:13:26 +01:00
4ddc2627dd
Fix typos
2015-11-27 21:38:41 +01:00
fb4be3894e
Fix undefined size jp2 box handling
...
Update #653
2015-11-07 01:35:43 +01: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
38ffbbe42e
Fin compiler warnings
2015-11-01 17:08:47 +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
9f78c68953
Fix typo in comments
...
Signed-off-by: Stefan Weil <sw@weilnetz.de>
2015-10-29 20:37:27 +01:00
f080ab8ce0
Merge pull request #638 from stweil/master
...
Fix format strings and unneeded assignment
2015-10-21 20:53:22 +02:00
e975ca2832
Merge branch 'master' into coc-qcc
2015-10-21 20:45:50 +02:00
b7a162348d
Avoid pointer arithmetic with (void *) pointers.
2015-10-21 09:01:31 +02:00
d48be27f5a
Generic aligned malloc implementation update.
...
Update #642
2015-10-21 00:09:04 +02:00
eaf55b677c
Generic aligned malloc implementation.
...
Used for platforms where none of posix_memalign(), memalign() and
_aligned_malloc() is available.
2015-10-20 21:34:54 +02:00
a1fc83cc25
Fix HP compiler warning about redeclaration of function ( #640 )
...
HP compiler warns:
cc: "dwt.c", line 798: warning 562: Redeclaration of "opj_v4dwt_decode"
with a different storage class specifier: "opj_v4dwt_decode" will have
internal linkage.
cc: "t2.c", line 1341: warning 562: Redeclaration of "opj_t2_init_seg"
with a different storage class specifier: "opj_t2_init_seg" will have
internal linkage.
2015-10-19 12:14:27 +02: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
80be580d50
Merge branch 'master' into coc-qcc
2015-10-18 03:23:38 +02:00
05b3afd28f
Merge pull request #636 from uclouvain/opj_malloc-625
...
Update allocation functions
Fix #625
Fix #624
Fix #635
2015-10-18 03:14:55 +02:00
e1122a8f50
Cleanup includes
2015-10-18 02:52:33 +02:00
f9d47e28b9
Fix _aligned_malloc usage
2015-10-18 02:23:01 +02:00
8034ffde8b
Fix inconsistent behavior of malloc(0)
...
Update #635
Update #625
2015-10-17 02:55:09 +02:00
b3a15954f6
Add missing checks. Fix crash on failed allocation.
2015-10-17 02:16:17 +02:00
83249c318f
Fixed crash on encoding
...
Update #624
Update #625
2015-10-17 01:30:23 +02:00
b3c581760f
Fix OpenJPEG GitHub issue #633 .
...
"opj_includes.h" must be included before system headers, otherwise
inconsistent definitions of configuration macros lead to build
failures on AIX.
2015-10-15 10:53:33 +02:00
c8d03fea9b
Merge branch 'master' into coc-qcc
2015-10-13 21:57:58 +02:00
372fead0d7
Remove the explicit restrict keyword
...
It would trigger a compiler error on xlc compiler. Fixes #620
2015-10-13 21:07:11 +02:00
98324bbd6b
I do not recall exactly... I would say that the correct version should be
...
if (!JPWL_ASSUME)
return false;
meaning that once JPWL_ASSUME=1 the code will pass over such errors and try to decode anyway (just paired with the other JPWL_ASSUME on line 1112).
Fixes #596
2015-10-13 15:20:54 +02:00
26dcb7c125
Remove a possible uninitialized variable
...
Fixes #629
2015-10-12 21:29:12 +02:00
51a67a9cbf
Minor style fix to remove c++ comments
2015-10-12 21:25:53 +02:00
dd81b5892d
minor tweaks to the code
2015-10-12 21:24:10 +02:00
ab8929262a
Fix an issue with parenthesis
2015-10-10 21:03:44 +02:00
dc869c2985
Add paranoid sentinels
2015-10-10 18:38:08 +02:00
d753441028
implement a portable aligned realloc
2015-10-10 17:51:29 +02:00
2d410fc74b
do not use aligned_alloc since it requires c11
2015-10-10 14:54:21 +02:00
0dc4914b4e
cleanup header file and move to implementation
2015-10-09 22:04:04 +02:00
de0a9ed103
Revert "Make sure to allocate on 16bits alignement. Fix issue #624 "
...
This reverts commit 553714a87a
2015-10-09 21:13:06 +02:00
553714a87a
Make sure to allocate on 16bits alignement. Fix issue #624
2015-10-09 15:37:09 +02:00
3259fe2ff8
Merge branch 'master' into coc-qcc
2015-10-08 19:11:52 +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
8414870ca7
Fixed problem that C++ compilation failed because of enum variable.
...
Replaced usage of an enum typedef for a variable that is used
for bit flags with OPJ_UINT32 type.
2015-10-07 12:28:12 +02:00
2dab5fed59
Merge branch 'master' into coc-qcc
2015-10-06 20:55:36 +02:00
d6b51b7041
Added missing casts for return values of opj_malloc()/opj_calloc().
2015-10-06 15:33:46 +02:00
db23831d57
Add check for seek support before trying TPsot==TNsot workaround
2015-10-02 22:33:44 +02:00
cf352af089
Fix up-scaling bit depth
...
Fixes #609
2015-09-29 09:28:34 +02:00
05235963d9
Fix typo in variable name
...
This makes checks with codespell easier.
Signed-off-by: Stefan Weil <sw@weilnetz.de>
2015-09-29 05:57:09 +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
55dbf8acff
Fix resource leak in opj_j2k_create_cstr_index
...
Fixes #599
2015-09-17 12:46:42 +02:00
c16c91797f
Fix resource leak in opj_j2k_encode
...
Fixes #598
2015-09-17 12:41:41 +02:00
a4e93c3b0a
fix resource leak in opj_j2k_decode_one_tile
...
Fixes #597
2015-09-17 12:31:18 +02:00
4bb5e24d23
Merge branch 'master' into coc-qcc
2015-09-17 02:12:27 +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
bac2c9e0a3
Change test in opj_tcd_makelayer
...
Remove float equality test. Such a test has no meaning.
2015-09-11 14:17:30 +02:00
ee0f313848
Update check in opj_tcd_makelayer to be robust to different float precisions
2015-09-10 15:46:51 +02:00
ccdce606f1
Fix threshold calculation
...
It doesn't change the outcome of the test suite, that's weird...
2015-09-10 15:10:14 +02:00
5f02757eef
Correct lossless issue on linux x86
...
Update uclouvain/openjpeg#571
2015-09-10 00:39:23 +02:00
4f5ec07c31
Remove C++ comment
2015-09-09 23:38:46 +02:00
66d890bf22
Merge remote-tracking branch 'uclouvain/master' into coc-qcc
2015-09-08 22:33:07 +02:00
29c644ec49
Correct mismatching delete
...
Fixes #575
2015-09-07 19:24:20 +02:00
940100c28a
Fix potential use-after-free in opj_j2k_write_mco function
...
Fixes #563
2015-09-06 17:24:03 +02:00
c31fb68ccc
fix resource leak in jpwl
...
Fixes #573
2015-09-06 17:18:37 +02:00
c5dd6035c9
Correct CMake version requirements
...
Update uclouvain/openjpeg#488
2015-09-01 20:43:43 +02:00
8a95efcd3f
Fix some UBSan warnings
2015-08-23 11:43:38 +02:00
38770403d4
Fix some calculations in opj_tcd_init_tile
...
Fixes #486
Fixes #394
Update #480
Update #388
2015-08-23 11:38:04 +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
fa9142b7e4
Fix formatting
2015-08-21 20:15:50 +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
60301842c7
Sync coc-qcc branch with master
2015-07-31 01:07:14 +02:00
acbb297a0a
Small correction + attempt to understand git-openjpeg workflow
2015-07-31 00:51:31 +02:00
4fc1073809
French comments replaced by English ones
2015-07-31 00:51:08 +02:00
7c688c3453
Merge pull request #558 from mayeut/remove-printf
...
Remove printf/fprintf to stdout/stderr throughout openjp2 lib
2015-07-30 23:37:20 +02:00
372c887aad
Fix typo (that brakes building with '-DBUILD_MJ2:bool=on')
...
Fixes #556
2015-07-30 23:34:12 +02:00
0df90afdf7
Remove printf/fprintf to stdout/stderr throughout openjp2 lib
...
Update uclouvain/openjpeg#246
2015-07-30 23:26:31 +02:00
e4735c703d
better -ffast-math handling
...
issue #488
See also
http://public.kitware.com/pipermail/cmake/2015-April/060479.html
2015-07-30 09:54:07 -05:00
c3d9719cd4
Write COC/QCC in Main Header
...
Update uclouvain/openjpeg#459
2015-07-29 00:29:49 +02:00
2263b6bacc
Start support for qcc/coc
2015-07-28 23:58:10 +02:00
b0035538af
Use __emul under msvc x86 for fast 64 = 32 * 32
...
Update uclouvain/openjpeg#220
2015-07-27 20:12:48 +02:00
45ccf501f0
Fix ARM build with Visual Studio
2015-07-26 21:12:36 +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
8c4afeff40
Merge pull request #521 from manisandro/bigendian
...
Fix opj_write_bytes_BE
Fixes #472
Fixes #345
Fixes #518
2015-07-25 15:54:26 +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
a56819eaab
Add some missing static keywords
...
Update uclouvain/openjpeg#243
2015-07-23 07:48:42 +02:00
9ac3a1572e
Prevent overflow when coding 16 bits images
...
Update uclouvain/openjpeg#539
2015-07-22 00:10:32 +02:00
28c6f54798
Merge pull request #533 from mayeut/refactor-read-ppX
...
Refactor opj_j2k_read_ppm & opj_j2k_read_ppt
Fixes uclouvain/openjpeg#470
Fixes uclouvain/openjpeg#288
Fixes uclouvain/openjpeg#532
2015-07-21 01:26:02 +02:00
1bbb607069
Merge remote-tracking branch 'uclouvain/master' into issue-235
2015-07-21 00:20:05 +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
ae4799ad07
Add some missing static
...
Still needs to check j2k.c & jp2.c
Update uclouvain/openjpeg#243
2015-07-18 02:39:32 +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
775ee87776
Add checks for odd looking cmap & for cmap outside jp2h box
...
Update uclouvain/openjpeg#235
Update uclouvain/openjpeg#447
2015-07-12 19:39:30 +02:00
0b1f8eb6f7
Merge pull request #529 from renevanderark/master
...
fix Suspicious code in j2k.c
Fixes #517
2015-07-12 19:20:57 +02:00
c887df12a3
Refactor opj_read_ppm
...
Update uclouvain/openjpeg#470
Update uclouvain/openjpeg#288
2015-07-12 18:09:30 +02:00
d1b053afe2
Refactor opj_j2k_read_ppt
...
Update uclouvain/openjpeg#470
Update uclouvain/openjpeg#532
2015-07-12 15:55:58 +02:00
dc43ebf96c
Add option to force component splitting in imagetopnm
...
Update uclouvain/openjpeg#289
2015-07-11 11:35:21 +02:00
ba05549b0f
fix Suspicious code in j2k.c #517
2015-07-08 11:13:31 +02:00
237ddd72f1
Merge pull request #514 from mayeut/issue-254
...
Correctly decode files with incorrect tile-part header fields (TPsot==TNsot)
Fixes uclouvain/openjpeg#254
2015-07-04 00:47:59 +02:00
c999b6c0f0
uclouvain/openjpeg#254 Add build option to disable the fix
2015-07-04 00:04:55 +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
c9e231508b
various small T1 optimizations
2015-07-03 15:23:15 +02:00
6347686385
fixed a few bugs
2015-07-03 15:22:58 +02:00
1a8f929111
visual studio lrintf is very slow - do not use
2015-07-03 15:22:42 +02:00
56d3f5af6e
add timing to compress and decompress
2015-07-03 15:20:11 +02:00
c665e81a39
Fix opj_write_bytes_BE ( #518 )
2015-06-25 23:11:22 +02:00
c7535d084e
Merge branch 'master' into issue-254
2015-06-05 20:42:57 +02:00
c0d7afe15c
[trunk] Fix offset computations in opj_j2k_update_image_data
...
Update issue 481
2015-06-03 20:56:13 +00: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
e3291c4e1f
[trunk] Fix overflow in opj_image_comp_header_update (fixes issue 495)
2015-05-27 23:05:16 +00:00
0fa5a17c98
[trunk] Correct potential double free on malloc failure in opj_j2k_copy_default_tcp_and_create_tcp (fixes issue 492)
2015-05-19 21:57:27 +00:00
757f9394bf
[trunk] Add check for number of layers & cblkw/cblkh values (fixes issue 475)
2015-05-19 21:24:44 +00:00
daed8cc919
[trunk] Add check for at most 1 COD marker per tile. 1 COD marker for MH (fixes issue 476)
2015-05-19 20:13:37 +00:00
d1a941ea50
Revert "Correct overflows in opj_j2k_update_image_data"
...
This reverts commit 1fb24aba4b
2015-05-16 14:22:16 +02:00
00a47c1e06
Implement TNsot correction for non conforming files
2015-05-16 11:15:29 +02:00
1fb24aba4b
Correct overflows in opj_j2k_update_image_data
2015-05-16 02:51:31 +02:00
2d24b6000d
[trunk] added overflow checks (fixes issue 431)
...
Thanks mdarbois
2015-02-02 16:11:31 +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
3ed5858902
[trunk] use hidden visibility for static library (fixes issue 354)
2015-01-25 16:59:39 +00:00
7a8cdc4bb0
[trunk] fixed a bug encoutntered when multiple MCT markers are provided
...
Update issue 430
Cc: savmickael@gmail.com
@Mickael: this revision affects your work on custom MCT. Is there a way
you could provide test data to add to our test suite ? Thanks
2015-01-20 16:29:16 +00:00
4c0ed02806
[trunk] checks for JP2 signature and file type boxes more carefully
...
Update issue 430
2015-01-20 14:27:20 +00:00
5d00b719f4
[trunk] fixed a buffer overflow in opj_tcd_init_decode_tile
...
Update issue 431
2015-01-15 18:16:29 +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
Antonin Descampe
Matthieu Darbois
Even Rouault
Stefan Weil
Jakub Wilk
Stephan Mühlstrasser
Mathieu Malaterre
Giuseppe Baruffa
szukw000
ak-dxdy
Rex Dieter
Rene van der Ark
Aaron Boxer
Sandro Mani