python-pillow/Pillow
1
1
Fork 0
mirror of https://github.com/python-pillow/Pillow.git synced 2025-02-03 05:04:24 +03:00
Code Issues Packages Projects Releases Wiki Activity

Changed test for OpenJPEG 2.0

Browse Source
This commit is contained in:
Alastair Houghton 2014-05-27 12:52:50 +01:00
parent 1011e51083
commit 72ecb8752e
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libImaging/Jpeg2KDecode.c
View File

@ -517,7 +517,8 @@ j2k_decode_entry(Imaging im, ImagingCodecState state,
opj_stream_set_read_function(stream, j2k_read); opj_stream_set_read_function(stream, j2k_read);
opj_stream_set_skip_function(stream, j2k_skip); opj_stream_set_skip_function(stream, j2k_skip);
#if OPJ_VERSION_MAJOR == 2 && OPJ_VERSION_MINOR == 0 /* OpenJPEG 2.0 doesn't have OPJ_VERSION_MAJOR */
#ifndef OPJ_VERSION_MAJOR
opj_stream_set_user_data(stream, decoder); opj_stream_set_user_data(stream, decoder);
#else #else
opj_stream_set_user_data(stream, decoder, NULL); opj_stream_set_user_data(stream, decoder, NULL);

3
libImaging/Jpeg2KEncode.c
View File

@ -259,7 +259,8 @@ j2k_encode_entry(Imaging im, ImagingCodecState state,
opj_stream_set_skip_function(stream, j2k_skip); opj_stream_set_skip_function(stream, j2k_skip);
opj_stream_set_seek_function(stream, j2k_seek); opj_stream_set_seek_function(stream, j2k_seek);
#if OPJ_VERSION_MAJOR == 2 && OPJ_VERSION_MINOR == 0 /* OpenJPEG 2.0 doesn't have OPJ_VERSION_MAJOR */
#ifndef OPJ_VERSION_MAJOR
opj_stream_set_user_data(stream, encoder); opj_stream_set_user_data(stream, encoder);
#else #else
opj_stream_set_user_data(stream, encoder, NULL); opj_stream_set_user_data(stream, encoder, NULL);