@cornerstonejs/dicom-image-loader 4.16.2 → 4.16.3

package/dist/esm/imageLoader/colorSpaceConverters/convertPALETTECOLOR.d.ts

@@ -1,3 +1,4 @@
 import type { ByteArray } from 'dicom-parser';
-import { type Types } from '@cornerstonejs/core';
-export default function (imageFrame: Types.IImageFrame, colorBuffer: ByteArray, useRGBA: boolean): void;
+import type { Types } from '@cornerstonejs/core';
+export default function convertPaletteColor(imageFrame: Types.IImageFrame, colorBuffer: ByteArray, useRGBA: boolean): void;
+export declare function convertPaletteColorWithFetch(imageFrame: Types.IImageFrame, colorBuffer: ByteArray, useRGBA: boolean): Promise<void>;

package/dist/esm/imageLoader/colorSpaceConverters/convertPALETTECOLOR.js

@@ -1,4 +1,4 @@
-import { metaData } from '@cornerstonejs/core';
+import { fetchLUTForInstance } from './fetchLUTForInstance';
 function convertLUTto8Bit(lut, shift) {
     const numEntries = lut.length;
     const cleanedLUT = new Uint8ClampedArray(numEntries);
@@ -7,57 +7,25 @@ function convertLUTto8Bit(lut, shift) {
     }
     return cleanedLUT;
 }
