From c844bf0ab8acbbb2d4ef0814d8ed7ac9291b7f44 Mon Sep 17 00:00:00 2001 From: Andrey Kleshchev Date: Fri, 17 Dec 2021 01:39:40 +0200 Subject: 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 --- indra/cmake/FindOpenJPEG.cmake | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'indra/cmake/FindOpenJPEG.cmake') 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 -- cgit v1.3 From d4506967ed0ab7e450313f3635b07a6e2bfa6ae0 Mon Sep 17 00:00:00 2001 From: Andrey Kleshchev Date: Tue, 4 Oct 2022 17:53:21 +0300 Subject: SL-16542 Openjpeg's header should have remained unchanged. --- indra/cmake/FindOpenJPEG.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/cmake/FindOpenJPEG.cmake') diff --git a/indra/cmake/FindOpenJPEG.cmake b/indra/cmake/FindOpenJPEG.cmake index afe319fb06..2d4353b54f 100644 --- a/indra/cmake/FindOpenJPEG.cmake +++ b/indra/cmake/FindOpenJPEG.cmake @@ -9,7 +9,7 @@ # also defined, but not for general use are # OPENJPEG_LIBRARY, where to find the OpenJPEG library. -FIND_PATH(OPENJPEG_INCLUDE_DIR openjp2.h +FIND_PATH(OPENJPEG_INCLUDE_DIR openjpeg.h /usr/local/include/openjpeg /usr/local/include /usr/include/openjpeg -- cgit v1.3