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/FindOpenJPEG.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/FindOpenJPEG.cmake')
| -rw-r--r-- | indra/cmake/FindOpenJPEG.cmake | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/indra/cmake/FindOpenJPEG.cmake b/indra/cmake/FindOpenJPEG.cmake index 949384eec4..afe319fb06 100644 --- a/indra/cmake/FindOpenJPEG.cmake +++ b/indra/cmake/FindOpenJPEG.cmake @@ -9,14 +9,15 @@ # also defined, but not for general use are # OPENJPEG_LIBRARY, where to find the OpenJPEG library. -FIND_PATH(OPENJPEG_INCLUDE_DIR openjpeg.h +FIND_PATH(OPENJPEG_INCLUDE_DIR openjp2.h /usr/local/include/openjpeg /usr/local/include /usr/include/openjpeg /usr/include +include/openjpeg ) -SET(OPENJPEG_NAMES ${OPENJPEG_NAMES} openjpeg) +SET(OPENJPEG_NAMES ${OPENJPEG_NAMES} openjp2) FIND_LIBRARY(OPENJPEG_LIBRARY NAMES ${OPENJPEG_NAMES} PATHS /usr/lib /usr/local/lib |