-function fetchPaletteData(imageFrame, color, fallback) {
-    const data = imageFrame[`${color}PaletteColorLookupTableData`];
-    if (data) {
-        return Promise.resolve(data);
-    }
-    const result = metaData.get('imagePixelModule', imageFrame.imageId);
-    if (result && typeof result.then === 'function') {
-        return result.then((module) => module ? module[`${color}PaletteColorLookupTableData`] : fallback);
-    }
-    else {
-        return Promise.resolve(result ? result[`${color}PaletteColorLookupTableData`] : fallback);
-    }
-}
-export default function (imageFrame, colorBuffer, useRGBA) {
+export default function convertPaletteColor(imageFrame, colorBuffer, useRGBA) {
     const numPixels = imageFrame.columns * imageFrame.rows;
     const pixelData = imageFrame.pixelData;
-    Promise.all([
-        fetchPaletteData(imageFrame, 'red', null),
-        fetchPaletteData(imageFrame, 'green', null),
-        fetchPaletteData(imageFrame, 'blue', null),
-    ]).then(([rData, gData, bData]) => {
-        if (!rData || !gData || !bData) {
-            throw new Error('The image does not have a complete color palette. R, G, and B palette data are required.');
-        }
-        const len = rData.length;
-        let palIndex = 0;
-        let bufferIndex = 0;
-        const start = imageFrame.redPaletteColorLookupTableDescriptor[1];
-        const shift = imageFrame.redPaletteColorLookupTableDescriptor[2] === 8 ? 0 : 8;
-        const rDataCleaned = convertLUTto8Bit(rData, shift);
-        const gDataCleaned = convertLUTto8Bit(gData, shift);
-        const bDataCleaned = convertLUTto8Bit(bData, shift);
-        if (useRGBA) {
-            for (let i = 0; i < numPixels; ++i) {
-                let value = pixelData[palIndex++];
-                if (value < start) {
-                    value = 0;
-                }
-                else if (value > start + len - 1) {
-                    value = len - 1;
-                }
-                else {
-                    value -= start;
-                }
-                colorBuffer[bufferIndex++] = rDataCleaned[value];
-                colorBuffer[bufferIndex++] = gDataCleaned[value];
-                colorBuffer[bufferIndex++] = bDataCleaned[value];
-                colorBuffer[bufferIndex++] = 255;
-            }
-            return;
-        }
+    const rData = imageFrame.redPaletteColorLookupTableData;
+    const gData = imageFrame.greenPaletteColorLookupTableData;
+    const bData = imageFrame.bluePaletteColorLookupTableData;
+    if (!rData || !gData || !bData) {
+        throw new Error('The image does not have a complete color palette. R, G, and B palette data are required.');
+    }
+    const len = rData.length;
+    let palIndex = 0;
+    let bufferIndex = 0;
+    const start = imageFrame.redPaletteColorLookupTableDescriptor[1];
+    const bitsStored = imageFrame.redPaletteColorLookupTableDescriptor[2];
+    const shift = bitsStored > 8 || rData.some((num) => num > 255) ? 8 : 0;
+    const rDataCleaned = convertLUTto8Bit(rData, shift);
+    const gDataCleaned = convertLUTto8Bit(gData, shift);
+    const bDataCleaned = convertLUTto8Bit(bData, shift);
+    if (useRGBA) {
         for (let i = 0; i < numPixels; ++i) {
             let value = pixelData[palIndex++];
             if (value < start) {
@@ -72,6 +40,27 @@ export default function (imageFrame, colorBuffer, useRGBA) {
             colorBuffer[bufferIndex++] = rDataCleaned[value];
             colorBuffer[bufferIndex++] = gDataCleaned[value];
             colorBuffer[bufferIndex++] = bDataCleaned[value];
+            colorBuffer[bufferIndex++] = 255;
+        }
+        return;
+    }
+    for (let i = 0; i < numPixels; ++i) {
+        let value = pixelData[palIndex++];
+        if (value < start) {
+            value = 0;
+        }
+        else if (value > start + len - 1) {
+            value = len - 1;
         }
-    });
+        else {
+            value -= start;
+        }
+        colorBuffer[bufferIndex++] = rDataCleaned[value];
+        colorBuffer[bufferIndex++] = gDataCleaned[value];
+        colorBuffer[bufferIndex++] = bDataCleaned[value];
+    }
+}
+export async function convertPaletteColorWithFetch(imageFrame, colorBuffer, useRGBA) {
+    await fetchLUTForInstance(imageFrame);
+    convertPaletteColor(imageFrame, colorBuffer, useRGBA);
 }

package/dist/esm/imageLoader/colorSpaceConverters/fetchLUTForInstance.d.ts

@@ -0,0 +1,2 @@
+import type { Types } from '@cornerstonejs/core';
+export declare function fetchLUTForInstance(imageFrame: Types.IImageFrame): Promise<void> | null;

package/dist/esm/imageLoader/colorSpaceConverters/fetchLUTForInstance.js

@@ -0,0 +1,23 @@
+import { metaData } from '@cornerstonejs/core';
+import { fetchPaletteData } from './fetchPaletteData';
+export async function fetchLUTForInstance(imageFrame) {
+    const fetchPromises = [];
+    const needsPaletteLUT = !imageFrame.redPaletteColorLookupTableData ||
+        !imageFrame.greenPaletteColorLookupTableData ||
+        !imageFrame.bluePaletteColorLookupTableData;
+    if (needsPaletteLUT) {
+        const palettePromises = Promise.all([
+            fetchPaletteData(imageFrame, 'red', null),
+            fetchPaletteData(imageFrame, 'green', null),
+            fetchPaletteData(imageFrame, 'blue', null),
+        ]).then(([redData, greenData, blueData]) => {
+            imageFrame.redPaletteColorLookupTableData = redData;
+            imageFrame.greenPaletteColorLookupTableData = greenData;
+            imageFrame.bluePaletteColorLookupTableData = blueData;
+        });
+        fetchPromises.push(palettePromises);
+    }
+    if (fetchPromises.length > 0) {
+        await Promise.all(fetchPromises);
+    }
+}

package/dist/esm/imageLoader/colorSpaceConverters/fetchPaletteData.d.ts

@@ -0,0 +1,2 @@
+import type { Types } from '@cornerstonejs/core';
+export declare function fetchPaletteData(imageFrame: Types.IImageFrame, color: 'red' | 'green' | 'blue', fallback: any): any;

package/dist/esm/imageLoader/colorSpaceConverters/fetchPaletteData.js

@@ -0,0 +1,14 @@
+import { metaData } from '@cornerstonejs/core';
+export function fetchPaletteData(imageFrame, color, fallback) {
+    const data = imageFrame[`${color}PaletteColorLookupTableData`];
+    if (data) {
+        return Promise.resolve(data);
+    }
+    const result = metaData.get('imagePixelModule', imageFrame.imageId);
+    if (result && typeof result.then === 'function') {
+        return result.then((module) => module ? module[`${color}PaletteColorLookupTableData`] : fallback);
+    }
+    else {
+        return Promise.resolve(result ? result[`${color}PaletteColorLookupTableData`] : fallback);
+    }
+}

package/dist/esm/imageLoader/colorSpaceConverters/index.d.ts

@@ -3,5 +3,6 @@ import { default as convertRGBColorByPlane } from './convertRGBColorByPlane';
 import { default as convertYBRFullByPixel } from './convertYBRFullByPixel';
 import { default as convertYBRFullByPlane } from './convertYBRFullByPlane';
 import { default as convertYBRFull422ByPixel } from './convertYBRFull422ByPixel';
-import { default as convertPALETTECOLOR } from './convertPALETTECOLOR';
-export { convertRGBColorByPixel, convertRGBColorByPlane, convertYBRFullByPixel, convertYBRFullByPlane, convertYBRFull422ByPixel, convertPALETTECOLOR, };
+import { default as convertPaletteColor, convertPaletteColorWithFetch } from './convertPALETTECOLOR';
+import { fetchLUTForInstance } from './fetchLUTForInstance';
+export { convertRGBColorByPixel, convertRGBColorByPlane, convertYBRFullByPixel, convertYBRFullByPlane, convertYBRFull422ByPixel, convertPaletteColor, convertPaletteColorWithFetch, fetchLUTForInstance, };

package/dist/esm/imageLoader/colorSpaceConverters/index.js

@@ -3,5 +3,6 @@ import { default as convertRGBColorByPlane } from './convertRGBColorByPlane';
 import { default as convertYBRFullByPixel } from './convertYBRFullByPixel';
 import { default as convertYBRFullByPlane } from './convertYBRFullByPlane';
 import { default as convertYBRFull422ByPixel } from './convertYBRFull422ByPixel';
-import { default as convertPALETTECOLOR } from './convertPALETTECOLOR';
-export { convertRGBColorByPixel, convertRGBColorByPlane, convertYBRFullByPixel, convertYBRFullByPlane, convertYBRFull422ByPixel, convertPALETTECOLOR, };
+import { default as convertPaletteColor, convertPaletteColorWithFetch, } from './convertPALETTECOLOR';
+import { fetchLUTForInstance } from './fetchLUTForInstance';
+export { convertRGBColorByPixel, convertRGBColorByPlane, convertYBRFullByPixel, convertYBRFullByPlane, convertYBRFull422ByPixel, convertPaletteColor, convertPaletteColorWithFetch, fetchLUTForInstance, };

package/dist/esm/imageLoader/convertColorSpace.js

@@ -1,4 +1,4 @@
-import { convertRGBColorByPixel, convertRGBColorByPlane, convertYBRFullByPixel, convertYBRFull422ByPixel, convertYBRFullByPlane, convertPALETTECOLOR, } from './colorSpaceConverters/index';
+import { convertRGBColorByPixel, convertRGBColorByPlane, convertYBRFullByPixel, convertYBRFull422ByPixel, convertYBRFullByPlane, convertPaletteColor, } from './colorSpaceConverters/index';
 function convertRGB(imageFrame, colorBuffer, useRGBA) {
     if (imageFrame.planarConfiguration === 0) {
         convertRGBColorByPixel(imageFrame.pixelData, colorBuffer, useRGBA);
@@ -26,7 +26,7 @@ export default function convertColorSpace(imageFrame, colorBuffer, useRGBA) {
         convertRGBColorByPixel(imageFrame.pixelData, colorBuffer, useRGBA);
     }
     else if (imageFrame.photometricInterpretation === 'PALETTE COLOR') {
-        convertPALETTECOLOR(imageFrame, colorBuffer, useRGBA);
+        convertPaletteColor(imageFrame, colorBuffer, useRGBA);
     }
     else if (imageFrame.photometricInterpretation === 'YBR_FULL_422') {
         convertYBRFull422ByPixel(imageFrame.pixelData, colorBuffer, useRGBA);

package/dist/esm/imageLoader/createImage.js

@@ -10,8 +10,9 @@ import isColorImageFn from '../shared/isColorImage';
 import removeAFromRGBA from './removeAFromRGBA';
 import isModalityLUTForDisplay from './isModalityLutForDisplay';
 import setPixelDataType from './setPixelDataType';
+import { fetchPaletteData } from './colorSpaceConverters/fetchPaletteData';
 let lastImageIdDrawn = '';
-function createImage(imageId, pixelData, transferSyntax, options = {}) {
+async function createImage(imageId, pixelData, transferSyntax, options = {}) {
     const useRGBA = options.useRGBA;
     options.preScale = {
         enabled: options.preScale && options.preScale.enabled !== undefined
@@ -26,6 +27,14 @@ function createImage(imageId, pixelData, transferSyntax, options = {}) {
     const imageFrame = getImageFrame(imageId);
     imageFrame.decodeLevel = options.decodeLevel;
     options.allowFloatRendering = canRenderFloatTextures();
+    let redData, greenData, blueData;
+    if (imageFrame.photometricInterpretation === 'PALETTE COLOR') {
+        [redData, greenData, blueData] = await Promise.all([
+            fetchPaletteData(imageFrame, 'red', null),
+            fetchPaletteData(imageFrame, 'green', null),
+            fetchPaletteData(imageFrame, 'blue', null),
+        ]);
+    }
     if (options.preScale.enabled) {
         const scalingParameters = getScalingParameters(metaData, imageId);
         if (scalingParameters) {
@@ -85,6 +94,11 @@ function createImage(imageId, pixelData, transferSyntax, options = {}) {
             const sopCommonModule = metaData.get(MetadataModules.SOP_COMMON, imageId) || {};
             const calibrationModule = metaData.get(MetadataModules.CALIBRATION, imageId) || {};
             const { rows, columns } = imageFrame;
+            if (imageFrame.photometricInterpretation === 'PALETTE COLOR') {
+                imageFrame.redPaletteColorLookupTableData = redData;
+                imageFrame.greenPaletteColorLookupTableData = greenData;
+                imageFrame.bluePaletteColorLookupTableData = blueData;
+            }
             if (isColorImage) {
                 if (isColorConversionRequired(imageFrame)) {
                     canvas.height = imageFrame.rows;

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

@@ -1,4 +1,4 @@
-import { convertRGBColorByPixel, convertRGBColorByPlane, convertYBRFullByPixel, convertYBRFullByPlane, convertPALETTECOLOR } from './colorSpaceConverters/index';
+import { convertRGBColorByPixel, convertRGBColorByPlane, convertYBRFullByPixel, convertYBRFullByPlane, convertPaletteColor, convertPaletteColorWithFetch } from './colorSpaceConverters/index';
 import { default as wadouri } from './wadouri/index';
 import { default as wadors } from './wadors/index';
 import { default as init } from '../init';
@@ -21,7 +21,8 @@ declare const cornerstoneDICOMImageLoader: {
     convertRGBColorByPlane: typeof convertRGBColorByPlane;
     convertYBRFullByPixel: typeof convertYBRFullByPixel;
     convertYBRFullByPlane: typeof convertYBRFullByPlane;
-    convertPALETTECOLOR: typeof convertPALETTECOLOR;
+    convertPaletteColor: typeof convertPaletteColor;
+    convertPaletteColorWithFetch: typeof convertPaletteColorWithFetch;
     wadouri: {
         metaData: {
             getImagePixelModule: typeof import("./wadouri/metaData").getImagePixelModule;
@@ -97,5 +98,5 @@ declare const cornerstoneDICOMImageLoader: {
         getOptions: typeof import("./internal/options").getOptions;
     };
 };
-export { convertRGBColorByPixel, convertRGBColorByPlane, convertYBRFullByPixel, convertYBRFullByPlane, convertPALETTECOLOR, wadouri, wadors, init, convertColorSpace, createImage, decodeJPEGBaseline8BitColor, getImageFrame, getPixelData, getMinMax, isColorImage, isJPEGBaseline8BitColor, internal, };
+export { convertRGBColorByPixel, convertRGBColorByPlane, convertYBRFullByPixel, convertYBRFullByPlane, convertPaletteColorWithFetch, convertPaletteColor, wadouri, wadors, init, convertColorSpace, createImage, decodeJPEGBaseline8BitColor, getImageFrame, getPixelData, getMinMax, isColorImage, isJPEGBaseline8BitColor, internal, };
 export default cornerstoneDICOMImageLoader;

package/dist/esm/imageLoader/index.js

@@ -1,4 +1,4 @@
-import { convertRGBColorByPixel, convertRGBColorByPlane, convertYBRFullByPixel, convertYBRFullByPlane, convertPALETTECOLOR, } from './colorSpaceConverters/index';
+import { convertRGBColorByPixel, convertRGBColorByPlane, convertYBRFullByPixel, convertYBRFullByPlane, convertPaletteColor, convertPaletteColorWithFetch, } from './colorSpaceConverters/index';
 import { default as wadouri } from './wadouri/index';
 import { default as wadors } from './wadors/index';
 import { default as init } from '../init';
@@ -21,7 +21,8 @@ const cornerstoneDICOMImageLoader = {
     convertRGBColorByPlane,
     convertYBRFullByPixel,
     convertYBRFullByPlane,
-    convertPALETTECOLOR,
+    convertPaletteColor,
+    convertPaletteColorWithFetch,
     wadouri,
     wadors,
     init,
@@ -40,5 +41,5 @@ const cornerstoneDICOMImageLoader = {
     setPixelDataType,
     internal,
 };
-export { convertRGBColorByPixel, convertRGBColorByPlane, convertYBRFullByPixel, convertYBRFullByPlane, convertPALETTECOLOR, wadouri, wadors, init, convertColorSpace, createImage, decodeJPEGBaseline8BitColor, getImageFrame, getPixelData, getMinMax, isColorImage, isJPEGBaseline8BitColor, internal, };
+export { convertRGBColorByPixel, convertRGBColorByPlane, convertYBRFullByPixel, convertYBRFullByPlane, convertPaletteColorWithFetch, convertPaletteColor, wadouri, wadors, init, convertColorSpace, createImage, decodeJPEGBaseline8BitColor, getImageFrame, getPixelData, getMinMax, isColorImage, isJPEGBaseline8BitColor, internal, };
 export default cornerstoneDICOMImageLoader;

package/dist/esm/index.d.ts

@@ -1,4 +1,4 @@
-import { convertRGBColorByPixel, convertRGBColorByPlane, convertYBRFullByPixel, convertYBRFullByPlane, convertPALETTECOLOR } from './imageLoader/colorSpaceConverters/index';
+import { convertRGBColorByPixel, convertRGBColorByPlane, convertYBRFullByPixel, convertYBRFullByPlane, convertPaletteColor, convertPaletteColorWithFetch } from './imageLoader/colorSpaceConverters/index';
 import { default as wadouri } from './imageLoader/wadouri/index';
 import { default as wadors } from './imageLoader/wadors/index';
 import { default as init } from './init';
@@ -21,7 +21,8 @@ declare const cornerstoneDICOMImageLoader: {
     convertRGBColorByPlane: typeof convertRGBColorByPlane;
     convertYBRFullByPixel: typeof convertYBRFullByPixel;
     convertYBRFullByPlane: typeof convertYBRFullByPlane;
-    convertPALETTECOLOR: typeof convertPALETTECOLOR;
+    convertPaletteColor: typeof convertPaletteColor;
+    convertPaletteColorWithFetch: typeof convertPaletteColorWithFetch;
     wadouri: {
         metaData: {
             getImagePixelModule: typeof import("./imageLoader/wadouri/metaData").getImagePixelModule;
@@ -113,6 +114,6 @@ declare const cornerstoneDICOMImageLoader: {
         RLE: typeof import("./shared/decoders/decodeRLE").default;
     };
 };
-export { constants, convertRGBColorByPixel, convertRGBColorByPlane, convertYBRFullByPixel, convertYBRFullByPlane, convertPALETTECOLOR, 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, getMinMax, isColorImage, isJPEGBaseline8BitColor, internal, decodeImageFrame, postProcessDecodedPixels, initializers, decoders, };
 export type { Types };
 export default cornerstoneDICOMImageLoader;

package/dist/esm/index.js

@@ -1,4 +1,4 @@
-import { convertRGBColorByPixel, convertRGBColorByPlane, convertYBRFullByPixel, convertYBRFullByPlane, convertPALETTECOLOR, } from './imageLoader/colorSpaceConverters/index';
+import { convertRGBColorByPixel, convertRGBColorByPlane, convertYBRFullByPixel, convertYBRFullByPlane, convertPaletteColor, convertPaletteColorWithFetch, } from './imageLoader/colorSpaceConverters/index';
 import { default as wadouri } from './imageLoader/wadouri/index';
 import { default as wadors } from './imageLoader/wadors/index';
 import { default as init } from './init';
@@ -20,7 +20,8 @@ const cornerstoneDICOMImageLoader = {
     convertRGBColorByPlane,
     convertYBRFullByPixel,
     convertYBRFullByPlane,
-    convertPALETTECOLOR,
+    convertPaletteColor,
+    convertPaletteColorWithFetch,
     wadouri,
     wadors,
     init,
@@ -38,5 +39,5 @@ const cornerstoneDICOMImageLoader = {
     initializers,
     decoders,
 };
-export { constants, convertRGBColorByPixel, convertRGBColorByPlane, convertYBRFullByPixel, convertYBRFullByPlane, convertPALETTECOLOR, 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, getMinMax, isColorImage, isJPEGBaseline8BitColor, internal, decodeImageFrame, postProcessDecodedPixels, initializers, decoders, };
 export default cornerstoneDICOMImageLoader;

package/dist/esm/version.d.ts

@@ -1 +1 @@
-export declare const version = "4.16.2";
+export declare const version = "4.16.3";

package/dist/esm/version.js

@@ -1 +1 @@
-export const version = '4.16.2';
+export const version = '4.16.3';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cornerstonejs/dicom-image-loader",
-  "version": "4.16.2",
+  "version": "4.16.3",
   "description": "Cornerstone Image Loader for DICOM WADO-URI and WADO-RS and Local file",
   "keywords": [
     "DICOM",
@@ -112,7 +112,7 @@
     "uuid": "9.0.1"
   },
   "peerDependencies": {
-    "@cornerstonejs/core": "4.16.2",
+    "@cornerstonejs/core": "4.16.3",
     "dicom-parser": "1.8.21"
   },
   "config": {
@@ -120,5 +120,5 @@
       "path": "./node_modules/cz-conventional-changelog"
     }
   },
-  "gitHead": "34d0ecf3256b27b8a10cc808c4a3363623a87ab5"
+  "gitHead": "fdc31b29ccd1f731449ab6e0ca0b19dc0ffb2ada"
 }