diff options
Diffstat (limited to 'extern/libopenjpeg/raw.c')
| -rw-r--r-- | extern/libopenjpeg/raw.c | 28 |
1 files changed, 10 insertions, 18 deletions
diff --git a/extern/libopenjpeg/raw.c b/extern/libopenjpeg/raw.c index 2498761c423..3d231bfdc6b 100644 --- a/extern/libopenjpeg/raw.c +++ b/extern/libopenjpeg/raw.c @@ -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. * @@ -48,24 +42,22 @@ ========================================================== */ -opj_raw_t* opj_raw_create(void) { +opj_raw_t* raw_create(void) { opj_raw_t *raw = (opj_raw_t*)opj_malloc(sizeof(opj_raw_t)); return raw; } -void opj_raw_destroy(opj_raw_t *raw) { +void raw_destroy(opj_raw_t *raw) { if(raw) { opj_free(raw); } } -OPJ_UINT32 opj_raw_numbytes(opj_raw_t *raw) { - const ptrdiff_t diff = raw->bp - raw->start; - assert( diff <= (ptrdiff_t)0xffffffff && diff >= 0 ); /* UINT32_MAX */ - return (OPJ_UINT32)diff; +int raw_numbytes(opj_raw_t *raw) { + return raw->bp - raw->start; } -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) { raw->start = bp; raw->lenmax = len; raw->len = 0; @@ -73,8 +65,8 @@ void opj_raw_init_dec(opj_raw_t *raw, OPJ_BYTE *bp, OPJ_UINT32 len) { raw->ct = 0; } -OPJ_UINT32 opj_raw_decode(opj_raw_t *raw) { - OPJ_UINT32 d; +int raw_decode(opj_raw_t *raw) { + int d; if (raw->ct == 0) { raw->ct = 8; if (raw->len == raw->lenmax) { |