diff options
| -rw-r--r-- | src/lib/openjp2/opj_malloc.c | 2 | ||||
| -rw-r--r-- | src/lib/openjp3d/tcd.c | 4 | ||||
| -rw-r--r-- | src/lib/openmj2/tcd.c | 2 | ||||
| -rw-r--r-- | tools/travis-ci/knownfailures-windows-vs2010-x86-Release-3rdP.txt | 2 | ||||
| -rw-r--r-- | tools/travis-ci/knownfailures-windows-vs2015-x64-Release-3rdP.txt | 2 | ||||
| -rw-r--r-- | tools/travis-ci/knownfailures-windows-vs2015-x86-Release-3rdP.txt | 2 |
6 files changed, 10 insertions, 4 deletions
diff --git a/src/lib/openjp2/opj_malloc.c b/src/lib/openjp2/opj_malloc.c index 939d8282..3c8cedf7 100644 --- a/src/lib/openjp2/opj_malloc.c +++ b/src/lib/openjp2/opj_malloc.c @@ -115,7 +115,7 @@ static INLINE void *opj_aligned_realloc_n(void *ptr, size_t alignment, size_t ne /* no portable aligned realloc */ #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 */ /* we simply use `size_t` to cast, since we are only interest in binary AND * operator */ diff --git a/src/lib/openjp3d/tcd.c b/src/lib/openjp3d/tcd.c index 0c662ce8..1d0d0f52 100644 --- a/src/lib/openjp3d/tcd.c +++ b/src/lib/openjp3d/tcd.c @@ -1601,7 +1601,7 @@ bool tcd_decode_tile(opj_tcd_t *tcd, unsigned char *src, int len, int tileno) { if (l == -999) { 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-----------------*/ @@ -1631,7 +1631,7 @@ bool tcd_decode_tile(opj_tcd_t *tcd, unsigned char *src, int len, int tileno) { golomb_destroy(gr); if (l == -999) { 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"); } */ } diff --git a/src/lib/openmj2/tcd.c b/src/lib/openmj2/tcd.c index 5eb5f4bb..7875737c 100644 --- a/src/lib/openmj2/tcd.c +++ b/src/lib/openmj2/tcd.c @@ -1386,7 +1386,7 @@ opj_bool tcd_decode_tile(opj_tcd_t *tcd, unsigned char *src, int len, int tileno if (l == -999) { 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-----------------*/ diff --git a/tools/travis-ci/knownfailures-windows-vs2010-x86-Release-3rdP.txt b/tools/travis-ci/knownfailures-windows-vs2010-x86-Release-3rdP.txt index 70b6d98a..d243c235 100644 --- a/tools/travis-ci/knownfailures-windows-vs2010-x86-Release-3rdP.txt +++ b/tools/travis-ci/knownfailures-windows-vs2010-x86-Release-3rdP.txt @@ -42,3 +42,5 @@ NR-DEC-issue205.jp2-253-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-091-CIELab.jp2-256-decode-md5 +ETS-C1P0-p0_12.j2k-compare2ref +NR-C1P0-p0_12.j2k-compare2base diff --git a/tools/travis-ci/knownfailures-windows-vs2015-x64-Release-3rdP.txt b/tools/travis-ci/knownfailures-windows-vs2015-x64-Release-3rdP.txt index c0f64cc0..e52efb85 100644 --- a/tools/travis-ci/knownfailures-windows-vs2015-x64-Release-3rdP.txt +++ b/tools/travis-ci/knownfailures-windows-vs2015-x64-Release-3rdP.txt @@ -1,3 +1,5 @@ NR-ENC-Bretagne2.ppm-7-compare_dec-ref-out2base NR-DEC-kodak_2layers_lrcp.j2c-31-decode-md5 NR-DEC-kodak_2layers_lrcp.j2c-32-decode-md5 +ETS-C1P0-p0_12.j2k-compare2ref +NR-C1P0-p0_12.j2k-compare2base diff --git a/tools/travis-ci/knownfailures-windows-vs2015-x86-Release-3rdP.txt b/tools/travis-ci/knownfailures-windows-vs2015-x86-Release-3rdP.txt index c0f64cc0..e52efb85 100644 --- a/tools/travis-ci/knownfailures-windows-vs2015-x86-Release-3rdP.txt +++ b/tools/travis-ci/knownfailures-windows-vs2015-x86-Release-3rdP.txt @@ -1,3 +1,5 @@ NR-ENC-Bretagne2.ppm-7-compare_dec-ref-out2base NR-DEC-kodak_2layers_lrcp.j2c-31-decode-md5 NR-DEC-kodak_2layers_lrcp.j2c-32-decode-md5 +ETS-C1P0-p0_12.j2k-compare2ref +NR-C1P0-p0_12.j2k-compare2base |