diff options
| author | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2021-12-17 01:39:40 +0200 |
|---|---|---|
| committer | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2022-10-01 11:25:14 +0300 |
| commit | c844bf0ab8acbbb2d4ef0814d8ed7ac9291b7f44 (patch) | |
| tree | feb5f12ad75e68918da4018aa765e198590972c0 /indra/cmake/OpenJPEG.cmake | |
| parent | 338aeef7e9e8cfd167489e0707f3e4a884d2c00f (diff) | |
SL-16542 Pull in chunks of graham's openjpeg code, update openjpeg and enable partial bitstreams
Openjpeg was modified: "p_max_len -= l_nb_bytes_read;" was causing an overflow.
I'm not sure if I did something incorectly in opj_skip/opj_seek viewer side, but seems like openjpeg should have been checking remaining space in p_max_len either way.
P.S. Many thanks to Chafey and Neopallium for implementing openjpeg's partial bitstream support
Diffstat (limited to 'indra/cmake/OpenJPEG.cmake')
| -rw-r--r-- | indra/cmake/OpenJPEG.cmake | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/indra/cmake/OpenJPEG.cmake b/indra/cmake/OpenJPEG.cmake index bf0bde2ba7..a078c97cb8 100644 --- a/indra/cmake/OpenJPEG.cmake +++ b/indra/cmake/OpenJPEG.cmake @@ -8,15 +8,7 @@ if (USESYSTEMLIBS) include(FindOpenJPEG) else (USESYSTEMLIBS) use_prebuilt_binary(openjpeg) - - if(WINDOWS) - # Windows has differently named release and debug openjpeg(d) libs. - set(OPENJPEG_LIBRARIES - debug openjpegd - optimized openjpeg) - else(WINDOWS) - set(OPENJPEG_LIBRARIES openjpeg) - endif(WINDOWS) - - set(OPENJPEG_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/include/openjpeg) + + set(OPENJPEG_LIBRARIES openjp2) + set(OPENJPEG_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/include/openjpeg) endif (USESYSTEMLIBS) |