diff options
author | Sergey Sharybin <sergey.vfx@gmail.com> | 2016-04-20 11:36:58 +0300 |
---|---|---|
committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2016-04-20 11:36:58 +0300 |
commit | 75c9fe428fa8ed1dec093de6a7b2dc6ca042f6d6 (patch) | |
tree | 7c7c2ea8da401497a63fa7f66cdbe6756b039958 /extern/libopenjpeg/bio.c | |
parent | 81a477f4dc999918ba66413a286f5a0b1c0c4e79 (diff) |
Update bundled openjpeg from 1.5.0 to 1.5.2
Solves following issues:
- Quite reasonable amount of paranoid warnings were solved by an upstream
- Upstream seems to have all fixes needed for FreeBSD and OSX already
- Brings all fixes and such from upstream
Diffstat (limited to 'extern/libopenjpeg/bio.c')
-rw-r--r-- | extern/libopenjpeg/bio.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/extern/libopenjpeg/bio.c b/extern/libopenjpeg/bio.c index 4c02f464d8d..f04f3e503fb 100644 --- a/extern/libopenjpeg/bio.c +++ b/extern/libopenjpeg/bio.c @@ -42,7 +42,7 @@ Write a bit @param bio BIO handle @param b Bit to write (0 or 1) */ -static void bio_putbit(opj_bio_t *bio, int b); +static void bio_putbit(opj_bio_t *bio, unsigned int b); /** Read a bit @param bio BIO handle @@ -78,7 +78,7 @@ static int bio_byteout(opj_bio_t *bio) { if (bio->bp >= bio->end) { return 1; } - *bio->bp++ = bio->buf >> 8; + *bio->bp++ = (unsigned char)(bio->buf >> 8); return 0; } @@ -92,7 +92,7 @@ static int bio_bytein(opj_bio_t *bio) { return 0; } -static void bio_putbit(opj_bio_t *bio, int b) { +static void bio_putbit(opj_bio_t *bio, unsigned int b) { if (bio->ct == 0) { bio_byteout(bio); } @@ -126,7 +126,7 @@ void bio_destroy(opj_bio_t *bio) { } int bio_numbytes(opj_bio_t *bio) { - return (bio->bp - bio->start); + return (int)(bio->bp - bio->start); } void bio_init_enc(opj_bio_t *bio, unsigned char *bp, int len) { |