diff options
| author | Joseph Eagar <joeedh@gmail.com> | 2022-11-12 01:18:46 +0300 |
|---|---|---|
| committer | Joseph Eagar <joeedh@gmail.com> | 2022-11-12 01:18:46 +0300 |
| commit | c29795452cc71cb9f5a571a4aff0f593a2d7acaf (patch) | |
| tree | 53a46bb77f3102c545f7e55d3344e310b3bf6116 /source/blender/imbuf/intern/jp2.c | |
| parent | 9980fd0b8e1f3a07060316f28469f55a3f2fc0cd (diff) | |
| parent | 03ccf37162d365f3fdc8d8cd0cd6e9ff314fec6e (diff) | |
Merge branch 'master' into temp-sculpt-roll-mappingtemp-sculpt-roll-mapping
Diffstat (limited to 'source/blender/imbuf/intern/jp2.c')
| -rw-r--r-- | source/blender/imbuf/intern/jp2.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/source/blender/imbuf/intern/jp2.c b/source/blender/imbuf/intern/jp2.c index d2b94355f85..4320f870d64 100644 --- a/source/blender/imbuf/intern/jp2.c +++ b/source/blender/imbuf/intern/jp2.c @@ -125,7 +125,7 @@ struct BufInfo { static void opj_read_from_buffer_free(void *UNUSED(p_user_data)) { - /* nop */ + /* NOP. */ } static OPJ_SIZE_T opj_read_from_buffer(void *p_buffer, OPJ_SIZE_T p_nb_bytes, void *p_user_data) @@ -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; |