Skip to content
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

fix: OpenJPH compression issues - temporarily publish debug #46

Merged
merged 4 commits into from
Sep 5, 2024
Merged

fix: OpenJPH compression issues - temporarily publish debug #46

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
97eef65
fix: OpenJPH compression issues
wayfarer3130 Aug 2, 2024
345a4af
Trying to get progressive decoding working
wayfarer3130 Aug 30, 2024
5aa524b
Turn on debug for build
wayfarer3130 Sep 4, 2024
45b3023
Update to newer node for build
wayfarer3130 Sep 4, 2024
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 .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ executors:
USER_GID: 1000 # $USER_UID
node:
docker:
- image: circleci/node:14.15.0
- image: cimg/node:18.20.3
environment:
TERM: xterm # Enable colors in term
# Custom executor to override Cypress config
Expand Down
4 changes: 2 additions & 2 deletions packages/dicom-codec/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@
"@cornerstonejs/codec-charls": ">=1.2.3",
"@cornerstonejs/codec-libjpeg-turbo-8bit": ">=1.2.2",
"@cornerstonejs/codec-little-endian": ">=0.0.6",
"@cornerstonejs/codec-openjpeg": "^1.2.4",
"@cornerstonejs/codec-openjph": "^2.4.5",
"@cornerstonejs/codec-openjpeg": ">=1.2.4",
Copy link
Contributor Author

Choose a reason for hiding this comment

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

This makes it easy to test newer versions as the linking doesn't get messed up.

"@cornerstonejs/codec-openjph": ">=2.4.5",
"browser-or-node": "^2.0.0",
"jpeg-lossless-decoder-js": "^2.0.4"
}
Expand Down
4 changes: 2 additions & 2 deletions packages/openjphjs/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
#!/bin/sh
mkdir -p build
mkdir -p dist
#(cd build && CXXFLAGS=-msimd128 emcmake cmake -DCMAKE_BUILD_TYPE=Debug ..)
(cd build && CXXFLAGS=-msimd128 emcmake cmake ..)
(cd build && CXXFLAGS=-msimd128 emcmake cmake -DCMAKE_BUILD_TYPE=Debug ..)
Copy link
Contributor Author

Choose a reason for hiding this comment

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

This is temporary until we figure out why the build is failing

