83e5e2703e
Merge remote-tracking branch 'uclouvain/master'
2016-01-06 17:09:14 +01:00
3a0253f4e2
Merge pull request #684 from stweil/typo
...
Fix duplicate article in comments
2016-01-06 17:01:48 +01:00
99c4f621bd
Fix duplicate article in comments
...
Signed-off-by: Stefan Weil <sw@weilnetz.de>
2016-01-06 08:55:29 +01:00
2e4fadf330
Merge remote-tracking branch 'uclouvain/master'
2016-01-03 02:09:04 +01:00
8f9905936c
Merge pull request #679 from stweil/grammar
...
Fix grammar in comment
2015-12-31 11:45:51 +01:00
a834ab305f
Fix grammar in comment
...
Signed-off-by: Stefan Weil <sw@weilnetz.de>
2015-12-31 10:13:26 +01:00
51efe91971
Merge pull request #665 from jwilk/spelling
...
Fix typos
2015-12-23 20:55:47 +01:00
4ddc2627dd
Fix typos
2015-11-27 21:38:41 +01:00
5d56fb3115
Add known failures
...
2 more tests failing under AppVayor since nov-6 update
Update #655
2015-11-07 14:50:28 +01:00
51cbcd5748
Merge pull request #654 from mayeut/master
...
Fix undefined size jp2 box handling
2015-11-07 14:35:45 +01:00
f51d52f85a
Revert "Check for appveyor update"
...
This reverts commit c414d9c238
2015-11-07 02:59:38 +01:00
c414d9c238
Check for appveyor update
2015-11-07 02:40:18 +01:00
e5ca873ab1
Fix missing bracket
2015-11-07 02:06:22 +01:00
601aa38c30
fix appveyor build
2015-11-07 02:04:10 +01:00
fb4be3894e
Fix undefined size jp2 box handling
...
Update #653
2015-11-07 01:35:43 +01:00
c37d69b25e
Fix Travis cmake install
2015-11-02 22:28:30 +01:00
a77717583e
Update cmake for travis ASan build
2015-11-02 22:02:55 +01:00
968085190c
Merge pull request #651 from stweil/fix
...
opj_decompress: Update error message
2015-11-02 21:49:25 +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
0ae66e891a
Merge pull request #647 from stweil/master
...
Fix typo in comments
2015-10-30 22:50:06 +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
b06bed7b7b
Merge pull request #644 from smuehlst/opj_aligned_malloc
...
Avoid pointer arithmetic with (void *) pointers
2015-10-21 10:10:38 +02:00
b7a162348d
Avoid pointer arithmetic with (void *) pointers.
2015-10-21 09:01:31 +02:00
540aa58f6c
Merge branch 'master' into opj_aligned_malloc
...
Conflicts:
src/lib/openjp2/opj_malloc.c
2015-10-21 08:57:45 +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
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
5799672237
Merge pull request #641 from smuehlst/opj_hp_issue_640
...
Fix HP compiler warning about redeclaration of function
Fix #640
Fix #243
2015-10-19 22:23: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
4831badeb4
Merge pull request #637 from stweil/fixes
...
Fix repository for JPEG2000 test data
2015-10-18 14:42:58 +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
b1a8e1adcb
Change link for appveyor
2015-10-15 23:31:42 +02:00
ee04854e1a
Merge pull request #634 from smuehlst/opj_aix_issue_633
...
Fix #633 .
2015-10-15 13:14:58 +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
bd3959dc77
Merge pull request #632 from mayeut/travis-reduce
...
travis-ci: Include add ons in matrix
2015-10-15 01:18:17 +02:00
fd424cfb66
travis-ci: Include add ons in matrix
2015-10-15 00:58:58 +02:00
e734f0522a
Remove useless environment variables
2015-10-15 00:17:05 +02:00
mayeut
Stefan Weil
Jakub Wilk
Stephan Mühlstrasser