compile

radarhere · Jan 20, 2024 · 0d2f121 · 0d2f121
1 parent 1e13f85
commit 0d2f121
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 9 deletions.
diff --git a/src/libImaging/Jpeg2KDecode.c b/src/libImaging/Jpeg2KDecode.c
@@ -668,10 +668,6 @@ j2k_decode_entry(Imaging im, ImagingCodecState state) {
     opj_stream_set_read_function(stream, j2k_read);
     opj_stream_set_skip_function(stream, j2k_skip);
 
-    /* OpenJPEG 2.0 doesn't have OPJ_VERSION_MAJOR */
-#ifndef OPJ_VERSION_MAJOR
-    opj_stream_set_user_data(stream, state);
-#else
     opj_stream_set_user_data(stream, state, NULL);
 
     /* Hack: if we don't know the length, the largest file we can
@@ -683,7 +679,6 @@ j2k_decode_entry(Imaging im, ImagingCodecState state) {
     } else {
         opj_stream_set_user_data_length(stream, context->length);
     }
-#endif
 
     /* Setup decompression context */
     context->error_msg = NULL;

diff --git a/src/libImaging/Jpeg2KEncode.c b/src/libImaging/Jpeg2KEncode.c
@@ -296,11 +296,7 @@ j2k_encode_entry(Imaging im, ImagingCodecState state) {
     opj_stream_set_seek_function(stream, j2k_seek);
 
     /* OpenJPEG 2.0 doesn't have OPJ_VERSION_MAJOR */
-#ifndef OPJ_VERSION_MAJOR
-    opj_stream_set_user_data(stream, state);
-#else
     opj_stream_set_user_data(stream, state, NULL);
-#endif
 
     /* Setup an opj_image */
     if (strcmp(im->mode, "L") == 0) {