diff options
| author | Sybren A. Stüvel <sybren@blender.org> | 2022-11-08 18:26:09 +0300 |
|---|---|---|
| committer | Sybren A. Stüvel <sybren@blender.org> | 2022-11-08 18:26:09 +0300 |
| commit | 6a14ca18d04de41cc785a9fc38a3ff723215bae3 (patch) | |
| tree | a1c703d03783642de4c3ffa1a0b3f25befcb92d6 /source/blender/imbuf | |
| parent | c73ae711bf403585de403bcfeb7519dd989d4c15 (diff) | |
| parent | c3391d537b11c27b469369073414ca57fee1aca6 (diff) | |
Merge branch 'blender-v3.4-release'
Diffstat (limited to 'source/blender/imbuf')
| -rw-r--r-- | source/blender/imbuf/intern/jp2.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/source/blender/imbuf/intern/jp2.c b/source/blender/imbuf/intern/jp2.c index d2b94355f85..f3d6d19cb8d 100644 --- a/source/blender/imbuf/intern/jp2.c +++ b/source/blender/imbuf/intern/jp2.c @@ -885,7 +885,10 @@ static opj_image_t *ibuftoimage(ImBuf *ibuf, opj_cparameters_t *parameters) memset(&cmptparm, 0, sizeof(opj_image_cmptparm_t[4])); for (i = 0; i < numcomps; i++) { cmptparm[i].prec = prec; + /* Deprecated in openjpeg 2.5. */ +#if (OPJ_VERSION_MAJOR < 2) || (OPJ_VERSION_MAJOR == 2 && OPJ_VERSION_MINOR < 5) cmptparm[i].bpp = prec; +#endif cmptparm[i].sgnd = 0; cmptparm[i].dx = subsampling_dx; cmptparm[i].dy = subsampling_dy; |