Revert "OpenJPEG: update to 2.1 from 1.5"
authorSergey Sharybin <sergey.vfx@gmail.com>
Tue, 12 Jul 2016 15:38:26 +0000 (17:38 +0200)
committerSergey Sharybin <sergey.vfx@gmail.com>
Tue, 12 Jul 2016 15:38:26 +0000 (17:38 +0200)
commit5fae2503bf7d81b89f68f4c494f4c0e4c9eb5f46
tree9b37773884e020430093b429c4fba4ff7b04481f
parent51b274a6be5d59c7009fd3f439821d1e15b72709
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.
61 files changed:
build_files/cmake/Modules/FindOpenJPEG.cmake
extern/libopenjpeg/CMakeLists.txt
extern/libopenjpeg/bio.c
extern/libopenjpeg/bio.h
extern/libopenjpeg/cidx_manager.c
extern/libopenjpeg/cidx_manager.h
extern/libopenjpeg/cio.c
extern/libopenjpeg/cio.h
extern/libopenjpeg/dwt.c
extern/libopenjpeg/dwt.h
extern/libopenjpeg/event.c
extern/libopenjpeg/event.h
extern/libopenjpeg/fix.h [moved from extern/libopenjpeg/opj_stdint.h with 56% similarity]
extern/libopenjpeg/function_list.c [deleted file]
extern/libopenjpeg/function_list.h [deleted file]
extern/libopenjpeg/image.c
extern/libopenjpeg/image.h
extern/libopenjpeg/indexbox_manager.h
extern/libopenjpeg/int.h [moved from extern/libopenjpeg/opj_intmath.h with 54% similarity]
extern/libopenjpeg/invert.c [deleted file]
extern/libopenjpeg/j2k.c
extern/libopenjpeg/j2k.h
extern/libopenjpeg/j2k_lib.c [moved from extern/libopenjpeg/opj_clock.c with 80% similarity]
extern/libopenjpeg/j2k_lib.h [moved from extern/libopenjpeg/opj_clock.h with 78% similarity]
extern/libopenjpeg/jp2.c
extern/libopenjpeg/jp2.h
extern/libopenjpeg/jpt.c [new file with mode: 0644]
extern/libopenjpeg/jpt.h [moved from extern/libopenjpeg/invert.h with 50% similarity]
extern/libopenjpeg/license.txt [moved from extern/libopenjpeg/opj_inttypes.h with 66% similarity]
extern/libopenjpeg/mct.c
extern/libopenjpeg/mct.h
extern/libopenjpeg/mqc.c
extern/libopenjpeg/mqc.h
extern/libopenjpeg/openjpeg.c
extern/libopenjpeg/openjpeg.h
extern/libopenjpeg/opj_codec.h [deleted file]
extern/libopenjpeg/opj_config.h
extern/libopenjpeg/opj_config_private.h [deleted file]
extern/libopenjpeg/opj_includes.h
extern/libopenjpeg/opj_malloc.h
extern/libopenjpeg/phix_manager.c
extern/libopenjpeg/pi.c
extern/libopenjpeg/pi.h
extern/libopenjpeg/ppix_manager.c
extern/libopenjpeg/raw.c
extern/libopenjpeg/raw.h
extern/libopenjpeg/t1.c
extern/libopenjpeg/t1.h
extern/libopenjpeg/t1_generate_luts.c [deleted file]
extern/libopenjpeg/t1_luts.h
extern/libopenjpeg/t2.c
extern/libopenjpeg/t2.h
extern/libopenjpeg/tcd.c
extern/libopenjpeg/tcd.h
extern/libopenjpeg/tgt.c
extern/libopenjpeg/tgt.h
extern/libopenjpeg/thix_manager.c
extern/libopenjpeg/tpix_manager.c
source/blender/imbuf/intern/IMB_filetype.h
source/blender/imbuf/intern/filetype.c
source/blender/imbuf/intern/jp2.c