diff options
Diffstat (limited to 'extern/libopenjpeg/bio.h')
-rw-r--r-- | extern/libopenjpeg/bio.h | 47 |
1 files changed, 19 insertions, 28 deletions
diff --git a/extern/libopenjpeg/bio.h b/extern/libopenjpeg/bio.h index fba2428476a..764d7cb2e92 100644 --- a/extern/libopenjpeg/bio.h +++ b/extern/libopenjpeg/bio.h @@ -1,15 +1,9 @@ /* - * 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) 2002-2007, Communications and Remote Sensing Laboratory, Universite catholique de Louvain (UCL), Belgium + * Copyright (c) 2002-2007, Professor Benoit Macq * Copyright (c) 2001-2003, David Janssens * Copyright (c) 2002-2003, Yannick Verschueren - * Copyright (c) 2003-2007, Francois-Olivier Devaux - * Copyright (c) 2003-2014, Antonin Descampe + * Copyright (c) 2003-2007, Francois-Olivier Devaux and Antonin Descampe * Copyright (c) 2005, Herve Drolon, FreeImage Team * All rights reserved. * @@ -37,9 +31,6 @@ #ifndef __BIO_H #define __BIO_H - -#include <stddef.h> /* ptrdiff_t */ - /** @file bio.h @brief Implementation of an individual bit input-output (BIO) @@ -55,15 +46,15 @@ Individual bit input-output stream (BIO) */ typedef struct opj_bio { /** pointer to the start of the buffer */ - OPJ_BYTE *start; + unsigned char *start; /** pointer to the end of the buffer */ - OPJ_BYTE *end; + unsigned char *end; /** pointer to the present position in the buffer */ - OPJ_BYTE *bp; + unsigned char *bp; /** temporary place where each byte is read or written */ - OPJ_UINT32 buf; + unsigned int buf; /** coder : number of bits free to write. decoder : number of bits read */ - OPJ_UINT32 ct; + int ct; } opj_bio_t; /** @name Exported functions */ @@ -73,58 +64,58 @@ typedef struct opj_bio { Create a new BIO handle @return Returns a new BIO handle if successful, returns NULL otherwise */ -opj_bio_t* opj_bio_create(void); +opj_bio_t* bio_create(void); /** Destroy a previously created BIO handle @param bio BIO handle to destroy */ -void opj_bio_destroy(opj_bio_t *bio); +void bio_destroy(opj_bio_t *bio); /** Number of bytes written. @param bio BIO handle @return Returns the number of bytes written */ -ptrdiff_t opj_bio_numbytes(opj_bio_t *bio); +int bio_numbytes(opj_bio_t *bio); /** Init encoder @param bio BIO handle @param bp Output buffer @param len Output buffer length */ -void opj_bio_init_enc(opj_bio_t *bio, OPJ_BYTE *bp, OPJ_UINT32 len); +void bio_init_enc(opj_bio_t *bio, unsigned char *bp, int len); /** Init decoder @param bio BIO handle @param bp Input buffer @param len Input buffer length */ -void opj_bio_init_dec(opj_bio_t *bio, OPJ_BYTE *bp, OPJ_UINT32 len); +void bio_init_dec(opj_bio_t *bio, unsigned char *bp, int len); /** Write bits @param bio BIO handle @param v Value of bits @param n Number of bits to write */ -void opj_bio_write(opj_bio_t *bio, OPJ_UINT32 v, OPJ_UINT32 n); +void bio_write(opj_bio_t *bio, int v, int n); /** Read bits @param bio BIO handle @param n Number of bits to read @return Returns the corresponding read number */ -OPJ_UINT32 opj_bio_read(opj_bio_t *bio, OPJ_UINT32 n); +int bio_read(opj_bio_t *bio, int n); /** Flush bits @param bio BIO handle -@return Returns OPJ_TRUE if successful, returns OPJ_FALSE otherwise +@return Returns 1 if successful, returns 0 otherwise */ -OPJ_BOOL opj_bio_flush(opj_bio_t *bio); +int bio_flush(opj_bio_t *bio); /** Passes the ending bits (coming from flushing) @param bio BIO handle -@return Returns OPJ_TRUE if successful, returns OPJ_FALSE otherwise +@return Returns 1 if successful, returns 0 otherwise */ -OPJ_BOOL opj_bio_inalign(opj_bio_t *bio); +int bio_inalign(opj_bio_t *bio); /* ----------------------------------------------------------------------- */ /*@}*/ |