@cornerstonejs/dicom-image-loader 5.8.0 → 5.8.2

package/dist/esm/shared/decoders/decodeHTJ2K.js

@@ -1,5 +1,6 @@
 import openJphFactory, {} from '@cornerstonejs/codec-openjph/wasmjs';
 const openjphWasm = new URL('@cornerstonejs/codec-openjph/wasm', import.meta.url);
+import getPixelData from './getPixelData.js';
 import { resolveWasmUrl, setWasmBasePathFromConfig } from '../wasmBasePath.js';
 const local = {
     codec: undefined,
@@ -96,16 +97,4 @@ async function decodeAsync(compressedImageFrame, imageInfo) {
         ...encodedImageInfo,
     };
 }
-function getPixelData(frameInfo, decodedBuffer) {
-    if (frameInfo.bitsPerSample > 8) {
-        if (frameInfo.isSigned) {
-            return new Int16Array(decodedBuffer.buffer, decodedBuffer.byteOffset, decodedBuffer.byteLength / 2);
-        }
-        return new Uint16Array(decodedBuffer.buffer, decodedBuffer.byteOffset, decodedBuffer.byteLength / 2);
-    }
-    if (frameInfo.isSigned) {
-        return new Int8Array(decodedBuffer.buffer, decodedBuffer.byteOffset, decodedBuffer.byteLength);
-    }
-    return new Uint8Array(decodedBuffer.buffer, decodedBuffer.byteOffset, decodedBuffer.byteLength);
-}
 export default decodeAsync;

package/dist/esm/shared/decoders/decodeJPEG2000.js

@@ -1,5 +1,6 @@
 import openJpegFactory from '@cornerstonejs/codec-openjpeg/decodewasmjs';
 const openjpegWasm = new URL('@cornerstonejs/codec-openjpeg/decodewasm', import.meta.url);
+import getPixelData from './getPixelData.js';
 import { resolveWasmUrl, setWasmBasePathFromConfig } from '../wasmBasePath.js';
 const local = {
     codec: undefined,
@@ -80,16 +81,4 @@ async function decodeAsync(compressedImageFrame, imageInfo) {
         ...encodedImageInfo,
     };
 }
-function getPixelData(frameInfo, decodedBuffer) {
-    if (frameInfo.bitsPerSample > 8) {
-        if (frameInfo.isSigned) {
-            return new Int16Array(decodedBuffer.buffer, decodedBuffer.byteOffset, decodedBuffer.byteLength / 2);
-        }
-        return new Uint16Array(decodedBuffer.buffer, decodedBuffer.byteOffset, decodedBuffer.byteLength / 2);
-    }
-    if (frameInfo.isSigned) {
-        return new Int8Array(decodedBuffer.buffer, decodedBuffer.byteOffset, decodedBuffer.byteLength);
-    }
-    return new Uint8Array(decodedBuffer.buffer, decodedBuffer.byteOffset, decodedBuffer.byteLength);
-}
 export default decodeAsync;

package/dist/esm/shared/decoders/decodeJPEGBaseline8Bit.js

@@ -1,5 +1,6 @@
 import libjpegTurboFactory from '@cornerstonejs/codec-libjpeg-turbo-8bit/decodewasmjs';
 const libjpegTurboWasm = new URL('@cornerstonejs/codec-libjpeg-turbo-8bit/decodewasm', import.meta.url);
+import getPixelData from './getPixelData.js';
 import { resolveWasmUrl, setWasmBasePathFromConfig } from '../wasmBasePath.js';
 const local = {
     codec: undefined,
@@ -55,12 +56,6 @@ async function decodeAsync(compressedImageFrame, imageInfo) {
         ...encodedImageInfo,
     };
 }
-function getPixelData(frameInfo, decodedBuffer) {
-    if (frameInfo.isSigned) {
-        return new Int8Array(decodedBuffer.buffer, decodedBuffer.byteOffset, decodedBuffer.byteLength);
-    }
-    return new Uint8Array(decodedBuffer.buffer, decodedBuffer.byteOffset, decodedBuffer.byteLength);
-}
 const initialize = initLibjpegTurbo;
 export { initialize };
 export default decodeAsync;

package/dist/esm/shared/decoders/decodeJPEGLS.js

@@ -1,5 +1,6 @@
 import charlsFactory from '@cornerstonejs/codec-charls/decodewasmjs';
 const charlsWasm = new URL('@cornerstonejs/codec-charls/decodewasm', import.meta.url);
+import getPixelData from './getPixelData.js';
 import { resolveWasmUrl, setWasmBasePathFromConfig } from '../wasmBasePath.js';
 const local = {
     codec: undefined,
@@ -71,16 +72,4 @@ async function decodeAsync(compressedImageFrame, imageInfo) {
         throw getExceptionMessage(error);
     }
 }
