diff options
Diffstat (limited to 'extern/libopenjpeg/bio.c')
| -rw-r--r-- | extern/libopenjpeg/bio.c | 95 |
1 files changed, 51 insertions, 44 deletions
diff --git a/extern/libopenjpeg/bio.c b/extern/libopenjpeg/bio.c index f04f3e503fb..5d49580178b 100644 --- a/extern/libopenjpeg/bio.c +++ b/extern/libopenjpeg/bio.c @@ -1,9 +1,15 @@ /* - * Copyright (c) 2002-2007, Communications and Remote Sensing Laboratory, Universite catholique de Louvain (UCL), Belgium - * Copyright (c) 2002-2007, Professor Benoit Macq + * The copyright in this software is being made available under the 2-clauses + * BSD License, included below. This software may be subject to other third + * party and contributor rights, including patent rights, and no such rights + * are granted under this license. + * + * Copyright (c) 2002-2014, Universite catholique de Louvain (UCL), Belgium + * Copyright (c) 2002-2014, Professor Benoit Macq * Copyright (c) 2001-2003, David Janssens * Copyright (c) 2002-2003, Yannick Verschueren - * Copyright (c) 2003-2007, Francois-Olivier Devaux and Antonin Descampe + * Copyright (c) 2003-2007, Francois-Olivier Devaux + * Copyright (c) 2003-2014, Antonin Descampe * Copyright (c) 2005, Herve Drolon, FreeImage Team * All rights reserved. * @@ -42,25 +48,25 @@ Write a bit @param bio BIO handle @param b Bit to write (0 or 1) */ -static void bio_putbit(opj_bio_t *bio, unsigned int b); +static void opj_bio_putbit(opj_bio_t *bio, OPJ_UINT32 b); /** Read a bit @param bio BIO handle @return Returns the read bit */ -static int bio_getbit(opj_bio_t *bio); +static OPJ_UINT32 opj_bio_getbit(opj_bio_t *bio); /** Write a byte @param bio BIO handle -@return Returns 0 if successful, returns 1 otherwise +@return Returns OPJ_TRUE if successful, returns OPJ_FALSE otherwise */ -static int bio_byteout(opj_bio_t *bio); +static OPJ_BOOL opj_bio_byteout(opj_bio_t *bio); /** Read a byte @param bio BIO handle -@return Returns 0 if successful, returns 1 otherwise +@return Returns OPJ_TRUE if successful, returns OPJ_FALSE otherwise */ -static int bio_bytein(opj_bio_t *bio); +static OPJ_BOOL opj_bio_bytein(opj_bio_t *bio); /*@}*/ @@ -72,37 +78,37 @@ static int bio_bytein(opj_bio_t *bio); ========================================================== */ -static int bio_byteout(opj_bio_t *bio) { +OPJ_BOOL opj_bio_byteout(opj_bio_t *bio) { bio->buf = (bio->buf << 8) & 0xffff; bio->ct = bio->buf == 0xff00 ? 7 : 8; if (bio->bp >= bio->end) { - return 1; + return OPJ_FALSE; } - *bio->bp++ = (unsigned char)(bio->buf >> 8); - return 0; + *bio->bp++ = (OPJ_BYTE)(bio->buf >> 8); + return OPJ_TRUE; } -static int bio_bytein(opj_bio_t *bio) { +OPJ_BOOL opj_bio_bytein(opj_bio_t *bio) { bio->buf = (bio->buf << 8) & 0xffff; bio->ct = bio->buf == 0xff00 ? 7 : 8; if (bio->bp >= bio->end) { - return 1; + return OPJ_FALSE; } bio->buf |= *bio->bp++; - return 0; + return OPJ_TRUE; } -static void bio_putbit(opj_bio_t *bio, unsigned int b) { +void opj_bio_putbit(opj_bio_t *bio, OPJ_UINT32 b) { if (bio->ct == 0) { - bio_byteout(bio); + opj_bio_byteout(bio); /* MSD: why not check the return value of this function ? */ } bio->ct--; bio->buf |= b << bio->ct; } -static int bio_getbit(opj_bio_t *bio) { +OPJ_UINT32 opj_bio_getbit(opj_bio_t *bio) { if (bio->ct == 0) { - bio_bytein(bio); + opj_bio_bytein(bio); /* MSD: why not check the return value of this function ? */ } bio->ct--; return (bio->buf >> bio->ct) & 1; @@ -114,22 +120,22 @@ static int bio_getbit(opj_bio_t *bio) { ========================================================== */ -opj_bio_t* bio_create(void) { +opj_bio_t* opj_bio_create(void) { opj_bio_t *bio = (opj_bio_t*)opj_malloc(sizeof(opj_bio_t)); return bio; } -void bio_destroy(opj_bio_t *bio) { +void opj_bio_destroy(opj_bio_t *bio) { if(bio) { opj_free(bio); } } -int bio_numbytes(opj_bio_t *bio) { - return (int)(bio->bp - bio->start); +ptrdiff_t opj_bio_numbytes(opj_bio_t *bio) { + return (bio->bp - bio->start); } -void bio_init_enc(opj_bio_t *bio, unsigned char *bp, int len) { +void opj_bio_init_enc(opj_bio_t *bio, OPJ_BYTE *bp, OPJ_UINT32 len) { bio->start = bp; bio->end = bp + len; bio->bp = bp; @@ -137,7 +143,7 @@ void bio_init_enc(opj_bio_t *bio, unsigned char *bp, int len) { bio->ct = 8; } -void bio_init_dec(opj_bio_t *bio, unsigned char *bp, int len) { +void opj_bio_init_dec(opj_bio_t *bio, OPJ_BYTE *bp, OPJ_UINT32 len) { bio->start = bp; bio->end = bp + len; bio->bp = bp; @@ -145,43 +151,44 @@ void bio_init_dec(opj_bio_t *bio, unsigned char *bp, int len) { bio->ct = 0; } -void bio_write(opj_bio_t *bio, int v, int n) { - int i; - for (i = n - 1; i >= 0; i--) { - bio_putbit(bio, (v >> i) & 1); +void opj_bio_write(opj_bio_t *bio, OPJ_UINT32 v, OPJ_UINT32 n) { + OPJ_UINT32 i; + for (i = n - 1; i < n; i--) { + opj_bio_putbit(bio, (v >> i) & 1); } } -int bio_read(opj_bio_t *bio, int n) { - int i, v; +OPJ_UINT32 opj_bio_read(opj_bio_t *bio, OPJ_UINT32 n) { + OPJ_UINT32 i; + OPJ_UINT32 v; v = 0; - for (i = n - 1; i >= 0; i--) { - v += bio_getbit(bio) << i; + for (i = n - 1; i < n; i--) { + v += opj_bio_getbit(bio) << i; } return v; } -int bio_flush(opj_bio_t *bio) { +OPJ_BOOL opj_bio_flush(opj_bio_t *bio) { bio->ct = 0; - if (bio_byteout(bio)) { - return 1; + if (! opj_bio_byteout(bio)) { + return OPJ_FALSE; } if (bio->ct == 7) { bio->ct = 0; - if (bio_byteout(bio)) { - return 1; + if (! opj_bio_byteout(bio)) { + return OPJ_FALSE; } } - return 0; + return OPJ_TRUE; } -int bio_inalign(opj_bio_t *bio) { +OPJ_BOOL opj_bio_inalign(opj_bio_t *bio) { bio->ct = 0; if ((bio->buf & 0xff) == 0xff) { - if (bio_bytein(bio)) { - return 1; + if (! opj_bio_bytein(bio)) { + return OPJ_FALSE; } bio->ct = 0; } - return 0; + return OPJ_TRUE; } |