diff options
Diffstat (limited to 'extern/libopenjpeg/raw.h')
| -rw-r--r-- | extern/libopenjpeg/raw.h | 36 |
1 files changed, 15 insertions, 21 deletions
diff --git a/extern/libopenjpeg/raw.h b/extern/libopenjpeg/raw.h index 572c666176e..3c4b372f3f6 100644 --- a/extern/libopenjpeg/raw.h +++ b/extern/libopenjpeg/raw.h @@ -1,13 +1,7 @@ /* - * 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) 2003-2007, Francois-Olivier Devaux - * Copyright (c) 2003-2014, Antonin Descampe + * Copyright (c) 2002-2007, Communications and Remote Sensing Laboratory, Universite catholique de Louvain (UCL), Belgium + * Copyright (c) 2002-2007, Professor Benoit Macq + * Copyright (c) 2003-2007, Francois-Olivier Devaux and Antonin Descampe * Copyright (c) 2005, Herve Drolon, FreeImage Team * All rights reserved. * @@ -51,19 +45,19 @@ RAW encoding operations */ typedef struct opj_raw { /** temporary buffer where bits are coded or decoded */ - OPJ_BYTE c; + unsigned char c; /** number of bits already read or free to write */ - OPJ_UINT32 ct; + unsigned int ct; /** maximum length to decode */ - OPJ_UINT32 lenmax; + unsigned int lenmax; /** length decoded */ - OPJ_UINT32 len; + unsigned int len; /** pointer to the current position in the buffer */ - OPJ_BYTE *bp; + unsigned char *bp; /** 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; } opj_raw_t; /** @name Exported functions */ @@ -73,31 +67,31 @@ typedef struct opj_raw { Create a new RAW handle @return Returns a new RAW handle if successful, returns NULL otherwise */ -opj_raw_t* opj_raw_create(void); +opj_raw_t* raw_create(void); /** Destroy a previously created RAW handle @param raw RAW handle to destroy */ -void opj_raw_destroy(opj_raw_t *raw); +void raw_destroy(opj_raw_t *raw); /** Return the number of bytes written/read since initialisation @param raw RAW handle to destroy @return Returns the number of bytes already encoded */ -OPJ_UINT32 opj_raw_numbytes(opj_raw_t *raw); +int raw_numbytes(opj_raw_t *raw); /** Initialize the decoder @param raw RAW handle @param bp Pointer to the start of the buffer from which the bytes will be read @param len Length of the input buffer */ -void opj_raw_init_dec(opj_raw_t *raw, OPJ_BYTE *bp, OPJ_UINT32 len); +void raw_init_dec(opj_raw_t *raw, unsigned char *bp, int len); /** Decode a symbol using raw-decoder. Cfr p.506 TAUBMAN @param raw RAW handle @return Returns the decoded symbol (0 or 1) */ -OPJ_UINT32 opj_raw_decode(opj_raw_t *raw); +int raw_decode(opj_raw_t *raw); /* ----------------------------------------------------------------------- */ /*@}*/ |