Skip to content

Potential fix for #2037 #51

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Potential fix for #2037 #51

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
6 changes: 4 additions & 2 deletions packages/openjpeg/build-native.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
#!/bin/sh
rm -rf build-native
Copy link
Preview

Copilot AI May 13, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

[nitpick] Consider adding a safeguard to ensure that 'rm -rf build-native' only targets the intended build directory, avoiding accidental deletion if the script is run from an unexpected location.

Copilot uses AI. Check for mistakes.

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)
2 changes: 1 addition & 1 deletion packages/openjpeg/extern/openjpeg
Open in desktop
Submodule openjpeg updated 5 files
+104 −0 src/lib/openjp2/BufferStream.c
+34 −0 src/lib/openjp2/BufferStream.h
+2 −0 src/lib/openjp2/CMakeLists.txt
+74 −7 src/lib/openjp2/cio.c
+24 −0 src/lib/openjp2/cio.h
2 changes: 1 addition & 1 deletion packages/openjpeg/src/J2KDecoder.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion packages/openjpeg/src/J2KEncoder.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
#include <emscripten/val.h>
#endif

#include "BufferStream.hpp"
#include "BufferStream.h"
#include "FrameInfo.hpp"
#include "Point.hpp"
#include "Size.hpp"
Expand Down
4 changes: 2 additions & 2 deletions packages/openjpeg/test/cpp/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")