Antonin Descampe
bede1568b1
Merge branch 'master' into codingstyle
2016-01-25 22:43:03 +01:00
Antonin Descampe
5c5ae1d51a
fixed tile numbering
...
Fixes #245
2016-01-25 17:30:43 +01:00
Antonin Descampe
6ec68a27f8
modified astyle config
2016-01-25 15:03:21 +01:00
Antonin Descampe
4b927ecea3
modified style cfg
2016-01-24 19:00:31 +01:00
Antonin Descampe
0efb2f5293
adding astyle and uncrustify config files
2016-01-24 18:54:13 +01:00
Antonin Descampe
3767af52de
Merge pull request #648 from stweil/alloc
...
Fix support of posix_memalloc for Linux
2016-01-23 19:43:09 +01:00
mayeut
1b86fb6f48
Update known failures
2016-01-11 00:35:47 +01:00
Matthieu Darbois
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
Mathieu Malaterre
cb33ff43bb
Merge pull request #690 from rouault/failed_malloc_opj_dwt_encode_procedure
...
[git/2.1 regression] Fix opj_write_tile() failure when numresolutions=1
2016-01-09 14:53:29 +01:00
Even Rouault
6a1974d40d
Add comment explaining bj is not use when l_data_size == 0
2016-01-09 14:30:48 +01:00
Even Rouault
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
Matthieu Darbois
0dd44e7dba
Merge pull request #687 from stweil/memalign
...
Fix fatal crash on 64 bit Linux
2016-01-06 23:15:05 +01:00
Stefan Weil
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
Stefan Weil
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
Stefan Weil
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
Matthieu Darbois
a205f70328
Merge pull request #686 from mayeut/master
...
[libtiff] Add missing include statement for ssize_t
Close #681
2016-01-06 18:04:51 +01:00
mayeut
9c5b30005e
Add missing include statement for ssize_t
...
Update uclouvain/openjpeg#681
2016-01-06 17:37:37 +01:00
mayeut
83e5e2703e
Merge remote-tracking branch 'uclouvain/master'
2016-01-06 17:09:14 +01:00
Matthieu Darbois
3a0253f4e2
Merge pull request #684 from stweil/typo
...
Fix duplicate article in comments
2016-01-06 17:01:48 +01:00
Stefan Weil
99c4f621bd
Fix duplicate article in comments
...
Signed-off-by: Stefan Weil <sw@weilnetz.de>
2016-01-06 08:55:29 +01:00
mayeut
2e4fadf330
Merge remote-tracking branch 'uclouvain/master'
2016-01-03 02:09:04 +01:00
Matthieu Darbois
8f9905936c
Merge pull request #679 from stweil/grammar
...
Fix grammar in comment
2015-12-31 11:45:51 +01:00
Stefan Weil
a834ab305f
Fix grammar in comment
...
Signed-off-by: Stefan Weil <sw@weilnetz.de>
2015-12-31 10:13:26 +01:00
Matthieu Darbois
51efe91971
Merge pull request #665 from jwilk/spelling
...
Fix typos
2015-12-23 20:55:47 +01:00
Jakub Wilk
4ddc2627dd
Fix typos
2015-11-27 21:38:41 +01:00
mayeut
5d56fb3115
Add known failures
...
2 more tests failing under AppVayor since nov-6 update
Update #655
2015-11-07 14:50:28 +01:00
Matthieu Darbois
51cbcd5748
Merge pull request #654 from mayeut/master
...
Fix undefined size jp2 box handling
2015-11-07 14:35:45 +01:00
mayeut
f51d52f85a
Revert "Check for appveyor update"
...
This reverts commit c414d9c238
.
2015-11-07 02:59:38 +01:00
mayeut
c414d9c238
Check for appveyor update
2015-11-07 02:40:18 +01:00
mayeut
e5ca873ab1
Fix missing bracket
2015-11-07 02:06:22 +01:00
mayeut
601aa38c30
fix appveyor build
2015-11-07 02:04:10 +01:00
mayeut
fb4be3894e
Fix undefined size jp2 box handling
...
Update #653
2015-11-07 01:35:43 +01:00
mayeut
c37d69b25e
Fix Travis cmake install
2015-11-02 22:28:30 +01:00
mayeut
a77717583e
Update cmake for travis ASan build
2015-11-02 22:02:55 +01:00
Matthieu Darbois
968085190c
Merge pull request #651 from stweil/fix
...
opj_decompress: Update error message
2015-11-02 21:49:25 +01:00
Stefan Weil
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
mayeut
38ffbbe42e
Fin compiler warnings
2015-11-01 17:08:47 +01:00
mayeut
ce26e523dd
Fix compiler warnings
2015-11-01 16:56:50 +01:00
Stefan Weil
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
Stefan Weil
4ac509182a
convert: Remove unneeded type casts
...
Signed-off-by: Stefan Weil <sw@weilnetz.de>
2015-11-01 16:53:55 +01:00
Matthieu Darbois
0ae66e891a
Merge pull request #647 from stweil/master
...
Fix typo in comments
2015-10-30 22:50:06 +01:00
Stefan Weil
9f78c68953
Fix typo in comments
...
Signed-off-by: Stefan Weil <sw@weilnetz.de>
2015-10-29 20:37:27 +01:00
Matthieu Darbois
f080ab8ce0
Merge pull request #638 from stweil/master
...
Fix format strings and unneeded assignment
2015-10-21 20:53:22 +02:00
mayeut
e975ca2832
Merge branch 'master' into coc-qcc
2015-10-21 20:45:50 +02:00
Matthieu Darbois
b06bed7b7b
Merge pull request #644 from smuehlst/opj_aligned_malloc
...
Avoid pointer arithmetic with (void *) pointers
2015-10-21 10:10:38 +02:00
Stephan Mühlstrasser
b7a162348d
Avoid pointer arithmetic with (void *) pointers.
2015-10-21 09:01:31 +02:00
Stephan Mühlstrasser
540aa58f6c
Merge branch 'master' into opj_aligned_malloc
...
Conflicts:
src/lib/openjp2/opj_malloc.c
2015-10-21 08:57:45 +02:00
mayeut
d48be27f5a
Generic aligned malloc implementation update.
...
Update #642
2015-10-21 00:09:04 +02:00
Stephan Mühlstrasser
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
Stephan Mühlstrasser
0967d64854
Generic aligned malloc implementation.
...
Used for platforms where none of posix_memalign(), memalign() and
_aligned_malloc() is available.
2015-10-20 13:02:51 +02:00