dcmjs 0.43.1 → 0.44.0

package/build/dcmjs.es.js

@@ -10888,15 +10888,23 @@ var DicomMessage = /*#__PURE__*/function () {
       var options = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {
         ignoreErrors: false,
         untilTag: null,
-        includeUntilTagValue: false
+        includeUntilTagValue: false,
+        stopOnGreaterTag: false
       };
       var ignoreErrors = options.ignoreErrors,
-        untilTag = options.untilTag;
+        untilTag = options.untilTag,
+        stopOnGreaterTag = options.stopOnGreaterTag;
       var dict = {};
       try {
+        var previousTagOffset;
         while (!bufferStream.end()) {
+          previousTagOffset = bufferStream.offset;
           var readInfo = DicomMessage._readTag(bufferStream, syntax, options);
           var cleanTagString = readInfo.tag.toCleanString();
+          if (untilTag && stopOnGreaterTag && cleanTagString > untilTag) {
+            bufferStream.offset = previousTagOffset;
+            break;
+          }
           if (cleanTagString === "00080005") {
             if (readInfo.values.length > 0) {
               var coding = readInfo.values[0];
@@ -10970,15 +10978,36 @@ var DicomMessage = /*#__PURE__*/function () {
       if (stream.readAsciiString(4) !== "DICM") {
         throw new Error("Invalid DICOM file, expected header is missing");
       }
+
+      // save position before reading first tag
+      var metaStartPos = stream.offset;
+
+      // read the first tag to check if it's the meta length tag
       var el = DicomMessage._readTag(stream, useSyntax);
+      var metaHeader = {};
       if (el.tag.toCleanString() !== "00020000") {
-        throw new Error("Invalid DICOM file, meta length tag is malformed or not present.");
-      }
-      var metaLength = el.values[0];
+        // meta length tag is missing
+        if (!options.ignoreErrors) {
+          throw new Error("Invalid DICOM file, meta length tag is malformed or not present.");
+        }
+
+        // reset stream to the position where we started reading tags
+        stream.offset = metaStartPos;
+
+        // read meta header elements sequentially
+        metaHeader = DicomMessage._read(stream, useSyntax, {
+          untilTag: "00030000",
+          stopOnGreaterTag: true,
+          ignoreErrors: true
+        });
+      } else {
+        // meta length tag is present
+        var metaLength = el.values[0];
 
-      //read header buffer
-      var metaStream = stream.more(metaLength);
-      var metaHeader = DicomMessage._read(metaStream, useSyntax, options);
+        // read header buffer using the specified meta length
+        var metaStream = stream.more(metaLength);
+        metaHeader = DicomMessage._read(metaStream, useSyntax, options);
+      }
 
       //get the syntax
       var mainSyntax = metaHeader["00020010"].Value[0];