diff options
author | Sergey Sharybin <sergey.vfx@gmail.com> | 2016-07-12 18:38:26 +0300 |
---|---|---|
committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2016-07-12 18:38:26 +0300 |
commit | 5fae2503bf7d81b89f68f4c494f4c0e4c9eb5f46 (patch) | |
tree | 9b37773884e020430093b429c4fba4ff7b04481f /extern/libopenjpeg/raw.c | |
parent | 51b274a6be5d59c7009fd3f439821d1e15b72709 (diff) |
Revert "OpenJPEG: update to 2.1 from 1.5"
This reverts commit f12204196fb1ee985ab9745cf9c70877601145f9.
Campbell, sorry. have to revert this for the time being.
We've missed some very important bits, such as:
- FFmpeg is usually linked against OpenJPEG
- OIIO needs OpenJPEG as well.
For FFmpeg issues we can either disable OpenJPEG there (since
we don't really use it), or bump FFmpeg to version 3.1.1 which
can use either of OpenJPEG 1.5 or 2.1.
For OIIO we do need OpenJPEG support (otherwise Cycles will
not be able to use j2k/j2c textures) and currently there is
NO solution to make OIIO working with OpenJPEG 2.1.
According to Matthias Fauconneau (aka mfv) Larry is working
on the patch to get OIIO work with OpenJPEG 2.1, but it'll
take some time still.
I've tried to look into support of some sort of build system
flag and do ifdefs, but it all becomes quite nasty, especially
with bundled OpenJPEG bumped to 2.1.
Surely such an update is something we'll have to apply to
but at this exact moment it causes quite some pain for all
developers.
Suggest to wait for until OIIO supports OpenJPEG 2.1 and then
go with the updates for real.
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) { |