diff options
Diffstat (limited to 'extern/libopenjpeg')
| -rw-r--r-- | extern/libopenjpeg/SConscript | 4 | ||||
| -rw-r--r-- | extern/libopenjpeg/jp2.c | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/extern/libopenjpeg/SConscript b/extern/libopenjpeg/SConscript index a27ac0d13df..13a34bf5598 100644 --- a/extern/libopenjpeg/SConscript +++ b/extern/libopenjpeg/SConscript @@ -24,5 +24,5 @@ if not env['OURPLATFORM'] == 'win32-vc': oj_env.BlenderLib ( libname='extern_openjpeg', sources=sources, includes=Split(incs), defines=defs, - libtype=['core','intern','player'], - priority=[300, 300, 300], compileflags = flags) + libtype=['extern'], + priority=[10], compileflags = flags) diff --git a/extern/libopenjpeg/jp2.c b/extern/libopenjpeg/jp2.c index 14f9493c401..b2831cfb0b5 100644 --- a/extern/libopenjpeg/jp2.c +++ b/extern/libopenjpeg/jp2.c @@ -561,6 +561,7 @@ opj_image_t* jp2_decode(opj_jp2_t *jp2, opj_cio_t *cio, opj_codestream_info_t *c image = j2k_decode(jp2->j2k, cio, cstr_info); if(!image) { opj_event_msg(cinfo, EVT_ERROR, "Failed to decode J2K image\n"); + return NULL; } /* Set Image Color Space */ |