#(cd build && CXXFLAGS=-msimd128 emcmake cmake ..)
(cd build && emmake make VERBOSE=1 -j ${nprocs})
cp ./build/src/openjphjs.js ./dist
cp ./build/src/openjphjs.wasm ./dist
Expand Down
2 changes: 1 addition & 1 deletion packages/openjphjs/extern/openjph
Open in desktop
Submodule openjph updated 84 files
+40 −14 .github/workflows/ccp-workflow.yml
+1 −1 .github/workflows/codeql.yml
+1 −0 .gitignore
+129 −233 CMakeLists.txt
+10 −124 README.md
+0 −2 bin/.gitignore
+116 −0 docs/compiling.md
+16 −0 docs/docker.md
+1 −1 docs/doxygen_style.md
+9 −0 docs/status.md
+19 −0 docs/usage_examples.md
+5 −0 docs/web_demos.md
+29 −0 ojph_version.cmake
+24 −0 src/apps/CMakeLists.txt
+236 −0 src/apps/common/ojph_sockets.h
+155 −0 src/apps/common/ojph_threads.h
+65 −0 src/apps/ojph_compress/CMakeLists.txt
+68 −69 src/apps/ojph_compress/ojph_compress.cpp
+65 −0 src/apps/ojph_expand/CMakeLists.txt
+27 −25 src/apps/ojph_expand/ojph_expand.cpp
+31 −0 src/apps/ojph_stream_expand/CMakeLists.txt
+373 −0 src/apps/ojph_stream_expand/ojph_stream_expand.cpp
+464 −0 src/apps/ojph_stream_expand/stream_expand_support.cpp
+554 −0 src/apps/ojph_stream_expand/stream_expand_support.h
+64 −0 src/apps/ojph_stream_expand/threaded_frame_processors.cpp
+107 −0 src/apps/ojph_stream_expand/threaded_frame_processors.h
+42 −32 src/apps/others/ojph_img_io.cpp
+202 −0 src/apps/others/ojph_sockets.cpp
+108 −0 src/apps/others/ojph_threads.cpp
+135 −0 src/core/CMakeLists.txt
+7 −5 src/core/codestream/ojph_codeblock.cpp
+53 −38 src/core/codestream/ojph_codeblock_fun.cpp
+20 −0 src/core/codestream/ojph_codestream.cpp
+65 −46 src/core/codestream/ojph_codestream_local.cpp
+25 −11 src/core/codestream/ojph_codestream_local.h
+518 −51 src/core/codestream/ojph_params.cpp
+360 −86 src/core/codestream/ojph_params_local.h
+24 −10 src/core/codestream/ojph_precinct.cpp
+2 −3 src/core/codestream/ojph_precinct.h
+571 −459 src/core/codestream/ojph_resolution.cpp
+20 −8 src/core/codestream/ojph_resolution.h
+35 −19 src/core/codestream/ojph_subband.cpp
+21 −2 src/core/codestream/ojph_subband.h
+15 −17 src/core/codestream/ojph_tile.cpp
+2 −3 src/core/codestream/ojph_tile.h
+6 −4 src/core/codestream/ojph_tile_comp.cpp
+2 −1 src/core/codestream/ojph_tile_comp.h
+5 −5 src/core/coding/ojph_block_common.cpp
+8 −8 src/core/coding/ojph_block_decoder.cpp
+9 −9 src/core/coding/ojph_block_decoder_ssse3.cpp
+2 −2 src/core/coding/ojph_block_decoder_wasm.cpp
+45 −6 src/core/common/ojph_arch.h
+11 −0 src/core/common/ojph_arg.h
+259 −22 src/core/common/ojph_codestream.h
+87 −75 src/core/common/ojph_file.h
+10 −0 src/core/common/ojph_mem.h
+186 −30 src/core/common/ojph_message.h
+8 −59 src/core/common/ojph_params.h
+2 −2 src/core/common/ojph_version.h
+61 −1 src/core/others/ojph_arch.cpp
+82 −32 src/core/others/ojph_file.cpp
+35 −16 src/core/others/ojph_message.cpp
+53 −39 src/core/transform/ojph_colour.cpp
+1 −1 src/core/transform/ojph_colour_sse.cpp
+1 −1 src/core/transform/ojph_colour_sse2.cpp
+415 −354 src/core/transform/ojph_transform.cpp
+22 −32 src/core/transform/ojph_transform.h
+160 −236 src/core/transform/ojph_transform_avx.cpp
+434 −181 src/core/transform/ojph_transform_avx2.cpp
+818 −0 src/core/transform/ojph_transform_avx512.cpp
+278 −158 src/core/transform/ojph_transform_local.h
+160 −222 src/core/transform/ojph_transform_sse.cpp
+378 −175 src/core/transform/ojph_transform_sse2.cpp
+624 −391 src/core/transform/ojph_transform_wasm.cpp
+9 −9 src/pkg-config.pc.cmake
+2 −2 subprojects/js/CMakeLists.txt
+68 −0 target_arch.cmake
+46 −6 tests/CMakeLists.txt
+25 −16 tests/mse_pae.cmake
+2 −2 tests/mse_pae.cpp
+0 −15 tests/test.py
+141 −58 tests/test_executables.cpp
+5 −2 tests/test_helpers/convert_mse_pae_to_tests.cpp
+27 −22 tests/test_helpers/ht_cmdlines.txt
4 changes: 2 additions & 2 deletions packages/openjphjs/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,9 @@
],
"repository": {
"type": "git",
"url": "git+https://github.com/chafey/openjphjs.git"
"url": "git+https://github.com/cornerstonejs/codecs.git"
},
"author": "Chris Hafey",
"author": "CornerstoneJS (original Chris Hafey)",
"license": "MIT",
"bugs": {
"url": "https://github.com/chafey/openjphjs/issues"
Expand Down
2 changes: 1 addition & 1 deletion packages/openjphjs/src/HTJ2KDecoder.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ class HTJ2KDecoder
{
// Use the following for debugging to ensure updated version info
// Update the XX to check that reload has completed
// OJPH_INFO(0x00010002, "vXX HTJ2K Decoder");
OJPH_INFO(0x00010002, "v06 HTJ2K Decoder");
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Temporary while we figure out why the code fails to decode

Copy link
Member

Choose a reason for hiding this comment

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

as talked, this makes it bigger but gives stack trace etc

}

#ifdef __EMSCRIPTEN__
Expand Down
4,138 changes: 2,262 additions & 1,876 deletions yarn.lock
View file
Open in desktop

Large diffs are not rendered by default.