Merge pull request #2691 from MRtrix3/dicom_fix_multiframe_with_expli…

…cit_length_sequences DICOM: fix multiframe encoding with explicit length sequences
MRtrix3 · Aug 8, 2023 · fdec23d · fdec23d
2 parents 8a19272 + f21af33
commit fdec23d
Showing 1 changed file with 8 additions and 3 deletions.
diff --git a/core/file/dicom/element.cpp b/core/file/dicom/element.cpp
@@ -228,10 +228,15 @@ namespace MR {
 
 
 
-        if (parents.size())
-          if ((parents.back().end && data > parents.back().end) ||
-              (group == GROUP_SEQUENCE && element == ELEMENT_SEQUENCE_DELIMITATION_ITEM))
+        if (parents.size()) {
+          if (group == GROUP_SEQUENCE && element == ELEMENT_SEQUENCE_DELIMITATION_ITEM) {
             parents.pop_back();
+          }
+          else { // Undefined length encoding:
+            while (parents.size() && parents.back().end && data > parents.back().end)
+              parents.pop_back();
+          }
+        }
 
         if (is_new_sequence()) {
           if (size == LENGTH_UNDEFINED)