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

Jump to bottom

feat: updated codec versions #507

Merged
merged 2 commits into from
Feb 14, 2023
Merged

feat: updated codec versions #507

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
89fb2f4
feat: updated codec versions
Ouwen Jan 14, 2023
5cd920e
feat: increased version
Ouwen Feb 13, 2023
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
68 changes: 40 additions & 28 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,10 +101,10 @@
},
"dependencies": {
"@babel/eslint-parser": "^7.19.1",
"@cornerstonejs/codec-charls": "^0.1.1",
"@cornerstonejs/codec-libjpeg-turbo-8bit": "^0.0.7",
"@cornerstonejs/codec-openjpeg": "^0.1.0",
"@cornerstonejs/codec-openjph": "^1.0.3",
"@cornerstonejs/codec-charls": "^1.2.3",
"@cornerstonejs/codec-libjpeg-turbo-8bit": "^1.2.2",
"@cornerstonejs/codec-openjpeg": "^1.2.2",
"@cornerstonejs/codec-openjph": "^2.4.2",
"coverage-istanbul-loader": "^3.0.5",
"date-format": "^4.0.14",
"dicom-parser": "^1.8.9",
Expand Down
4 changes: 2 additions & 2 deletions src/shared/decoders/decodeHTJ2K.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
// import openJphFactory from '../../../codecs/openjphjs.js';
// import openjphWasm from '../../../codecs/openjphjs.wasm';

import openJphFactory from '@cornerstonejs/codec-openjph/dist/openjphjs.js';
import openjphWasm from '@cornerstonejs/codec-openjph/dist/openjphjs.wasm';
import openJphFactory from '@cornerstonejs/codec-openjph/wasmjs';
sedghi marked this conversation as resolved.
Show resolved Hide resolved
import openjphWasm from '@cornerstonejs/codec-openjph/wasm';

const local = {
codec: undefined,
Expand Down
4 changes: 2 additions & 2 deletions src/shared/decoders/decodeJPEG2000.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
// https://emscripten.org/docs/api_reference/module.html
import openJpegFactory from '@cornerstonejs/codec-openjpeg/dist/openjpegwasm_decode.js';
import openJpegFactory from '@cornerstonejs/codec-openjpeg/decodewasmjs';

// Webpack asset/resource copies this to our output folder

// TODO: At some point maybe we can use this instead.
// This is closer to what Webpack 5 wants but it doesn't seem to work now
// const wasm = new URL('./blah.wasm', import.meta.url)
import openjpegWasm from '@cornerstonejs/codec-openjpeg/dist/openjpegwasm_decode.wasm';
import openjpegWasm from '@cornerstonejs/codec-openjpeg/decodewasm';

const local = {
codec: undefined,
Expand Down
4 changes: 2 additions & 2 deletions src/shared/decoders/decodeJPEGBaseline8Bit.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import libjpegTurboFactory from '@cornerstonejs/codec-libjpeg-turbo-8bit/dist/libjpegturbowasm_decode.js';
import libjpegTurboFactory from '@cornerstonejs/codec-libjpeg-turbo-8bit/decodewasmjs';

// Webpack asset/resource copies this to our output folder
import libjpegTurboWasm from '@cornerstonejs/codec-libjpeg-turbo-8bit/dist/libjpegturbowasm_decode.wasm';
import libjpegTurboWasm from '@cornerstonejs/codec-libjpeg-turbo-8bit/decodewasm';

const local = {
codec: undefined,
Expand Down
4 changes: 2 additions & 2 deletions src/shared/decoders/decodeJPEGLS.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import charlsFactory from '@cornerstonejs/codec-charls/dist/charlswasm_decode.js';
import charlsFactory from '@cornerstonejs/codec-charls/decodewasmjs';
// import charlsFactory from '@cornerstonejs/codec-charls/dist/debug/charlswasm.js';

// Webpack asset/resource copies this to our output folder
import charlsWasm from '@cornerstonejs/codec-charls/dist/charlswasm_decode.wasm';
import charlsWasm from '@cornerstonejs/codec-charls/decodewasm';
// import charlsWasm from '@cornerstonejs/codec-charls/dist/debug/charlswasm.wasm';

const local = {
Expand Down