fix(StreamingImageVolume): scaling bug for undefined parameters (#376)

cornerstonejs · Jan 18, 2023 · a366d9d · a366d9d
1 parent 32e2718
commit a366d9d
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 3 deletions.
diff --git a/packages/streaming-image-volume-loader/src/StreamingImageVolume.ts b/packages/streaming-image-volume-loader/src/StreamingImageVolume.ts
@@ -494,10 +494,27 @@ export default class StreamingImageVolume extends ImageVolume {
    * rescaleIntercept are different from the ones that were used to scale the
    * image, we should scale the image again according to the new parameters.
    */
-  private _scaleIfNecessary(image, scalingParametersToUse) {
+  private _scaleIfNecessary(
+    image,
+    scalingParametersToUse: Types.ScalingParameters
+  ) {
     const imageIsAlreadyScaled = image.preScale?.scaled;
+    const noScalingParametersToUse =
+      !scalingParametersToUse ||
+      !scalingParametersToUse.rescaleIntercept ||
+      !scalingParametersToUse.rescaleSlope;
+
+    if (!imageIsAlreadyScaled && noScalingParametersToUse) {
+      // no need to scale the image
+      return image.getPixelData().slice(0);
+    }
 
-    if (!imageIsAlreadyScaled) {
+    if (
+      !imageIsAlreadyScaled &&
+      scalingParametersToUse &&
+      scalingParametersToUse.rescaleIntercept !== undefined &&
+      scalingParametersToUse.rescaleSlope !== undefined
+    ) {
       // if not already scaled, just scale the image.
       // copy so that it doesn't get modified
       const pixelDataCopy = image.getPixelData().slice(0);

diff --git a/packages/streaming-image-volume-loader/src/helpers/scaleArray.ts b/packages/streaming-image-volume-loader/src/helpers/scaleArray.ts
@@ -16,7 +16,7 @@ export default function scaleArray(
 
   if (scalingParameters.modality === 'PT') {
     if (typeof suvbw !== 'number') {
-      return;
+      return array;
     }
 
     for (let i = 0; i < arrayLength; i++) {