]> granicus.if.org Git - openjpeg/log
openjpeg
8 years agoMerge pull request #551 from mayeut/coc-qcc
Matthieu Darbois [Sun, 10 Jan 2016 23:23:44 +0000 (00:23 +0100)]
Merge pull request #551 from mayeut/coc-qcc

Add COC/QCC in main header when needed

8 years agoMerge pull request #690 from rouault/failed_malloc_opj_dwt_encode_procedure
Mathieu Malaterre [Sat, 9 Jan 2016 13:53:29 +0000 (14:53 +0100)]
Merge pull request #690 from rouault/failed_malloc_opj_dwt_encode_procedure

[git/2.1 regression] Fix opj_write_tile() failure when numresolutions=1

8 years agoAdd comment explaining bj is not use when l_data_size == 0
Even Rouault [Sat, 9 Jan 2016 13:30:48 +0000 (14:30 +0100)]
Add comment explaining bj is not use when l_data_size == 0

8 years ago[git/2.1 regression] Fix opj_write_tile() failure when numresolutions=1
Even Rouault [Fri, 8 Jan 2016 18:38:45 +0000 (19:38 +0100)]
[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.

8 years agoMerge pull request #687 from stweil/memalign
Matthieu Darbois [Wed, 6 Jan 2016 22:15:05 +0000 (23:15 +0100)]
Merge pull request #687 from stweil/memalign

Fix fatal crash on 64 bit Linux

8 years agoFix fatal crash on 64 bit Linux
Stefan Weil [Wed, 6 Jan 2016 20:34:59 +0000 (21:34 +0100)]
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>
8 years agoFix whitespace issues in opj_malloc.c
Stefan Weil [Wed, 6 Jan 2016 20:34:59 +0000 (21:34 +0100)]
Fix whitespace issues in opj_malloc.c

Some lines ended with spaces. Remove them.

Signed-off-by: Stefan Weil <sw@weilnetz.de>
8 years agoMerge pull request #686 from mayeut/master
Matthieu Darbois [Wed, 6 Jan 2016 17:04:51 +0000 (18:04 +0100)]
Merge pull request #686 from mayeut/master

[libtiff] Add missing include statement for ssize_t
Close #681

8 years agoAdd missing include statement for ssize_t
mayeut [Wed, 6 Jan 2016 16:37:37 +0000 (17:37 +0100)]
Add missing include statement for ssize_t

Update uclouvain/openjpeg#681

8 years agoMerge remote-tracking branch 'uclouvain/master'
mayeut [Wed, 6 Jan 2016 16:09:14 +0000 (17:09 +0100)]
Merge remote-tracking branch 'uclouvain/master'

8 years agoMerge pull request #684 from stweil/typo
Matthieu Darbois [Wed, 6 Jan 2016 16:01:48 +0000 (17:01 +0100)]
Merge pull request #684 from stweil/typo

Fix duplicate article in comments

8 years agoFix duplicate article in comments
Stefan Weil [Wed, 6 Jan 2016 07:55:29 +0000 (08:55 +0100)]
Fix duplicate article in comments

Signed-off-by: Stefan Weil <sw@weilnetz.de>
8 years agoMerge remote-tracking branch 'uclouvain/master'
mayeut [Sun, 3 Jan 2016 01:09:04 +0000 (02:09 +0100)]
Merge remote-tracking branch 'uclouvain/master'

8 years agoMerge pull request #679 from stweil/grammar
Matthieu Darbois [Thu, 31 Dec 2015 10:45:51 +0000 (11:45 +0100)]
Merge pull request #679 from stweil/grammar

Fix grammar in comment

8 years agoFix grammar in comment
Stefan Weil [Tue, 3 Nov 2015 18:16:01 +0000 (19:16 +0100)]
Fix grammar in comment

Signed-off-by: Stefan Weil <sw@weilnetz.de>
9 years agoMerge pull request #665 from jwilk/spelling
Matthieu Darbois [Wed, 23 Dec 2015 19:55:47 +0000 (20:55 +0100)]
Merge pull request #665 from jwilk/spelling

Fix typos

9 years agoFix typos
Jakub Wilk [Fri, 27 Nov 2015 20:38:41 +0000 (21:38 +0100)]
Fix typos

9 years agoAdd known failures
mayeut [Sat, 7 Nov 2015 13:50:28 +0000 (14:50 +0100)]
Add known failures

2 more tests failing under AppVayor since nov-6 update
Update #655

9 years agoMerge pull request #654 from mayeut/master
Matthieu Darbois [Sat, 7 Nov 2015 13:35:45 +0000 (14:35 +0100)]
Merge pull request #654 from mayeut/master

Fix undefined size jp2 box handling

9 years agoRevert "Check for appveyor update"
mayeut [Sat, 7 Nov 2015 01:59:38 +0000 (02:59 +0100)]
Revert "Check for appveyor update"

This reverts commit c414d9c238f404980e6e8b17db652a7fb2635cdf.

9 years agoCheck for appveyor update
mayeut [Sat, 7 Nov 2015 01:40:18 +0000 (02:40 +0100)]
Check for appveyor update

9 years agoFix missing bracket
mayeut [Sat, 7 Nov 2015 01:06:22 +0000 (02:06 +0100)]
Fix missing bracket

9 years agofix appveyor build
mayeut [Sat, 7 Nov 2015 01:04:10 +0000 (02:04 +0100)]
fix appveyor build

9 years agoFix undefined size jp2 box handling
mayeut [Sat, 7 Nov 2015 00:35:43 +0000 (01:35 +0100)]
Fix undefined size jp2 box handling

Update #653

9 years agoFix Travis cmake install
mayeut [Mon, 2 Nov 2015 21:28:30 +0000 (22:28 +0100)]
Fix Travis cmake install

9 years agoUpdate cmake for travis ASan build
mayeut [Mon, 2 Nov 2015 21:02:53 +0000 (22:02 +0100)]
Update cmake for travis ASan build

9 years agoMerge pull request #651 from stweil/fix
Matthieu Darbois [Mon, 2 Nov 2015 20:49:25 +0000 (21:49 +0100)]
Merge pull request #651 from stweil/fix

opj_decompress: Update error message

9 years agoopj_decompress: Update error message
Stefan Weil [Fri, 30 Oct 2015 07:45:10 +0000 (08:45 +0100)]
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>
9 years agoFin compiler warnings
mayeut [Sun, 1 Nov 2015 16:08:47 +0000 (17:08 +0100)]
Fin compiler warnings

9 years agoFix compiler warnings
mayeut [Sun, 1 Nov 2015 15:56:50 +0000 (16:56 +0100)]
Fix compiler warnings

9 years agoconvert: Fix compiler warnings
Stefan Weil [Thu, 29 Oct 2015 08:35:54 +0000 (09:35 +0100)]
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>
9 years agoconvert: Remove unneeded type casts
Stefan Weil [Thu, 29 Oct 2015 08:12:03 +0000 (09:12 +0100)]
convert: Remove unneeded type casts

Signed-off-by: Stefan Weil <sw@weilnetz.de>
9 years agoMerge pull request #647 from stweil/master
Matthieu Darbois [Fri, 30 Oct 2015 21:50:06 +0000 (22:50 +0100)]
Merge pull request #647 from stweil/master

Fix typo in comments

9 years agoFix typo in comments
Stefan Weil [Fri, 23 Oct 2015 19:26:08 +0000 (20:26 +0100)]
Fix typo in comments

Signed-off-by: Stefan Weil <sw@weilnetz.de>
9 years agoMerge pull request #638 from stweil/master
Matthieu Darbois [Wed, 21 Oct 2015 18:53:22 +0000 (20:53 +0200)]
Merge pull request #638 from stweil/master

Fix format strings and unneeded assignment

9 years agoMerge branch 'master' into coc-qcc
mayeut [Wed, 21 Oct 2015 18:45:50 +0000 (20:45 +0200)]
Merge branch 'master' into coc-qcc

9 years agoMerge pull request #644 from smuehlst/opj_aligned_malloc
Matthieu Darbois [Wed, 21 Oct 2015 08:10:38 +0000 (10:10 +0200)]
Merge pull request #644 from smuehlst/opj_aligned_malloc

Avoid pointer arithmetic with (void *) pointers

9 years agoAvoid pointer arithmetic with (void *) pointers.
Stephan Mühlstrasser [Wed, 21 Oct 2015 07:01:31 +0000 (09:01 +0200)]
Avoid pointer arithmetic with (void *) pointers.

9 years agoMerge branch 'master' into opj_aligned_malloc
Stephan Mühlstrasser [Wed, 21 Oct 2015 06:57:45 +0000 (08:57 +0200)]
Merge branch 'master' into opj_aligned_malloc

Conflicts:
src/lib/openjp2/opj_malloc.c

9 years agoGeneric aligned malloc implementation update.
mayeut [Tue, 20 Oct 2015 22:09:04 +0000 (00:09 +0200)]
Generic aligned malloc implementation update.

Update #642

9 years agoGeneric aligned malloc implementation.
Stephan Mühlstrasser [Tue, 20 Oct 2015 11:02:51 +0000 (13:02 +0200)]
Generic aligned malloc implementation.

Used for platforms where none of posix_memalign(), memalign() and
_aligned_malloc() is available.

9 years agoGeneric aligned malloc implementation.
Stephan Mühlstrasser [Tue, 20 Oct 2015 11:02:51 +0000 (13:02 +0200)]
Generic aligned malloc implementation.

Used for platforms where none of posix_memalign(), memalign() and
_aligned_malloc() is available.

9 years agoMerge pull request #641 from smuehlst/opj_hp_issue_640
Matthieu Darbois [Mon, 19 Oct 2015 20:23:54 +0000 (22:23 +0200)]
Merge pull request #641 from smuehlst/opj_hp_issue_640

Fix HP compiler warning about redeclaration of function
Fix #640
Fix #243

9 years agoFix HP compiler warning about redeclaration of function (#640)
Stephan Mühlstrasser [Mon, 19 Oct 2015 10:14:01 +0000 (12:14 +0200)]
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.

9 years agoFix format strings and unneeded assignment
Stefan Weil [Sun, 18 Oct 2015 17:49:14 +0000 (19:49 +0200)]
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>
9 years agoMerge pull request #637 from stweil/fixes
Matthieu Darbois [Sun, 18 Oct 2015 12:42:58 +0000 (14:42 +0200)]
Merge pull request #637 from stweil/fixes

Fix repository for JPEG2000 test data

9 years agoMerge branch 'master' into coc-qcc
mayeut [Sun, 18 Oct 2015 01:23:38 +0000 (03:23 +0200)]
Merge branch 'master' into coc-qcc

9 years agoMerge pull request #636 from uclouvain/opj_malloc-625
Matthieu Darbois [Sun, 18 Oct 2015 01:14:55 +0000 (03:14 +0200)]
Merge pull request #636 from uclouvain/opj_malloc-625

Update allocation functions
Fix #625
Fix #624
Fix #635

9 years agoCleanup includes
mayeut [Sun, 18 Oct 2015 00:52:33 +0000 (02:52 +0200)]
Cleanup includes

9 years agoFix _aligned_malloc usage
mayeut [Sun, 18 Oct 2015 00:23:01 +0000 (02:23 +0200)]
Fix _aligned_malloc usage

9 years agoFix inconsistent behavior of malloc(0)
mayeut [Sat, 17 Oct 2015 00:55:09 +0000 (02:55 +0200)]
Fix inconsistent behavior of malloc(0)

Update #635
Update #625

9 years agoAdd missing checks. Fix crash on failed allocation.
mayeut [Sat, 17 Oct 2015 00:16:17 +0000 (02:16 +0200)]
Add missing checks. Fix crash on failed allocation.

9 years agoFixed crash on encoding
mayeut [Fri, 16 Oct 2015 23:30:23 +0000 (01:30 +0200)]
Fixed crash on encoding

Update #624
Update #625

9 years agoChange link for appveyor
Matthieu Darbois [Thu, 15 Oct 2015 21:31:42 +0000 (23:31 +0200)]
Change link for appveyor

9 years agoMerge pull request #634 from smuehlst/opj_aix_issue_633
Matthieu Darbois [Thu, 15 Oct 2015 11:14:58 +0000 (13:14 +0200)]
Merge pull request #634 from smuehlst/opj_aix_issue_633

Fix  #633.

9 years agoFix OpenJPEG GitHub issue #633.
Stephan Mühlstrasser [Thu, 15 Oct 2015 08:53:33 +0000 (10:53 +0200)]
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.

9 years agoMerge pull request #632 from mayeut/travis-reduce
Matthieu Darbois [Wed, 14 Oct 2015 23:18:17 +0000 (01:18 +0200)]
Merge pull request #632 from mayeut/travis-reduce

travis-ci: Include add ons in matrix

9 years agotravis-ci: Include add ons in matrix
mayeut [Wed, 14 Oct 2015 22:58:58 +0000 (00:58 +0200)]
travis-ci: Include add ons in matrix

9 years agoRemove useless environment variables
mayeut [Wed, 14 Oct 2015 22:17:05 +0000 (00:17 +0200)]
Remove useless environment variables

9 years agoAdd ABI check for PR
mayeut [Wed, 14 Oct 2015 20:43:39 +0000 (22:43 +0200)]
Add ABI check for PR

9 years agoUse SPDX full name & identifier for license
Matthieu Darbois [Tue, 13 Oct 2015 21:54:18 +0000 (23:54 +0200)]
Use SPDX full name & identifier for license

9 years agoAdd appveyor status badge & license badge
Matthieu Darbois [Tue, 13 Oct 2015 21:24:10 +0000 (23:24 +0200)]
Add appveyor status badge & license badge

9 years agoMerge branch 'master' into coc-qcc
mayeut [Tue, 13 Oct 2015 19:57:58 +0000 (21:57 +0200)]
Merge branch 'master' into coc-qcc

9 years agoCorrect unbound variable
mayeut [Tue, 13 Oct 2015 19:37:11 +0000 (21:37 +0200)]
Correct unbound variable

9 years agoMerge pull request #627 from mayeut/appveyor
Matthieu Darbois [Tue, 13 Oct 2015 19:27:01 +0000 (21:27 +0200)]
Merge pull request #627 from mayeut/appveyor

Add Appveyor

9 years agoRemove the explicit restrict keyword
Mathieu Malaterre [Tue, 13 Oct 2015 19:07:11 +0000 (21:07 +0200)]
Remove the explicit restrict keyword

It would trigger a compiler error on xlc compiler.  Fixes #620

9 years agoI do not recall exactly... I would say that the correct version should be
Giuseppe Baruffa [Tue, 13 Oct 2015 13:20:54 +0000 (15:20 +0200)]
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

9 years agoUpdate ci install script
mayeut [Mon, 12 Oct 2015 19:29:16 +0000 (21:29 +0200)]
Update ci install script

9 years agoRemove a possible uninitialized variable
Mathieu Malaterre [Mon, 12 Oct 2015 19:29:12 +0000 (21:29 +0200)]
Remove a possible uninitialized variable

Fixes #629

9 years agoMinor style fix to remove c++ comments
Mathieu Malaterre [Mon, 12 Oct 2015 19:25:53 +0000 (21:25 +0200)]
Minor style fix to remove c++ comments

9 years agominor tweaks to the code
Mathieu Malaterre [Mon, 12 Oct 2015 19:24:10 +0000 (21:24 +0200)]
minor tweaks to the code

9 years agoAdd appveyor.yml
mayeut [Sun, 11 Oct 2015 15:59:54 +0000 (17:59 +0200)]
Add appveyor.yml

9 years agoAdd exceptions
mayeut [Sun, 11 Oct 2015 15:33:40 +0000 (17:33 +0200)]
Add exceptions

9 years agoFind out Visual Studio version
mayeut [Sun, 11 Oct 2015 15:10:48 +0000 (17:10 +0200)]
Find out Visual Studio version

9 years agoAdd exceptions
mayeut [Sun, 11 Oct 2015 11:47:44 +0000 (13:47 +0200)]
Add exceptions

9 years agoCorrect exceptions
mayeut [Sat, 10 Oct 2015 21:43:50 +0000 (23:43 +0200)]
Correct exceptions

9 years agoFix an issue with parenthesis
Mathieu Malaterre [Sat, 10 Oct 2015 19:03:44 +0000 (21:03 +0200)]
Fix an issue with parenthesis

9 years agoAdd exceptions
mayeut [Sat, 10 Oct 2015 18:01:03 +0000 (20:01 +0200)]
Add exceptions

9 years agoCorrect script
mayeut [Sat, 10 Oct 2015 17:29:53 +0000 (19:29 +0200)]
Correct script

9 years agoUpdate kdu copy
mayeut [Sat, 10 Oct 2015 17:26:42 +0000 (19:26 +0200)]
Update kdu copy

9 years agoRe-enable cloning data
mayeut [Sat, 10 Oct 2015 17:20:50 +0000 (19:20 +0200)]
Re-enable cloning data

9 years agoupdate script
mayeut [Sat, 10 Oct 2015 17:15:52 +0000 (19:15 +0200)]
update script

9 years agocorrect kdu copy
mayeut [Sat, 10 Oct 2015 17:02:35 +0000 (19:02 +0200)]
correct kdu copy

9 years agokdb copy
mayeut [Sat, 10 Oct 2015 16:58:26 +0000 (18:58 +0200)]
kdb copy

9 years agocorrect OPJ_SITE
mayeut [Sat, 10 Oct 2015 16:45:58 +0000 (18:45 +0200)]
correct OPJ_SITE

9 years agorun with appveyor
mayeut [Sat, 10 Oct 2015 16:39:59 +0000 (18:39 +0200)]
run with appveyor

9 years agoAdd paranoid sentinels
Mathieu Malaterre [Sat, 10 Oct 2015 16:38:08 +0000 (18:38 +0200)]
Add paranoid sentinels

9 years agoexport updated path
mayeut [Sat, 10 Oct 2015 16:34:21 +0000 (18:34 +0200)]
export updated path

9 years agodebug appveyor
mayeut [Sat, 10 Oct 2015 16:29:37 +0000 (18:29 +0200)]
debug appveyor

9 years agocorrect warnings
mayeut [Sat, 10 Oct 2015 16:24:57 +0000 (18:24 +0200)]
correct warnings

9 years agoexport TRAVIS_OS_NAME
mayeut [Sat, 10 Oct 2015 16:21:42 +0000 (18:21 +0200)]
export TRAVIS_OS_NAME

9 years agoverbose
mayeut [Sat, 10 Oct 2015 16:19:09 +0000 (18:19 +0200)]
verbose

9 years agoUse make under windows
mayeut [Sat, 10 Oct 2015 16:15:28 +0000 (18:15 +0200)]
Use make under windows

9 years agodebug appveyor
mayeut [Sat, 10 Oct 2015 16:01:43 +0000 (18:01 +0200)]
debug appveyor

9 years agoimplement a portable aligned realloc
Mathieu Malaterre [Sat, 10 Oct 2015 15:51:29 +0000 (17:51 +0200)]
implement a portable aligned realloc

9 years agoremove cygwin specifics
mayeut [Sat, 10 Oct 2015 15:51:13 +0000 (17:51 +0200)]
remove cygwin specifics

9 years agoDebug build
mayeut [Sat, 10 Oct 2015 15:31:04 +0000 (17:31 +0200)]
Debug build

9 years agoCorrect make script
mayeut [Sat, 10 Oct 2015 15:27:49 +0000 (17:27 +0200)]
Correct make script

9 years agoAdd OPJ_BINARY_DIR
mayeut [Sat, 10 Oct 2015 15:25:50 +0000 (17:25 +0200)]
Add OPJ_BINARY_DIR

9 years agoCorrect source path
mayeut [Sat, 10 Oct 2015 15:16:25 +0000 (17:16 +0200)]
Correct source path