dcmjs 0.19.8 → 0.19.9

package/build/dcmjs.es.js

@@ -12441,24 +12441,58 @@ function generateToolState$1(imageIds, arrayBuffer, metadataProvider) {
 
 
 function findReferenceSourceImageId(multiframe, frameSegment, imageIds, metadataProvider, tolerance) {
+  var imageId = undefined;
+
+  if (!multiframe) {
+    return imageId;
+  }
+
   var FrameOfReferenceUID = multiframe.FrameOfReferenceUID,
       PerFrameFunctionalGroupsSequence = multiframe.PerFrameFunctionalGroupsSequence,
       SourceImageSequence = multiframe.SourceImageSequence,
       ReferencedSeriesSequence = multiframe.ReferencedSeriesSequence;
+
+  if (!PerFrameFunctionalGroupsSequence || PerFrameFunctionalGroupsSequence.length === 0) {
+    return imageId;
+  }
+
   var PerFrameFunctionalGroup = PerFrameFunctionalGroupsSequence[frameSegment];
-  var imageId = undefined;
-  var sourceImageSequence;
 
-  if (SourceImageSequence) {
-    sourceImageSequence = multiframe.SourceImageSequence[frameSegment];
+  if (!PerFrameFunctionalGroup) {
+    return imageId;
+  }
+
+  var frameSourceImageSequence = undefined;
+
+  if (SourceImageSequence && SourceImageSequence.length !== 0) {
+    frameSourceImageSequence = SourceImageSequence[frameSegment];
   } else if (PerFrameFunctionalGroup.DerivationImageSequence) {
     var DerivationImageSequence = PerFrameFunctionalGroup.DerivationImageSequence;
-    DerivationImageSequence = Array.isArray(DerivationImageSequence) ? DerivationImageSequence[0] : DerivationImageSequence;
-    sourceImageSequence = DerivationImageSequence.SourceImageSequence;
-    sourceImageSequence = Array.isArray(sourceImageSequence) ? sourceImageSequence[0] : sourceImageSequence;
+
+    if (Array.isArray(DerivationImageSequence)) {
+      if (DerivationImageSequence.length !== 0) {
+        DerivationImageSequence = DerivationImageSequence[0];
+      } else {
+        DerivationImageSequence = undefined;
+      }
+    }
+
+    if (DerivationImageSequence) {
+      frameSourceImageSequence = DerivationImageSequence.SourceImageSequence;
+
+      if (Array.isArray(frameSourceImageSequence)) {
+        if (frameSourceImageSequence.length !== 0) {
+          frameSourceImageSequence = frameSourceImageSequence[0];
+        } else {
+          frameSourceImageSequence = undefined;
+        }
+      }
+    }
   }
 
-  imageId = getImageIdOfSourceImagebySourceImageSequence(sourceImageSequence, imageIds, metadataProvider);
+  if (frameSourceImageSequence) {
+    imageId = getImageIdOfSourceImagebySourceImageSequence(frameSourceImageSequence, imageIds, metadataProvider);
+  }
 
   if (imageId === undefined && ReferencedSeriesSequence) {
     var referencedSeriesSequence = Array.isArray(ReferencedSeriesSequence) ? ReferencedSeriesSequence[0] : ReferencedSeriesSequence;