From cfed2a07732509e826df078b67092f397de96751 Mon Sep 17 00:00:00 2001 From: Ouwen Huang Date: Sat, 14 Jan 2023 22:52:47 +0000 Subject: [PATCH] feat: updated codec versions --- package-lock.json | 68 +++++++++++-------- package.json | 8 +-- src/shared/decoders/decodeHTJ2K.js | 4 +- src/shared/decoders/decodeJPEG2000.js | 4 +- src/shared/decoders/decodeJPEGBaseline8Bit.js | 4 +- src/shared/decoders/decodeJPEGLS.js | 4 +- 6 files changed, 52 insertions(+), 40 deletions(-) diff --git a/package-lock.json b/package-lock.json index b66b9f6b..2a488141 100644 --- a/package-lock.json +++ b/package-lock.json @@ -10,10 +10,10 @@ "license": "MIT", "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.1", + "@cornerstonejs/codec-libjpeg-turbo-8bit": "^1.2.1", + "@cornerstonejs/codec-openjpeg": "^1.2.1", + "@cornerstonejs/codec-openjph": "^2.4.1", "coverage-istanbul-loader": "^3.0.5", "date-format": "^4.0.14", "dicom-parser": "^1.8.9", @@ -2356,24 +2356,36 @@ } }, "node_modules/@cornerstonejs/codec-charls": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/@cornerstonejs/codec-charls/-/codec-charls-0.1.1.tgz", - "integrity": "sha512-Y250DGVzmownJ7WgpHxNqWvfTnv4/malaKm/tWm0xE1FxhQE8iErMWFpKxpNDk3MdfXO4/98piVsUwmJMiWoDQ==" + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/@cornerstonejs/codec-charls/-/codec-charls-1.2.1.tgz", + "integrity": "sha512-RwCt1c7REsQP8/h+1caxmtx63fkVK0cm4rqpi/M4K9fCyPlfOA/X1Tum5QA2v5ka9EFU7FBOn39xp89qf9+Hfw==", + "engines": { + "node": ">=0.14" + } }, "node_modules/@cornerstonejs/codec-libjpeg-turbo-8bit": { - "version": "0.0.7", - "resolved": "https://registry.npmjs.org/@cornerstonejs/codec-libjpeg-turbo-8bit/-/codec-libjpeg-turbo-8bit-0.0.7.tgz", - "integrity": "sha512-qgm6BuVAy5mNP8SJ+A6+VbmPnqgj8jPvJrw4HbUoAzndmf9/VHjTYwawn3kmZWya5ErFAsXQ6c0U0noB1LKAiA==" + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/@cornerstonejs/codec-libjpeg-turbo-8bit/-/codec-libjpeg-turbo-8bit-1.2.1.tgz", + "integrity": "sha512-srxtfeEpzpMXHSw8/0adubyA/RloIi1BHvdCP4gh7wbTZEZPVxMI/QDDwpJMDEbMhAlGd+InmEBJYJixpps3ZA==", + "engines": { + "node": ">=0.14" + } }, "node_modules/@cornerstonejs/codec-openjpeg": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/@cornerstonejs/codec-openjpeg/-/codec-openjpeg-0.1.0.tgz", - "integrity": "sha512-9mwseBidYPQ1rGPcUU8JriQnzUi5Bgtontqca7gw47uzxC4Zamoc1Kuho5LUpbS1LSnOLePOkDrg/LCYhJIq8g==" + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/@cornerstonejs/codec-openjpeg/-/codec-openjpeg-1.2.1.tgz", + "integrity": "sha512-wXUN8Aji1ZwLwSQCiESCZLBfhSB3ZH9VxOQfXCOAyWz3CYaFZN7XJDmEQeUeO4jlOpbwRWFULIsCuP7cs4klHQ==", + "engines": { + "node": ">=0.14" + } }, "node_modules/@cornerstonejs/codec-openjph": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/@cornerstonejs/codec-openjph/-/codec-openjph-1.0.3.tgz", - "integrity": "sha512-PK+9N/JL7ZMGum6OKuReRGGhWXpWjRC9WnltQ6aEzRKEQPMg+3WFiQPZowKCCG1I4whv35DYFRi6wu7RyRaEMQ==" + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/@cornerstonejs/codec-openjph/-/codec-openjph-2.4.1.tgz", + "integrity": "sha512-UCN0tnBw3tMbBbA3lzjYVT1JZt1qEBOz0wMUDRqgc8eSOMEzF3Nkaqp1X0mri4cTxO2vcigYkBftSe5SeI1eiQ==", + "engines": { + "node": ">=0.14" + } }, "node_modules/@discoveryjs/json-ext": { "version": "0.5.3", @@ -21750,24 +21762,24 @@ } }, "@cornerstonejs/codec-charls": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/@cornerstonejs/codec-charls/-/codec-charls-0.1.1.tgz", - "integrity": "sha512-Y250DGVzmownJ7WgpHxNqWvfTnv4/malaKm/tWm0xE1FxhQE8iErMWFpKxpNDk3MdfXO4/98piVsUwmJMiWoDQ==" + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/@cornerstonejs/codec-charls/-/codec-charls-1.2.1.tgz", + "integrity": "sha512-RwCt1c7REsQP8/h+1caxmtx63fkVK0cm4rqpi/M4K9fCyPlfOA/X1Tum5QA2v5ka9EFU7FBOn39xp89qf9+Hfw==" }, "@cornerstonejs/codec-libjpeg-turbo-8bit": { - "version": "0.0.7", - "resolved": "https://registry.npmjs.org/@cornerstonejs/codec-libjpeg-turbo-8bit/-/codec-libjpeg-turbo-8bit-0.0.7.tgz", - "integrity": "sha512-qgm6BuVAy5mNP8SJ+A6+VbmPnqgj8jPvJrw4HbUoAzndmf9/VHjTYwawn3kmZWya5ErFAsXQ6c0U0noB1LKAiA==" + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/@cornerstonejs/codec-libjpeg-turbo-8bit/-/codec-libjpeg-turbo-8bit-1.2.1.tgz", + "integrity": "sha512-srxtfeEpzpMXHSw8/0adubyA/RloIi1BHvdCP4gh7wbTZEZPVxMI/QDDwpJMDEbMhAlGd+InmEBJYJixpps3ZA==" }, "@cornerstonejs/codec-openjpeg": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/@cornerstonejs/codec-openjpeg/-/codec-openjpeg-0.1.0.tgz", - "integrity": "sha512-9mwseBidYPQ1rGPcUU8JriQnzUi5Bgtontqca7gw47uzxC4Zamoc1Kuho5LUpbS1LSnOLePOkDrg/LCYhJIq8g==" + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/@cornerstonejs/codec-openjpeg/-/codec-openjpeg-1.2.1.tgz", + "integrity": "sha512-wXUN8Aji1ZwLwSQCiESCZLBfhSB3ZH9VxOQfXCOAyWz3CYaFZN7XJDmEQeUeO4jlOpbwRWFULIsCuP7cs4klHQ==" }, "@cornerstonejs/codec-openjph": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/@cornerstonejs/codec-openjph/-/codec-openjph-1.0.3.tgz", - "integrity": "sha512-PK+9N/JL7ZMGum6OKuReRGGhWXpWjRC9WnltQ6aEzRKEQPMg+3WFiQPZowKCCG1I4whv35DYFRi6wu7RyRaEMQ==" + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/@cornerstonejs/codec-openjph/-/codec-openjph-2.4.1.tgz", + "integrity": "sha512-UCN0tnBw3tMbBbA3lzjYVT1JZt1qEBOz0wMUDRqgc8eSOMEzF3Nkaqp1X0mri4cTxO2vcigYkBftSe5SeI1eiQ==" }, "@discoveryjs/json-ext": { "version": "0.5.3", diff --git a/package.json b/package.json index 5171e7b8..044e794c 100644 --- a/package.json +++ b/package.json @@ -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.1", + "@cornerstonejs/codec-libjpeg-turbo-8bit": "^1.2.1", + "@cornerstonejs/codec-openjpeg": "^1.2.1", + "@cornerstonejs/codec-openjph": "^2.4.1", "coverage-istanbul-loader": "^3.0.5", "date-format": "^4.0.14", "dicom-parser": "^1.8.9", diff --git a/src/shared/decoders/decodeHTJ2K.js b/src/shared/decoders/decodeHTJ2K.js index c5c104e5..0455cf36 100644 --- a/src/shared/decoders/decodeHTJ2K.js +++ b/src/shared/decoders/decodeHTJ2K.js @@ -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'; +import openjphWasm from '@cornerstonejs/codec-openjph/wasm'; const local = { codec: undefined, diff --git a/src/shared/decoders/decodeJPEG2000.js b/src/shared/decoders/decodeJPEG2000.js index 649739f5..9acd9481 100644 --- a/src/shared/decoders/decodeJPEG2000.js +++ b/src/shared/decoders/decodeJPEG2000.js @@ -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, diff --git a/src/shared/decoders/decodeJPEGBaseline8Bit.js b/src/shared/decoders/decodeJPEGBaseline8Bit.js index 9bf4d8b6..0d1b4dd4 100644 --- a/src/shared/decoders/decodeJPEGBaseline8Bit.js +++ b/src/shared/decoders/decodeJPEGBaseline8Bit.js @@ -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, diff --git a/src/shared/decoders/decodeJPEGLS.js b/src/shared/decoders/decodeJPEGLS.js index 111f6957..6f552498 100644 --- a/src/shared/decoders/decodeJPEGLS.js +++ b/src/shared/decoders/decodeJPEGLS.js @@ -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 = {