-function getPixelData(frameInfo, decodedBuffer, signed) {
-    if (frameInfo.bitsPerSample > 8) {
-        if (signed) {
-            return new Int16Array(decodedBuffer.buffer, decodedBuffer.byteOffset, decodedBuffer.byteLength / 2);
-        }
-        return new Uint16Array(decodedBuffer.buffer, decodedBuffer.byteOffset, decodedBuffer.byteLength / 2);
-    }
-    if (signed) {
-        return new Int8Array(decodedBuffer.buffer, decodedBuffer.byteOffset, decodedBuffer.byteLength);
-    }
-    return new Uint8Array(decodedBuffer.buffer, decodedBuffer.byteOffset, decodedBuffer.byteLength);
-}
 export default decodeAsync;

package/dist/esm/shared/decoders/getPixelData.d.ts

@@ -0,0 +1,8 @@
+import type { ByteArray } from 'dicom-parser';
+interface DecodedFrameInfo {
+    bitsPerSample?: number;
+    isSigned?: boolean | number;
+    componentCount?: number;
+}
+export default function getPixelData(frameInfo: DecodedFrameInfo, decodedBuffer: ByteArray, signedOverride?: boolean): Uint8Array | Int16Array | Uint16Array | Int8Array;
+export {};

package/dist/esm/shared/decoders/getPixelData.js

@@ -0,0 +1,17 @@
+import isSignedPixelData from './isSignedPixelData.js';
+export default function getPixelData(frameInfo, decodedBuffer, signedOverride) {
+    const signed = isSignedPixelData({
+        isSigned: signedOverride ?? frameInfo?.isSigned,
+        componentCount: frameInfo?.componentCount,
+    });
+    if (frameInfo?.bitsPerSample > 8) {
+        if (signed) {
+            return new Int16Array(decodedBuffer.buffer, decodedBuffer.byteOffset, decodedBuffer.byteLength / 2);
+        }
+        return new Uint16Array(decodedBuffer.buffer, decodedBuffer.byteOffset, decodedBuffer.byteLength / 2);
+    }
+    if (signed) {
+        return new Int8Array(decodedBuffer.buffer, decodedBuffer.byteOffset, decodedBuffer.byteLength);
+    }
+    return new Uint8Array(decodedBuffer.buffer, decodedBuffer.byteOffset, decodedBuffer.byteLength);
+}

package/dist/esm/shared/decoders/isSignedPixelData.d.ts

@@ -0,0 +1,4 @@
+export default function isSignedPixelData(frameInfo?: {
+    isSigned?: boolean | number;
+    componentCount?: number;
+}): boolean;

package/dist/esm/shared/decoders/isSignedPixelData.js

@@ -0,0 +1,4 @@
+export default function isSignedPixelData(frameInfo) {
+    const declaredSigned = frameInfo?.isSigned === true || frameInfo?.isSigned === 1;
+    return declaredSigned && frameInfo.componentCount === 1;
+}

package/dist/esm/version.d.ts

@@ -1 +1 @@
-export declare const version = "5.8.0";
+export declare const version = "5.8.2";

package/dist/esm/version.js

@@ -1 +1 @@
-export const version = '5.8.0';
+export const version = '5.8.2';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cornerstonejs/dicom-image-loader",
-  "version": "5.8.0",
+  "version": "5.8.2",
   "description": "Cornerstone Image Loader for DICOM WADO-URI and WADO-RS and Local file",
   "keywords": [
     "DICOM",
@@ -111,10 +111,10 @@
     "prepublishOnly": "pnpm run build:loader"
   },
   "dependencies": {
-    "@cornerstonejs/codec-charls": "1.2.3",
-    "@cornerstonejs/codec-libjpeg-turbo-8bit": "1.2.2",
-    "@cornerstonejs/codec-openjpeg": "1.3.0",
-    "@cornerstonejs/codec-openjph": "2.4.7",
+    "@cornerstonejs/codec-charls": "1.2.5",
+    "@cornerstonejs/codec-libjpeg-turbo-8bit": "1.2.4",
+    "@cornerstonejs/codec-openjpeg": "1.3.2",
+    "@cornerstonejs/codec-openjph": "2.4.9",
     "comlink": "4.4.2",
     "dicom-parser": "1.8.21",
     "jpeg-lossless-decoder-js": "2.1.2",
@@ -122,12 +122,12 @@
     "uuid": "9.0.1"
   },
   "devDependencies": {
-    "@cornerstonejs/core": "5.8.0",
-    "@cornerstonejs/metadata": "5.8.0"
+    "@cornerstonejs/core": "5.8.2",
+    "@cornerstonejs/metadata": "5.8.2"
   },
   "peerDependencies": {
-    "@cornerstonejs/core": "5.8.0",
-    "@cornerstonejs/metadata": "5.8.0",
+    "@cornerstonejs/core": "5.8.2",
+    "@cornerstonejs/metadata": "5.8.2",
     "dicom-parser": "1.8.21"
   },
   "config": {
@@ -135,5 +135,5 @@
       "path": "./node_modules/cz-conventional-changelog"
     }
   },
-  "gitHead": "98e54d12b579d1667d359fcb6dcc6151c9e0154d"
+  "gitHead": "7034957b10f5e91ad8f4d7978591ef688e262d26"
 }