From 9758e5f3f8f8c27987c9efff52ae1493b5d015b3 Mon Sep 17 00:00:00 2001 From: John Skinner Date: Mon, 12 May 2025 17:53:06 -0500 Subject: [PATCH] Potential fix for #2037 --- .gitmodules | 2 +- packages/openjpeg/build-native.sh | 6 ++++-- packages/openjpeg/extern/openjpeg | 2 +- packages/openjpeg/src/J2KDecoder.hpp | 2 +- packages/openjpeg/src/J2KEncoder.hpp | 2 +- packages/openjpeg/test/cpp/CMakeLists.txt | 4 ++-- 6 files changed, 10 insertions(+), 8 deletions(-) diff --git a/.gitmodules b/.gitmodules index 3511dba..47d2c7a 100644 --- a/.gitmodules +++ b/.gitmodules @@ -9,7 +9,7 @@ url = https://github.com/cornerstonejs/OpenJPH.git [submodule "packages/openjpeg/extern/openjpeg"] path = packages/openjpeg/extern/openjpeg - url = https://github.com/cornerstonejs/openjpeg.git + url = https://github.com/John-Skinner/openjpeg.git [submodule "packages/charls/extern/charls"] path = packages/charls/extern/charls url = https://github.com/cornerstonejs/charls.git diff --git a/packages/openjpeg/build-native.sh b/packages/openjpeg/build-native.sh index 51ee13a..be6a7e7 100644 --- a/packages/openjpeg/build-native.sh +++ b/packages/openjpeg/build-native.sh @@ -1,7 +1,9 @@ #!/bin/sh +rm -rf build-native mkdir -p build-native -(cd build-native && cmake -DCMAKE_BUILD_TYPE=Debug ..) && +(cd build-native && cmake -DCMAKE_BUILD_TYPE=Debug -DCMAKE_INSTALL_PREFIX=../../../../codecs/openjpeg ..) && #(cd build-native && cmake ..) && (cd build-native && make VERBOSE=1 -j 8) && #(build-native/test/cpp/cpptest) && -(build-native/extern/openjpeg/bin/cpptest) +(build-native/extern/openjpeg/bin/cpptest) && +(cd build-native/extern/openjpeg && make install) diff --git a/packages/openjpeg/extern/openjpeg b/packages/openjpeg/extern/openjpeg index 2d60670..9ce649f 160000 --- a/packages/openjpeg/extern/openjpeg +++ b/packages/openjpeg/extern/openjpeg @@ -1 +1 @@ -Subproject commit 2d606701e8b7aa83f657d113c3367508e99bd12b +Subproject commit 9ce649f1724e33bfc46e467f78fbac97136f835a diff --git a/packages/openjpeg/src/J2KDecoder.hpp b/packages/openjpeg/src/J2KDecoder.hpp index 35fe6b4..8aefbb4 100644 --- a/packages/openjpeg/src/J2KDecoder.hpp +++ b/packages/openjpeg/src/J2KDecoder.hpp @@ -22,7 +22,7 @@ thread_local const emscripten::val Uint8ClampedArray = emscripten::val::global(" #endif -#include "BufferStream.hpp" +#include "BufferStream.h" #include "FrameInfo.hpp" #include "Point.hpp" diff --git a/packages/openjpeg/src/J2KEncoder.hpp b/packages/openjpeg/src/J2KEncoder.hpp index edd3fe7..d417d06 100644 --- a/packages/openjpeg/src/J2KEncoder.hpp +++ b/packages/openjpeg/src/J2KEncoder.hpp @@ -17,7 +17,7 @@ #include #endif -#include "BufferStream.hpp" +#include "BufferStream.h" #include "FrameInfo.hpp" #include "Point.hpp" #include "Size.hpp" diff --git a/packages/openjpeg/test/cpp/CMakeLists.txt b/packages/openjpeg/test/cpp/CMakeLists.txt index bf1cdf4..a2ad94e 100644 --- a/packages/openjpeg/test/cpp/CMakeLists.txt +++ b/packages/openjpeg/test/cpp/CMakeLists.txt @@ -11,5 +11,5 @@ target_compile_features(cpptest PUBLIC cxx_std_14) set(CMAKE_CXX_FLAGS_RELEASE "-O3") # add include path to openjpeg -include_directories("../extern/openjpeg/src/lib/openjp2" "../build/extern/openjpeg/src/lib/openjp2" - "../extern/openjpeg/src/bin/common" "../build/extern/openjpeg/src/bin/common") +include_directories("../../extern/openjpeg/src/lib/openjp2" "../../build/extern/openjpeg/src/lib/openjp2" + "../../extern/openjpeg/src/bin/common" "../../build/extern/openjpeg/src/bin/common")