walkero
/
openjpeg
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

Merge remote-tracking branch 'uclouvain/master'

This commit is contained in:
mayeut 2016-01-03 02:09:04 +01:00
parent 51cbcd5748 8f9905936c
commit 2e4fadf330
6 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/lib/openjp2/opj_malloc.c
View File

@ -115,7 +115,7 @@ static INLINE void *opj_aligned_realloc_n(void *ptr, size_t alignment, size_t ne
/* no portable aligned realloc */ /* no portable aligned realloc */
#if defined(OPJ_HAVE_POSIX_MEMALIGN) || defined(OPJ_HAVE_MEMALIGN) #if defined(OPJ_HAVE_POSIX_MEMALIGN) || defined(OPJ_HAVE_MEMALIGN)
/* glibc doc states one can mixed aligned malloc with realloc */ /* glibc doc states one can mix aligned malloc with realloc */
r_ptr = realloc( ptr, new_size ); /* fast path */ r_ptr = realloc( ptr, new_size ); /* fast path */
/* we simply use `size_t` to cast, since we are only interest in binary AND /* we simply use `size_t` to cast, since we are only interest in binary AND
* operator */ * operator */

4
src/lib/openjp3d/tcd.c
View File

@ -1601,7 +1601,7 @@ bool tcd_decode_tile(opj_tcd_t *tcd, unsigned char *src, int len, int tileno) {
if (l == -999) { if (l == -999) {
eof = 1; eof = 1;
opj_event_msg(tcd->cinfo, EVT_ERROR, "Tcd_decode_tile: incomplete bistream\n"); opj_event_msg(tcd->cinfo, EVT_ERROR, "Tcd_decode_tile: incomplete bitstream\n");
} }
/*------------------TIER1-----------------*/ /*------------------TIER1-----------------*/
@ -1631,7 +1631,7 @@ bool tcd_decode_tile(opj_tcd_t *tcd, unsigned char *src, int len, int tileno) {
golomb_destroy(gr); golomb_destroy(gr);
if (l == -999) { if (l == -999) {
eof = 1; eof = 1;
opj_event_msg(tcd->cinfo, EVT_ERROR, "Tcd_decode_tile: incomplete bistream\n"); opj_event_msg(tcd->cinfo, EVT_ERROR, "Tcd_decode_tile: incomplete bitstream\n");
} }
*/ */
} }

2
src/lib/openmj2/tcd.c
View File

@ -1386,7 +1386,7 @@ opj_bool tcd_decode_tile(opj_tcd_t *tcd, unsigned char *src, int len, int tileno
if (l == -999) { if (l == -999) {
eof = 1; eof = 1;
opj_event_msg(tcd->cinfo, EVT_ERROR, "tcd_decode: incomplete bistream\n"); opj_event_msg(tcd->cinfo, EVT_ERROR, "tcd_decode: incomplete bitstream\n");
} }
/*------------------TIER1-----------------*/ /*------------------TIER1-----------------*/

2
tools/travis-ci/knownfailures-windows-vs2010-x86-Release-3rdP.txt
View File

@ -42,3 +42,5 @@ NR-DEC-issue205.jp2-253-decode-md5
NR-DEC-issue236-ESYCC-CDEF.jp2-254-decode-md5 NR-DEC-issue236-ESYCC-CDEF.jp2-254-decode-md5
NR-DEC-issue559-eci-090-CIELab.jp2-255-decode-md5 NR-DEC-issue559-eci-090-CIELab.jp2-255-decode-md5
NR-DEC-issue559-eci-091-CIELab.jp2-256-decode-md5 NR-DEC-issue559-eci-091-CIELab.jp2-256-decode-md5
ETS-C1P0-p0_12.j2k-compare2ref
NR-C1P0-p0_12.j2k-compare2base

2
tools/travis-ci/knownfailures-windows-vs2015-x64-Release-3rdP.txt
View File

@ -1,3 +1,5 @@
NR-ENC-Bretagne2.ppm-7-compare_dec-ref-out2base NR-ENC-Bretagne2.ppm-7-compare_dec-ref-out2base
NR-DEC-kodak_2layers_lrcp.j2c-31-decode-md5 NR-DEC-kodak_2layers_lrcp.j2c-31-decode-md5
NR-DEC-kodak_2layers_lrcp.j2c-32-decode-md5 NR-DEC-kodak_2layers_lrcp.j2c-32-decode-md5
ETS-C1P0-p0_12.j2k-compare2ref
NR-C1P0-p0_12.j2k-compare2base

2
tools/travis-ci/knownfailures-windows-vs2015-x86-Release-3rdP.txt
View File

@ -1,3 +1,5 @@
NR-ENC-Bretagne2.ppm-7-compare_dec-ref-out2base NR-ENC-Bretagne2.ppm-7-compare_dec-ref-out2base
NR-DEC-kodak_2layers_lrcp.j2c-31-decode-md5 NR-DEC-kodak_2layers_lrcp.j2c-31-decode-md5
NR-DEC-kodak_2layers_lrcp.j2c-32-decode-md5 NR-DEC-kodak_2layers_lrcp.j2c-32-decode-md5
ETS-C1P0-p0_12.j2k-compare2ref
NR-C1P0-p0_12.j2k-compare2base