fix(cornerstoneWadoImageLoader):Load the palette color from a promise

Note there is a performance issue in this build - it wasn't introduced by these changes, but it 5-10 times slower than earlier versions (not sure how early to go to have it fast - was using 4.0.4
cornerstonejs · Mar 7, 2022 · 8ba0b46 · 8ba0b46
1 parent a3b35b8
commit 8ba0b46
Show file tree

Hide file tree

Showing 5 changed files with 209 additions and 205 deletions.
diff --git a/package.json b/package.json
@@ -103,6 +103,7 @@
   },
   "dependencies": {
     "@cornerstonejs/codec-charls": "^0.1.1",
+    "@cornerstonejs/codec-libjpeg-turbo-12bit": "^0.2.0",
     "@cornerstonejs/codec-libjpeg-turbo-8bit": "^0.0.7",
     "@cornerstonejs/codec-openjpeg": "^0.1.0",
     "dicom-parser": "^1.8.9",

diff --git a/src/imageLoader/colorSpaceConverters/convertPALETTECOLOR.js b/src/imageLoader/colorSpaceConverters/convertPALETTECOLOR.js
@@ -16,14 +16,21 @@ function convertLUTto8Bit(lut, shift) {
  *
  * @param {ImageFrame} imageFrame
  * @param {Uint8ClampedArray} rgbaBuffer
- * @returns {void}
+ * @returns {rgbaBuffer} as async function
  */
-export default function (imageFrame, rgbaBuffer) {
+export default async function (imageFrame, rgbaBuffer) {
   const numPixels = imageFrame.columns * imageFrame.rows;
   const pixelData = imageFrame.pixelData;
-  const rData = imageFrame.redPaletteColorLookupTableData;
-  const gData = imageFrame.greenPaletteColorLookupTableData;
-  const bData = imageFrame.bluePaletteColorLookupTableData;
+  const [rData, gData, bData] = await Promise.all([
+    imageFrame.redPaletteColorLookupTableData,
+    imageFrame.greenPaletteColorLookupTableData,
+    imageFrame.bluePaletteColorLookupTableData,
+  ]);
+
+  if (!rData || !gData || !bData) {
+    throw new Error(`Palette data not found in ${imageFrame}`);
+  }
+
   const len = imageFrame.redPaletteColorLookupTableData.length;
 
   let palIndex = 0;
@@ -54,4 +61,6 @@ export default function (imageFrame, rgbaBuffer) {
     rgbaBuffer[rgbaIndex++] = bDataCleaned[value];
     rgbaBuffer[rgbaIndex++] = 255;
   }
+
+  return rgbaBuffer;
 }
diff --git a/src/imageLoader/convertColorSpace.js b/src/imageLoader/convertColorSpace.js
@@ -34,7 +34,7 @@ export default function convertColorSpace(imageFrame, imageData) {
   } else if (imageFrame.photometricInterpretation === 'YBR_ICT') {
     convertRGB(imageFrame, rgbaBuffer);
   } else if (imageFrame.photometricInterpretation === 'PALETTE COLOR') {
-    convertPALETTECOLOR(imageFrame, rgbaBuffer);
+    return convertPALETTECOLOR(imageFrame, rgbaBuffer);
   } else if (imageFrame.photometricInterpretation === 'YBR_FULL_422') {
     convertYBRFull422ByPixel(imageFrame.pixelData, rgbaBuffer);
   } else if (imageFrame.photometricInterpretation === 'YBR_FULL') {