[Bf-blender-cvs] [93412cb4e75] blender-v2.92-release: Fix jpeg200 4k cinema preset

[Campbell Barton]

Commit: 93412cb4e75d6999d614ea6a47ec82e12f534cc7
Author: Campbell Barton
Date:   Thu Jan 28 14:50:46 2021 +1100
Branches: blender-v2.92-release
https://developer.blender.org/rB93412cb4e75d6999d614ea6a47ec82e12f534cc7

Fix jpeg200 4k cinema preset

Used the wrong define, also remove local defines.

===================================================================

M	source/blender/imbuf/intern/jp2.c

===================================================================

diff --git a/source/blender/imbuf/intern/jp2.c b/source/blender/imbuf/intern/jp2.c
index e19589317d7..fb8c361d94b 100644
--- a/source/blender/imbuf/intern/jp2.c
+++ b/source/blender/imbuf/intern/jp2.c
@@ -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;