Blender Git Commit Log
Git Commits -> Revision 5fae250
Revision 5fae250 by Sergey Sharybin (master) July 12, 2016, 15:38 (GMT) |
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. |
Commit Details:
Full Hash: 5fae2503bf7d81b89f68f4c494f4c0e4c9eb5f46
Parent Commit: 51b274a
Lines Changed: +10423, -26483
7 Added Paths:
/extern/libopenjpeg/fix.h (+64, -0) (View)
/extern/libopenjpeg/int.h (+119, -0) (View)
/extern/libopenjpeg/j2k_lib.c (+59, -0) (View)
/extern/libopenjpeg/j2k_lib.h (+54, -0) (View)
/extern/libopenjpeg/jpt.c (+155, -0) (View)
/extern/libopenjpeg/jpt.h (+75, -0) (View)
/extern/libopenjpeg/license.txt (+30, -0) (View)
/extern/libopenjpeg/int.h (+119, -0) (View)
/extern/libopenjpeg/j2k_lib.c (+59, -0) (View)
/extern/libopenjpeg/j2k_lib.h (+54, -0) (View)
/extern/libopenjpeg/jpt.c (+155, -0) (View)
/extern/libopenjpeg/jpt.h (+75, -0) (View)
/extern/libopenjpeg/license.txt (+30, -0) (View)
12 Deleted Paths:
/extern/libopenjpeg/function_list.c (+0, -119)
/extern/libopenjpeg/function_list.h (+0, -131)
/extern/libopenjpeg/invert.c (+0, -294)
/extern/libopenjpeg/invert.h (+0, -64)
/extern/libopenjpeg/opj_clock.c (+0, -64)
/extern/libopenjpeg/opj_clock.h (+0, -59)
/extern/libopenjpeg/opj_codec.h (+0, -165)
/extern/libopenjpeg/opj_config_private.h (+0, -6)
/extern/libopenjpeg/opj_intmath.h (+0, -178)
/extern/libopenjpeg/opj_inttypes.h (+0, -48)
/extern/libopenjpeg/opj_stdint.h (+0, -52)
/extern/libopenjpeg/t1_generate_luts.c (+0, -282)
/extern/libopenjpeg/function_list.h (+0, -131)
/extern/libopenjpeg/invert.c (+0, -294)
/extern/libopenjpeg/invert.h (+0, -64)
/extern/libopenjpeg/opj_clock.c (+0, -64)
/extern/libopenjpeg/opj_clock.h (+0, -59)
/extern/libopenjpeg/opj_codec.h (+0, -165)
/extern/libopenjpeg/opj_config_private.h (+0, -6)
/extern/libopenjpeg/opj_intmath.h (+0, -178)
/extern/libopenjpeg/opj_inttypes.h (+0, -48)
/extern/libopenjpeg/opj_stdint.h (+0, -52)
/extern/libopenjpeg/t1_generate_luts.c (+0, -282)
48 Modified Paths:
/build_files/cmake/Modules/FindOpenJPEG.cmake (+2, -3) (Diff)
/extern/libopenjpeg/bio.c (+44, -51) (Diff)
/extern/libopenjpeg/bio.h (+19, -28) (Diff)
/extern/libopenjpeg/cidx_manager.c (+100, -128) (Diff)
/extern/libopenjpeg/cidx_manager.h (+3, -15) (Diff)
/extern/libopenjpeg/cio.c (+129, -575) (Diff)
/extern/libopenjpeg/cio.h (+36, -342) (Diff)
/extern/libopenjpeg/CMakeLists.txt (+13, -17) (Diff)
/extern/libopenjpeg/dwt.c (+347, -414) (Diff)
/extern/libopenjpeg/dwt.h (+12, -21) (Diff)
/extern/libopenjpeg/event.c (+25, -50) (Diff)
/extern/libopenjpeg/event.h (+7, -51) (Diff)
/extern/libopenjpeg/image.c (+6, -157) (Diff)
/extern/libopenjpeg/image.h (+4, -24) (Diff)
/extern/libopenjpeg/indexbox_manager.h (+7, -37) (Diff)
/extern/libopenjpeg/j2k.c (+2454, -10068) (Diff)
/extern/libopenjpeg/j2k.h (+204, -600) (Diff)
/extern/libopenjpeg/jp2.c (+934, -2391) (Diff)
/extern/libopenjpeg/jp2.h (+112, -373) (Diff)
/extern/libopenjpeg/mct.c (+57, -192) (Diff)
/extern/libopenjpeg/mct.h (+9, -66) (Diff)
/extern/libopenjpeg/mqc.c (+106, -124) (Diff)
/extern/libopenjpeg/mqc.h (+30, -37) (Diff)
/extern/libopenjpeg/openjpeg.c (+165, -786) (Diff)
/extern/libopenjpeg/openjpeg.h (+322, -967) (Diff)
/extern/libopenjpeg/opj_config.h (+38, -4) (Diff)
/extern/libopenjpeg/opj_includes.h (+29, -70) (Diff)
/extern/libopenjpeg/opj_malloc.h (+0, -20) (Diff)
/extern/libopenjpeg/phix_manager.c (+46, -67) (Diff)
/extern/libopenjpeg/pi.c (+572, -1485) (Diff)
/extern/libopenjpeg/pi.h (+67, -99) (Diff)
/extern/libopenjpeg/ppix_manager.c (+46, -67) (Diff)
/extern/libopenjpeg/raw.c (+10, -18) (Diff)
/extern/libopenjpeg/raw.h (+15, -21) (Diff)
/extern/libopenjpeg/t1.c (+1011, -1183) (Diff)
/extern/libopenjpeg/t1.h (+27, -43) (Diff)
/extern/libopenjpeg/t1_luts.h (+7, -7) (Diff)
/extern/libopenjpeg/t2.c (+727, -1246) (Diff)
/extern/libopenjpeg/t2.h (+29, -57) (Diff)
/extern/libopenjpeg/tcd.c (+1520, -2048) (Diff)
/extern/libopenjpeg/tcd.h (+143, -211) (Diff)
/extern/libopenjpeg/tgt.c (+166, -290) (Diff)
/extern/libopenjpeg/tgt.h (+18, -50) (Diff)
/extern/libopenjpeg/thix_manager.c (+44, -58) (Diff)
/extern/libopenjpeg/tpix_manager.c (+66, -98) (Diff)
/source/blender/imbuf/intern/filetype.c (+1, -1) (Diff)
/source/blender/imbuf/intern/IMB_filetype.h (+2, -3) (Diff)
/source/blender/imbuf/intern/jp2.c (+136, -358) (Diff)
/extern/libopenjpeg/bio.c (+44, -51) (Diff)
/extern/libopenjpeg/bio.h (+19, -28) (Diff)
/extern/libopenjpeg/cidx_manager.c (+100, -128) (Diff)
/extern/libopenjpeg/cidx_manager.h (+3, -15) (Diff)
/extern/libopenjpeg/cio.c (+129, -575) (Diff)
/extern/libopenjpeg/cio.h (+36, -342) (Diff)
/extern/libopenjpeg/CMakeLists.txt (+13, -17) (Diff)
/extern/libopenjpeg/dwt.c (+347, -414) (Diff)
/extern/libopenjpeg/dwt.h (+12, -21) (Diff)
/extern/libopenjpeg/event.c (+25, -50) (Diff)
/extern/libopenjpeg/event.h (+7, -51) (Diff)
/extern/libopenjpeg/image.c (+6, -157) (Diff)
/extern/libopenjpeg/image.h (+4, -24) (Diff)
/extern/libopenjpeg/indexbox_manager.h (+7, -37) (Diff)
/extern/libopenjpeg/j2k.c (+2454, -10068) (Diff)
/extern/libopenjpeg/j2k.h (+204, -600) (Diff)
/extern/libopenjpeg/jp2.c (+934, -2391) (Diff)
/extern/libopenjpeg/jp2.h (+112, -373) (Diff)
/extern/libopenjpeg/mct.c (+57, -192) (Diff)
/extern/libopenjpeg/mct.h (+9, -66) (Diff)
/extern/libopenjpeg/mqc.c (+106, -124) (Diff)
/extern/libopenjpeg/mqc.h (+30, -37) (Diff)
/extern/libopenjpeg/openjpeg.c (+165, -786) (Diff)
/extern/libopenjpeg/openjpeg.h (+322, -967) (Diff)
/extern/libopenjpeg/opj_config.h (+38, -4) (Diff)
/extern/libopenjpeg/opj_includes.h (+29, -70) (Diff)
/extern/libopenjpeg/opj_malloc.h (+0, -20) (Diff)
/extern/libopenjpeg/phix_manager.c (+46, -67) (Diff)
/extern/libopenjpeg/pi.c (+572, -1485) (Diff)
/extern/libopenjpeg/pi.h (+67, -99) (Diff)
/extern/libopenjpeg/ppix_manager.c (+46, -67) (Diff)
/extern/libopenjpeg/raw.c (+10, -18) (Diff)
/extern/libopenjpeg/raw.h (+15, -21) (Diff)
/extern/libopenjpeg/t1.c (+1011, -1183) (Diff)
/extern/libopenjpeg/t1.h (+27, -43) (Diff)
/extern/libopenjpeg/t1_luts.h (+7, -7) (Diff)
/extern/libopenjpeg/t2.c (+727, -1246) (Diff)
/extern/libopenjpeg/t2.h (+29, -57) (Diff)
/extern/libopenjpeg/tcd.c (+1520, -2048) (Diff)
/extern/libopenjpeg/tcd.h (+143, -211) (Diff)
/extern/libopenjpeg/tgt.c (+166, -290) (Diff)
/extern/libopenjpeg/tgt.h (+18, -50) (Diff)
/extern/libopenjpeg/thix_manager.c (+44, -58) (Diff)
/extern/libopenjpeg/tpix_manager.c (+66, -98) (Diff)
/source/blender/imbuf/intern/filetype.c (+1, -1) (Diff)
/source/blender/imbuf/intern/IMB_filetype.h (+2, -3) (Diff)
/source/blender/imbuf/intern/jp2.c (+136, -358) (Diff)
Master Commits
MiikaHweb | 2003-2021