diff options
| author | Brecht Van Lommel <brecht@blender.org> | 2022-11-08 15:04:08 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brecht@blender.org> | 2022-11-08 16:33:24 +0300 |
| commit | 32f58c0a92cfc56e6986c073a83aac8afc97fba4 (patch) | |
| tree | 90e3e00af8a0e55417aae42c120923a2c9872469 | |
| parent | 09faf8a449e36ce044141e67e792f3d02dd1602d (diff) | |
Cleanup: fix compiler warning with openjpeg 2.5
| -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; |