diff options
| author | mayeut <mayeut@users.noreply.github.com> | 2016-01-03 02:09:04 +0100 |
|---|---|---|
| committer | mayeut <mayeut@users.noreply.github.com> | 2016-01-03 02:09:04 +0100 |
| commit | 2e4fadf330c1039d2181e6ba05c80f1cff6d0947 (patch) | |
| tree | c14ca7b6d2765dcafd59e219249913de7344f6f9 /src/lib | |
| parent | 51cbcd5748cd64832a578dfa30e630fdd79c2775 (diff) | |
| parent | 8f9905936cef1427f9372dd192a054b3c852232a (diff) | |
Merge remote-tracking branch 'uclouvain/master'
Diffstat (limited to 'src/lib')
| -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 |
3 files changed, 4 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-----------------*/ |