forked from bartvdbraak/blender
WITH_OPENJPEG wasn't defined for CMake or SCons, which meant blender couldn't save jpeg2000 images from the file selector.
also fixed typo in jp2.c
This commit is contained in:
parent
6aea182b1e
commit
8c6c6d01f4
@ -40,6 +40,10 @@ SET(SRC
|
|||||||
space_image.c
|
space_image.c
|
||||||
)
|
)
|
||||||
|
|
||||||
|
IF(WITH_IMAGE_OPENJPEG)
|
||||||
|
ADD_DEFINITIONS(-DWITH_OPENJPEG)
|
||||||
|
ENDIF(WITH_IMAGE_OPENJPEG)
|
||||||
|
|
||||||
IF(WITH_IMAGE_OPENEXR)
|
IF(WITH_IMAGE_OPENEXR)
|
||||||
ADD_DEFINITIONS(-DWITH_OPENEXR)
|
ADD_DEFINITIONS(-DWITH_OPENEXR)
|
||||||
ENDIF(WITH_IMAGE_OPENEXR)
|
ENDIF(WITH_IMAGE_OPENEXR)
|
||||||
|
@ -14,6 +14,8 @@ if env['WITH_BF_LCMS']:
|
|||||||
incs += ' ' + env['BF_LCMS_INC']
|
incs += ' ' + env['BF_LCMS_INC']
|
||||||
if env['WITH_BF_OPENEXR']:
|
if env['WITH_BF_OPENEXR']:
|
||||||
defs.append('WITH_OPENEXR')
|
defs.append('WITH_OPENEXR')
|
||||||
|
if env['WITH_BF_OPENJPEG']:
|
||||||
|
defs.append('WITH_OPENJPEG')
|
||||||
if env['WITH_BF_TIFF']:
|
if env['WITH_BF_TIFF']:
|
||||||
defs.append('WITH_TIFF')
|
defs.append('WITH_TIFF')
|
||||||
if env['WITH_BF_CINEON']:
|
if env['WITH_BF_CINEON']:
|
||||||
|
@ -55,14 +55,14 @@ typedef struct img_folder{
|
|||||||
float *rates;
|
float *rates;
|
||||||
}img_fol_t;
|
}img_fol_t;
|
||||||
|
|
||||||
static int checkj2p(unsigned char *mem) /* J2K_CFMT */
|
static int check_jp2(unsigned char *mem) /* J2K_CFMT */
|
||||||
{
|
{
|
||||||
return memcmp(JP2_HEAD, mem, 12) ? 0 : 1;
|
return memcmp(JP2_HEAD, mem, 12) ? 0 : 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
int imb_is_a_jp2(unsigned char *buf)
|
int imb_is_a_jp2(unsigned char *buf)
|
||||||
{
|
{
|
||||||
return checkj2p(buf);
|
return check_jp2(buf);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@ -112,7 +112,7 @@ struct ImBuf *imb_jp2_decode(unsigned char *mem, size_t size, int flags)
|
|||||||
opj_dinfo_t* dinfo = NULL; /* handle to a decompressor */
|
opj_dinfo_t* dinfo = NULL; /* handle to a decompressor */
|
||||||
opj_cio_t *cio = NULL;
|
opj_cio_t *cio = NULL;
|
||||||
|
|
||||||
if (checkj2p(mem) == 0) return(0);
|
if (check_jp2(mem) == 0) return(0);
|
||||||
|
|
||||||
/* configure the event callbacks (not required) */
|
/* configure the event callbacks (not required) */
|
||||||
memset(&event_mgr, 0, sizeof(opj_event_mgr_t));
|
memset(&event_mgr, 0, sizeof(opj_event_mgr_t));
|
||||||
|
Loading…
Reference in New Issue
Block a user