Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'blender-v2.92-release'

Browse Source
This commit is contained in:
Campbell Barton
2021-01-28 14:59:27 +11:00
parent e6a5e33c09 93412cb4e7
commit 862aa2a66b
1 changed files with 2 additions and 7 deletions
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; float *rates;
} img_fol_t; } img_fol_t;
enum {
DCP_CINEMA2K = 3,
DCP_CINEMA4K = 4,
};
static bool check_jp2(const unsigned char *mem, const size_t size) /* J2K_CFMT */ static bool check_jp2(const unsigned char *mem, const size_t size) /* J2K_CFMT */
{ {
if (size < sizeof(JP2_HEAD)) { if (size < sizeof(JP2_HEAD)) {
@@ -733,7 +728,7 @@ static void cinema_setup_encoder(opj_cparameters_t *parameters,
parameters->cp_rsiz = OPJ_STD_RSIZ; parameters->cp_rsiz = OPJ_STD_RSIZ;
} }
else { else {
parameters->cp_rsiz = DCP_CINEMA2K; parameters->cp_rsiz = OPJ_CINEMA2K;
} }
break; break;
@@ -754,7 +749,7 @@ static void cinema_setup_encoder(opj_cparameters_t *parameters,
parameters->cp_rsiz = OPJ_STD_RSIZ; parameters->cp_rsiz = OPJ_STD_RSIZ;
} }
else { else {
parameters->cp_rsiz = DCP_CINEMA2K; parameters->cp_rsiz = OPJ_CINEMA4K;
} }
parameters->numpocs = init_4K_poc(parameters->POC, parameters->numresolution); parameters->numpocs = init_4K_poc(parameters->POC, parameters->numresolution);
break; break;