blender
/
blender
136
404
Fork 586
Code Issues 6.2k Pull Requests 753 Projects 19 Wiki Activity

Fix jpeg200 4k cinema preset 

Used the wrong define, also remove local defines.
This commit is contained in:
Campbell Barton 2021-01-28 14:50:46 +11:00
parent 87d3f4aff3
commit 93412cb4e7
1 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
source/blender/imbuf/intern/jp2.c
View File

@ -53,11 +53,6 @@ typedef struct img_folder {
float *rates;
} img_fol_t;
enum {
DCP_CINEMA2K = 3,
DCP_CINEMA4K = 4,
};
static bool check_jp2(const unsigned char *mem, const size_t size) /* J2K_CFMT */
{
if (size < sizeof(JP2_HEAD)) {
@ -733,7 +728,7 @@ static void cinema_setup_encoder(opj_cparameters_t *parameters,
parameters->cp_rsiz = OPJ_STD_RSIZ;
}
else {
parameters->cp_rsiz = DCP_CINEMA2K;
parameters->cp_rsiz = OPJ_CINEMA2K;
}
break;
@ -754,7 +749,7 @@ static void cinema_setup_encoder(opj_cparameters_t *parameters,
parameters->cp_rsiz = OPJ_STD_RSIZ;
}
else {
parameters->cp_rsiz = DCP_CINEMA2K;
parameters->cp_rsiz = OPJ_CINEMA4K;
}
parameters->numpocs = init_4K_poc(parameters->POC, parameters->numresolution);
break;