openjpeg.git
8 years agoAdd missing source for the JPIP library and executables (issue #658) (#659)
Stefan Weil [Tue, 10 May 2016 20:02:49 +0000 (22:02 +0200)]
Add missing source for the JPIP library and executables (issue #658) (#659)

They all need opj_malloc and other functions from opc_malloc.c.

Signed-off-by: Stefan Weil <sw@weilnetz.de>
8 years agoCorrect expected result for test of issue 495
mayeut [Sun, 8 May 2016 18:26:12 +0000 (20:26 +0200)]
Correct expected result for test of issue 495

8 years agoFix Out-of-Bounds Access in function opj_tgt_reset
mayeut [Sun, 8 May 2016 18:10:13 +0000 (20:10 +0200)]
Fix Out-of-Bounds Access in function opj_tgt_reset

Fix uclouvain/openjpeg#775

8 years agoFix Heap Buffer Overflow in function color_cmyk_to_rgb
mayeut [Sun, 8 May 2016 17:18:05 +0000 (19:18 +0200)]
Fix Heap Buffer Overflow in function color_cmyk_to_rgb

Fix uclouvain/openjpeg#774

8 years agoFix division by zero
mayeut [Sun, 8 May 2016 16:40:12 +0000 (18:40 +0200)]
Fix division by zero

Fix uclouvain/openjpeg#733

8 years agoUpdate lcms2 (#773)
Matthieu Darbois [Tue, 3 May 2016 20:22:03 +0000 (22:22 +0200)]
Update lcms2 (#773)

Update to mm2/Little-CMS@e342f44

8 years agoMerge pull request #769 from julienmalik/cmake_lowercase
julienmalik [Mon, 2 May 2016 19:57:55 +0000 (21:57 +0200)]
Merge pull request #769 from julienmalik/cmake_lowercase

Use lowercase for cmake commands consistenly

8 years agoUse lowercase for cmake commands consistenly 769/head
Julien Malik [Mon, 2 May 2016 14:03:16 +0000 (16:03 +0200)]
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

8 years agoMerge pull request #767 from julienmalik/fix_memset_null_pointer
julienmalik [Mon, 2 May 2016 12:34:32 +0000 (14:34 +0200)]
Merge pull request #767 from julienmalik/fix_memset_null_pointer

Fix UBSan gcc warning for first arg to memset non null

8 years agoMerge pull request #768 from julienmalik/filter_clang_warnings
julienmalik [Mon, 2 May 2016 12:32:08 +0000 (14:32 +0200)]
Merge pull request #768 from julienmalik/filter_clang_warnings

Ignore clang's summary warning

8 years agoIgnore clang's summary warning 768/head
Julien Malik [Mon, 2 May 2016 10:55:43 +0000 (12:55 +0200)]
Ignore clang's summary warning

This assumes prior text has matched some other warning expression.

This reduces the warnings reported for clang build on the dashboard,
which were caused only by the "XXX warnings generated." message.
For some reason they were not reported when not using ctest launchers.

This commit allows to confidently use ctest launchers to improve
dashboard reports.

8 years agoFix UBSan gcc warning for first arg to memset non null 767/head
Julien Malik [Mon, 2 May 2016 10:13:24 +0000 (12:13 +0200)]
Fix UBSan gcc warning for first arg to memset non null

8 years agoUpdate to libtiff-4.0.6 (#764)
Matthieu Darbois [Sun, 1 May 2016 16:05:46 +0000 (18:05 +0200)]
Update to libtiff-4.0.6 (#764)

8 years agoAdd tests for recent issues
mayeut [Sat, 30 Apr 2016 16:51:36 +0000 (18:51 +0200)]
Add tests for recent issues

Update uclouvain/openjpeg#725
Update uclouvain/openjpeg#726

8 years agoUpdate lcms (#544)
Matthieu Darbois [Sat, 30 Apr 2016 15:58:04 +0000 (17:58 +0200)]
Update lcms (#544)

Update to mm2/Little-CMS@0e8234e090d6aab33f90e2eb0296f30aa0705e57

8 years agoMerge pull request #706 from mayeut/issue135
Antonin Descampe [Sat, 30 Apr 2016 11:51:01 +0000 (13:51 +0200)]
Merge pull request #706 from mayeut/issue135

Fix issue 135
The fix is legal regarding the standard but I did not manage to find out if it covers a bug in opj_t2_read_packet_data or if the file is corrupted

8 years agoFix some coverity warnings
mayeut [Sat, 30 Apr 2016 10:15:22 +0000 (12:15 +0200)]
Fix some coverity warnings

8 years agoFix bad call to fclose with NULL pointer
mayeut [Fri, 29 Apr 2016 23:50:33 +0000 (01:50 +0200)]
Fix bad call to fclose with NULL pointer

8 years agoFix warnings (#763)
Matthieu Darbois [Fri, 29 Apr 2016 23:12:16 +0000 (01:12 +0200)]
Fix warnings (#763)

8 years agoFix Out-Of-Bounds Read in sycc42x_to_rgb function (#745)
Matthieu Darbois [Fri, 29 Apr 2016 22:33:27 +0000 (00:33 +0200)]
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

8 years agoFix heap-buffer-overflow in color_esycc_to_rgb (#748)
Matthieu Darbois [Fri, 29 Apr 2016 21:51:14 +0000 (23:51 +0200)]
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

8 years agocppcheck fix for openjp2 (#740)
julienmalik [Fri, 29 Apr 2016 21:49:17 +0000 (23:49 +0200)]
cppcheck fix for openjp2 (#740)

8 years agoCheck SSIZ is valid in opj_j2k_read_siz (#762)
Matthieu Darbois [Thu, 28 Apr 2016 17:20:14 +0000 (19:20 +0200)]
Check SSIZ is valid in opj_j2k_read_siz (#762)

8 years agoFix unsigned int overflow reported by UBSan (#761)
Matthieu Darbois [Thu, 28 Apr 2016 11:16:43 +0000 (13:16 +0200)]
Fix unsigned int overflow reported by UBSan (#761)

* Fix unsigned int overflow reported by UBSan

Please add -DOPJ_UBSAN_BUILD to CFLAGS when building with
-fsanitize=undefined,unsigned-integer-overflow

It seems clang/gcc do not allow to disable checking for block of code
other than function or file.

8 years agoFix implicit float-to-bool conversions (#752)
julienmalik [Thu, 28 Apr 2016 09:52:45 +0000 (11:52 +0200)]
Fix implicit float-to-bool conversions (#752)

8 years agoFix unsigned int overflow reported by UBSan (#759)
Matthieu Darbois [Wed, 27 Apr 2016 22:18:37 +0000 (00:18 +0200)]
Fix unsigned int overflow reported by UBSan (#759)

8 years agoFix issue 135 706/head
mayeut [Mon, 25 Jan 2016 21:16:49 +0000 (22:16 +0100)]
Fix issue 135

dwt_interleave_h.gsr105.jp2 now has the same output as kakadu
issue399 is corrupted. Only the corrupted part changes.

Update known failures for x86 MD5

NR-DEC-kodak_2layers_lrcp.j2c-31-decode-md5
NR-DEC-kodak_2layers_lrcp.j2c-32-decode-md5
NR-DEC-issue135.j2k-68-decode-md5

8 years agoAdd clang 3.9 build to Travis matrix (#753)
julienmalik [Wed, 27 Apr 2016 21:05:43 +0000 (23:05 +0200)]
Add clang 3.9 build to Travis matrix (#753)

8 years agoFix negative shift left reported by UBSan (#758)
Matthieu Darbois [Wed, 27 Apr 2016 19:56:09 +0000 (21:56 +0200)]
Fix negative shift left reported by UBSan (#758)

Follow-up of #757

This shall have no performance impact on 2’s complement machine where
the compiler replaces the multiplication by power of two (constant) by
a left shift.
Verified at least on MacOS Xcode 7.3, same assembly generated after fix.

8 years agoRemove whitespace and CR at line endings (#678)
Stefan Weil [Tue, 26 Apr 2016 20:12:11 +0000 (22:12 +0200)]
Remove whitespace and CR at line endings (#678)

Signed-off-by: Stefan Weil <sw@weilnetz.de>
8 years agoFix negative shift left reported by UBSan (#757)
Matthieu Darbois [Tue, 26 Apr 2016 20:06:06 +0000 (22:06 +0200)]
Fix negative shift left reported by UBSan (#757)

This shall have no performance impact on 2’s complement machine where
the compiler replaces the multiplication by power of two (constant) by
a left shift.
Verified at least on MacOS Xcode 7.3, same assembly generated after fix.

8 years agoDo not define __attribute__ in opj_includes.h (#751)
Matthieu Darbois [Sat, 23 Apr 2016 12:17:31 +0000 (14:17 +0200)]
Do not define __attribute__ in opj_includes.h (#751)

Fix #727

8 years agoMerge pull request #750 from mayeut/issue-729-2
Matthieu Darbois [Sat, 23 Apr 2016 08:51:46 +0000 (10:51 +0200)]
Merge pull request #750 from mayeut/issue-729-2

Allow to read/write 3/5/7/9/11/13/15 bpp TIF files

8 years agoAllow to write 3/5/7/9/11/13/15 bpp TIF files 750/head
mayeut [Fri, 22 Apr 2016 23:53:32 +0000 (01:53 +0200)]
Allow to write 3/5/7/9/11/13/15 bpp TIF files

Update uclouvain/openjpeg#729

8 years agoAllow to read 3/5/7/9/11/13/15 bpp TIF files
mayeut [Sat, 23 Apr 2016 02:24:04 +0000 (04:24 +0200)]
Allow to read 3/5/7/9/11/13/15 bpp TIF files

8 years agoMerge pull request #746 from senbox-org/update_cmake_jpylyzer
Matthieu Darbois [Fri, 22 Apr 2016 10:54:25 +0000 (12:54 +0200)]
Merge pull request #746 from senbox-org/update_cmake_jpylyzer

Update cmake & jpylyzer for travis builds

8 years agoMerge pull request #747 from julienmalik/update_libpng
Matthieu Darbois [Fri, 22 Apr 2016 08:48:40 +0000 (10:48 +0200)]
Merge pull request #747 from julienmalik/update_libpng

update libpng to from 1.6.17 to 1.6.21

8 years agoImport pnglibconf.h.prebuilt as new pnglibconf.h 747/head
Julien Malik [Thu, 21 Apr 2016 22:16:16 +0000 (00:16 +0200)]
Import pnglibconf.h.prebuilt as new pnglibconf.h

8 years agoupdate libpng to from 1.6.17 to 1.6.21
Julien Malik [Thu, 21 Apr 2016 16:49:15 +0000 (18:49 +0200)]
update libpng to from 1.6.17 to 1.6.21

8 years agoUpdate jpylyzer to 1.17.0 746/head
Julien Malik [Tue, 19 Apr 2016 13:25:42 +0000 (15:25 +0200)]
Update jpylyzer to 1.17.0

8 years agoupgrade cmake to 3.5.2
Julien Malik [Tue, 19 Apr 2016 13:22:49 +0000 (15:22 +0200)]
upgrade cmake to 3.5.2

8 years agoMerge pull request #708 from GrokImageCompression/issue_695
Antonin Descampe [Mon, 18 Apr 2016 08:51:51 +0000 (10:51 +0200)]
Merge pull request #708 from GrokImageCompression/issue_695

issue #695 MQ Encode: ensure that bp pointer never points to uninitialized memory

8 years agoMerge pull request #734 from senbox-org/opj_dump_dead_code
Antonin Descampe [Tue, 12 Apr 2016 08:48:02 +0000 (10:48 +0200)]
Merge pull request #734 from senbox-org/opj_dump_dead_code

Remove dead code in opj_dump

8 years agoMerge pull request #735 from senbox-org/cppcheck_fix_openjp2
Antonin Descampe [Tue, 12 Apr 2016 08:47:28 +0000 (10:47 +0200)]
Merge pull request #735 from senbox-org/cppcheck_fix_openjp2

Fix uninitialized variable reported by cppcheck

8 years agoFix uninitialized variable reported by cppcheck 735/head
Julien Malik [Sat, 9 Apr 2016 17:02:05 +0000 (19:02 +0200)]
Fix uninitialized variable reported by cppcheck

Also reorder initialization to follow declaration order

8 years agoRemove dead code in opj_dump 734/head
Julien Malik [Sat, 9 Apr 2016 16:34:11 +0000 (18:34 +0200)]
Remove dead code in opj_dump

8 years agosuppress valgrind error - avoid accessing uninitialized memory in mq encoder 708/head
Aaron Boxer [Sat, 30 Jan 2016 15:05:46 +0000 (10:05 -0500)]
suppress valgrind error - avoid accessing uninitialized memory in mq encoder

8 years agoissue #695 MQ Encode: ensure that bp pointer never points to uninitialized memory
Aaron Boxer [Fri, 29 Jan 2016 00:34:00 +0000 (19:34 -0500)]
issue #695 MQ Encode: ensure that bp pointer never points to uninitialized memory

8 years agofixed tile numbering
Antonin Descampe [Mon, 25 Jan 2016 16:30:43 +0000 (17:30 +0100)]
fixed tile numbering

Fixes #245

8 years agoMerge pull request #648 from stweil/alloc
Antonin Descampe [Sat, 23 Jan 2016 18:43:09 +0000 (19:43 +0100)]
Merge pull request #648 from stweil/alloc

Fix support of posix_memalloc for Linux

8 years agoUpdate known failures
mayeut [Sun, 10 Jan 2016 23:35:47 +0000 (00:35 +0100)]
Update known failures

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 690/head
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 687/head
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 agoFix support of posix_memalign for Linux 648/head
Stefan Weil [Sun, 1 Nov 2015 19:37:19 +0000 (20:37 +0100)]
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>
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 686/head
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 684/head
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 679/head
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>
8 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

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

8 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

8 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

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

This reverts commit c414d9c238f404980e6e8b17db652a7fb2635cdf.

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

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

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

8 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

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

8 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

8 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

8 years agoopj_decompress: Update error message 651/head
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>
8 years agoFin compiler warnings
mayeut [Sun, 1 Nov 2015 16:08:47 +0000 (17:08 +0100)]
Fin compiler warnings

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

8 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>
8 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>
8 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

8 years agoFix typo in comments 647/head
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>
8 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

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

8 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

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

8 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

8 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

8 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.

8 years agoGeneric aligned malloc implementation. 643/head
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.

8 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

8 years agoFix HP compiler warning about redeclaration of function (#640) 641/head
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.

8 years agoFix format strings and unneeded assignment 638/head
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>
8 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

8 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

8 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