@cornerstonejs/dicom-image-loader 5.4.11 → 5.4.13

package/dist/esm/imageLoader/prefetchPart10Instance.d.ts

@@ -0,0 +1,3 @@
+type Part10Input = ArrayBuffer | Uint8Array | (() => ArrayBuffer | Uint8Array | Promise<ArrayBuffer | Uint8Array>);
+export declare function prefetchPart10Instance(baseImageId: string, part10: Part10Input): Promise<never>;
+export default prefetchPart10Instance;

package/dist/esm/imageLoader/prefetchPart10Instance.js

@@ -0,0 +1,6 @@
+import { utilities } from '@cornerstonejs/metadata';
+const { addDicomPart10Instance } = utilities;
+export function prefetchPart10Instance(baseImageId, part10) {
+    return addDicomPart10Instance(baseImageId, part10);
+}
+export default prefetchPart10Instance;

package/dist/esm/imageLoader/wadors/loadImage.js

@@ -2,6 +2,7 @@ import { Enums, imageRetrievalPoolManager, utilities, } from '@cornerstonejs/cor
 import { Enums as csCoreEnums } from '@cornerstonejs/core';
 import createImage from '../createImage.js';
 import getPixelData from './getPixelData.js';
+import { loadImageFromCompressedFrameRegistry } from './loadImageFromRegistry.js';
 const { ProgressiveIterator } = utilities;
 const { ImageQualityStatus } = Enums;
 const streamableTransferSyntaxes = new Set([
@@ -56,6 +57,19 @@ function getImageRetrievalPool() {
 }
 const mediaType = 'multipart/related; type=application/octet-stream; transfer-syntax=*';
 function loadImage(imageId, options = {}) {
+    const registryPromise = loadImageFromCompressedFrameRegistry(imageId, options);
+    if (registryPromise) {
+        return {
+            promise: registryPromise.catch((error) => {
+                console.warn(`Failed to decode registry frame data for ${imageId}; falling back to network retrieval`, error);
+                return loadImageFromNetwork(imageId, options).promise;
+            }),
+            cancelFn: undefined,
+        };
+    }
+    return loadImageFromNetwork(imageId, options);
+}
+function loadImageFromNetwork(imageId, options = {}) {
     const imageRetrievalPool = getImageRetrievalPool();
     const start = new Date().getTime();
     const uncompressedIterator = new ProgressiveIterator('decompress');

package/dist/esm/imageLoader/wadors/loadImageFromRegistry.d.ts

@@ -0,0 +1,3 @@
+import type { DICOMLoaderIImage, DICOMLoaderImageOptions } from '../../types/index.js';
+export declare function loadImageFromCompressedFrameRegistry(imageId: string, options?: DICOMLoaderImageOptions): Promise<DICOMLoaderIImage> | undefined;
+export default loadImageFromCompressedFrameRegistry;

package/dist/esm/imageLoader/wadors/loadImageFromRegistry.js

@@ -0,0 +1,62 @@
+import { Enums, metaData } from '@cornerstonejs/core';
+import { Enums as MetadataEnums } from '@cornerstonejs/metadata';
+import createImage from '../createImage.js';
+const { ImageQualityStatus } = Enums;
+const COMPRESSED_FRAME_DATA = MetadataEnums.MetadataModules.COMPRESSED_FRAME_DATA;
+function getWadorsFrameIndex(imageId) {
+    const match = imageId.match(/\/frames\/(\d+)/);
+    return match ? Math.max(0, Number(match[1]) - 1) : 0;
+}
+const asByteArray = (data) => data instanceof ArrayBuffer ? new Uint8Array(data) : data;
+function concatPixelData(pixelData) {
+    if (!Array.isArray(pixelData)) {
+        return asByteArray(pixelData);
+    }
+    if (pixelData.length === 0) {
+        return undefined;
+    }
+    if (pixelData.length === 1) {
+        return asByteArray(pixelData[0]);
+    }
+    let totalLength = 0;
+    for (const fragment of pixelData) {
+        totalLength += asByteArray(fragment).length;
+    }
+    const result = new Uint8Array(totalLength);
+    let offset = 0;
+    for (const fragment of pixelData) {
+        const view = asByteArray(fragment);
+        result.set(view, offset);
+        offset += view.length;
+    }
+    return result;
+}
+export function loadImageFromCompressedFrameRegistry(imageId, options = {}) {
+    const frameIndex = getWadorsFrameIndex(imageId);
+    let frameData;
+    try {
+        frameData = metaData.getTyped(COMPRESSED_FRAME_DATA, imageId, {
+            frameIndex,
+        });
+    }
+    catch (error) {
+        return undefined;
+    }
+    if (!frameData?.pixelData) {
+        return undefined;
+    }
+    const { pixelData, transferSyntaxUid } = frameData;
+    const concatenated = concatPixelData(pixelData);
+    if (!concatenated?.length || !transferSyntaxUid) {
+        return undefined;
+    }
+    const start = Date.now();
+    return createImage(imageId, concatenated, transferSyntaxUid, options).then((image) => {
+        const out = image;
+        out.imageQualityStatus = ImageQualityStatus.FULL_RESOLUTION;
+        out.transferSyntaxUID = transferSyntaxUid;
+        out.loadTimeInMS = Date.now() - start;
+        return out;
+    });
+}
+export default loadImageFromCompressedFrameRegistry;

package/dist/esm/index.d.ts

@@ -10,6 +10,7 @@ import { default as getMinMax } from './shared/getMinMax.js';
 import { default as isColorImage } from './shared/isColorImage.js';
 import { default as isJPEGBaseline8BitColor } from './imageLoader/isJPEGBaseline8BitColor.js';
 import { default as getPixelData } from './imageLoader/wadors/getPixelData.js';
+import { default as prefetchPart10Instance } from './imageLoader/prefetchPart10Instance.js';
 import { internal } from './imageLoader/internal/index.js';
 import * as constants from './constants/index.js';
 import type * as Types from './types/index.js';
@@ -84,6 +85,7 @@ declare const cornerstoneDICOMImageLoader: {
     decodeJPEGBaseline8BitColor: typeof decodeJPEGBaseline8BitColor;
     getImageFrame: typeof getImageFrame;
     getPixelData: typeof getPixelData;
+    prefetchPart10Instance: typeof prefetchPart10Instance;
     getMinMax: typeof getMinMax;
     isColorImage: typeof isColorImage;
     isJPEGBaseline8BitColor: typeof isJPEGBaseline8BitColor;
@@ -115,6 +117,6 @@ declare const cornerstoneDICOMImageLoader: {
         RLE: typeof import("./shared/decoders/decodeRLE.js").default;
     };
 };
-export { constants, convertRGBColorByPixel, convertRGBColorByPlane, convertYBRFullByPixel, convertYBRFullByPlane, convertPaletteColor, convertPaletteColorWithFetch, wadouri, wadors, init, convertColorSpace, createImage, decodeJPEGBaseline8BitColor, getImageFrame, getPixelData, getMinMax, isColorImage, isJPEGBaseline8BitColor, internal, decodeImageFrame, postProcessDecodedPixels, initializers, decoders, };
+export { constants, convertRGBColorByPixel, convertRGBColorByPlane, convertYBRFullByPixel, convertYBRFullByPlane, convertPaletteColor, convertPaletteColorWithFetch, wadouri, wadors, init, convertColorSpace, createImage, decodeJPEGBaseline8BitColor, getImageFrame, getPixelData, prefetchPart10Instance, getMinMax, isColorImage, isJPEGBaseline8BitColor, internal, decodeImageFrame, postProcessDecodedPixels, initializers, decoders, };
 export type { Types };
 export default cornerstoneDICOMImageLoader;

package/dist/esm/index.js

@@ -10,6 +10,7 @@ import { default as getMinMax } from './shared/getMinMax.js';
 import { default as isColorImage } from './shared/isColorImage.js';
 import { default as isJPEGBaseline8BitColor } from './imageLoader/isJPEGBaseline8BitColor.js';
 import { default as getPixelData } from './imageLoader/wadors/getPixelData.js';
+import { default as prefetchPart10Instance } from './imageLoader/prefetchPart10Instance.js';
 import { internal } from './imageLoader/internal/index.js';
 import * as constants from './constants/index.js';
 import { decodeImageFrame, postProcessDecodedPixels, } from './decodeImageFrameWorker.js';
@@ -30,6 +31,7 @@ const cornerstoneDICOMImageLoader = {
     decodeJPEGBaseline8BitColor,
     getImageFrame,
     getPixelData,
+    prefetchPart10Instance,
     getMinMax,
     isColorImage,
     isJPEGBaseline8BitColor,
@@ -39,5 +41,5 @@ const cornerstoneDICOMImageLoader = {
     initializers,
     decoders,
 };
-export { constants, convertRGBColorByPixel, convertRGBColorByPlane, convertYBRFullByPixel, convertYBRFullByPlane, convertPaletteColor, convertPaletteColorWithFetch, wadouri, wadors, init, convertColorSpace, createImage, decodeJPEGBaseline8BitColor, getImageFrame, getPixelData, getMinMax, isColorImage, isJPEGBaseline8BitColor, internal, decodeImageFrame, postProcessDecodedPixels, initializers, decoders, };
+export { constants, convertRGBColorByPixel, convertRGBColorByPlane, convertYBRFullByPixel, convertYBRFullByPlane, convertPaletteColor, convertPaletteColorWithFetch, wadouri, wadors, init, convertColorSpace, createImage, decodeJPEGBaseline8BitColor, getImageFrame, getPixelData, prefetchPart10Instance, getMinMax, isColorImage, isJPEGBaseline8BitColor, internal, decodeImageFrame, postProcessDecodedPixels, initializers, decoders, };
 export default cornerstoneDICOMImageLoader;

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

@@ -1,4 +1,5 @@
 import type { ByteArray } from 'dicom-parser';
 import type { Types } from '@cornerstonejs/core';
 declare function decodeRLE(imageFrame: Types.IImageFrame, pixelData: ByteArray): Promise<Types.IImageFrame>;
+export declare function unpackOneBitPlanar(packed: Uint8Array, imageFrame: Types.IImageFrame, frameSize: number): Uint8Array;
 export default decodeRLE;

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

@@ -8,11 +8,32 @@ async function decodeRLE(imageFrame, pixelData) {
     else if (imageFrame.bitsAllocated === 16) {
         return decode16(imageFrame, pixelData);
     }
+    else if (imageFrame.bitsAllocated === 1) {
+        return decode8Planar(imageFrame, pixelData, true);
+    }
     throw new Error('unsupported pixel format for RLE');
 }
-function decode8(imageFrame, pixelData) {
+function getFrameSize(imageFrame, isOneBit = false) {
+    const pixelCount = imageFrame.rows * imageFrame.columns;
+    return isOneBit ? Math.ceil(pixelCount / 8) : pixelCount;
+}
+export function unpackOneBitPlanar(packed, imageFrame, frameSize) {
+    const pixelsPerPlane = imageFrame.rows * imageFrame.columns;
+    const unpacked = new Uint8Array(pixelsPerPlane * imageFrame.samplesPerPixel);
+    for (let s = 0; s < imageFrame.samplesPerPixel; s++) {
+        const planeOffset = s * frameSize;
+        for (let i = 0; i < pixelsPerPlane; i++) {
+            const bytePos = planeOffset + Math.floor(i / 8);
+            const bitPos = i % 8;
+            unpacked[s * pixelsPerPlane + i] =
+                packed[bytePos] & (1 << bitPos) ? 1 : 0;
+        }
+    }
+    return unpacked;
+}
+function decode8(imageFrame, pixelData, isOneBit = false) {
     const frameData = pixelData;
-    const frameSize = imageFrame.rows * imageFrame.columns;
+    const frameSize = getFrameSize(imageFrame, isOneBit);
     const outFrame = new ArrayBuffer(frameSize * imageFrame.samplesPerPixel);
     const header = new DataView(frameData.buffer, frameData.byteOffset);
     const data = new Int8Array(frameData.buffer, frameData.byteOffset);
@@ -47,9 +68,9 @@ function decode8(imageFrame, pixelData) {
     imageFrame.pixelData = new Uint8Array(outFrame);
     return imageFrame;
 }
-function decode8Planar(imageFrame, pixelData) {
+function decode8Planar(imageFrame, pixelData, isOneBit = false) {
     const frameData = pixelData;
-    const frameSize = imageFrame.rows * imageFrame.columns;
+    const frameSize = getFrameSize(imageFrame, isOneBit);
     const outFrame = new ArrayBuffer(frameSize * imageFrame.samplesPerPixel);
     const header = new DataView(frameData.buffer, frameData.byteOffset);
     const data = new Int8Array(frameData.buffer, frameData.byteOffset);
@@ -82,6 +103,9 @@ function decode8Planar(imageFrame, pixelData) {
         }
     }
     imageFrame.pixelData = new Uint8Array(outFrame);
+    if (isOneBit) {
+        imageFrame.pixelData = unpackOneBitPlanar(imageFrame.pixelData, imageFrame, frameSize);
+    }
     return imageFrame;
 }
 function decode16(imageFrame, pixelData) {

package/dist/esm/version.d.ts

@@ -1 +1 @@
-export declare const version = "5.4.11";
+export declare const version = "5.4.13";

package/dist/esm/version.js

@@ -1 +1 @@
-export const version = '5.4.11';
+export const version = '5.4.13';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cornerstonejs/dicom-image-loader",
-  "version": "5.4.11",
+  "version": "5.4.13",
   "description": "Cornerstone Image Loader for DICOM WADO-URI and WADO-RS and Local file",
   "keywords": [
     "DICOM",
@@ -91,7 +91,7 @@
     "clean:coverage": "shx rm -rf coverage",
     "doc": "npm run doc:generate && opn documentation/index.html",
     "doc:generate": "npm run clean:docs && jsdoc -c .jsdocrc",
-    "dev": "tsc --project ./tsconfig.json --watch",
+    "dev": "tsc --project ./tsconfig.json --watch --sourceMap --inlineSources",
     "lint": "oxlint .",
     "start": "npm run webpack:dev",
     "start:dev": "webpack-dev-server --config .webpack/webpack-dev",
@@ -122,12 +122,12 @@
     "uuid": "9.0.1"
   },
   "devDependencies": {
-    "@cornerstonejs/core": "5.4.11",
-    "@cornerstonejs/metadata": "5.4.11"
+    "@cornerstonejs/core": "5.4.13",
+    "@cornerstonejs/metadata": "5.4.13"
   },
   "peerDependencies": {
-    "@cornerstonejs/core": "5.4.11",
-    "@cornerstonejs/metadata": "5.4.11",
+    "@cornerstonejs/core": "5.4.13",
+    "@cornerstonejs/metadata": "5.4.13",
     "dicom-parser": "1.8.21"
   },
   "config": {
@@ -135,5 +135,5 @@
       "path": "./node_modules/cz-conventional-changelog"
     }
   },
-  "gitHead": "b6139a8e5a81a2f5a1bf5e1d1e238605d85c6d65"
+  "gitHead": "9f0b0f4813368e68bc0c04f02132e06f15b6a0f8"
 }