dcmjs 0.51.0 → 0.51.1

package/build/dcmjs.es.js

@@ -14185,84 +14185,94 @@ var AsyncDicomReader = /*#__PURE__*/function () {
               return stream.ensureAvailable();
             case 1:
               if (!(stream.offset < untilOffset && stream.isAvailable(1, false))) {
-                _context5.next = 14;
+                _context5.next = 15;
                 break;
               }
               readLog.debug("read loop", stream.offset, untilOffset);
               // Consume before reading the tag so that data before the
               // current tag can be cleared.
               stream.consume();
-              tagInfo = this.readTagHeader(options);
+              tagInfo = this.readTagHeader(options); // Stop when the requested tag boundary is reached.  readTagHeader()
+              // has already consumed the 4-byte tag but nothing beyond it, so
+              // stream.offset now points at the first byte after the tag (i.e.
+              // the VR field for explicit-LE).  Callers that need the start
+              // offset of the tag itself should subtract 4 from stream.offset.
+              if (!tagInfo.isUntilTag) {
+                _context5.next = 2;
+                break;
+              }
+              return _context5.abrupt("continue", 15);
+            case 2:
               tag = tagInfo.tag, tagObj = tagInfo.tagObj, length = tagInfo.length;
               if (!(tag === TagHex.ItemDelimitationEnd)) {
-                _context5.next = 2;
+                _context5.next = 3;
                 break;
               }
               return _context5.abrupt("return", listener.pop());
-            case 2:
+            case 3:
               if (!tagObj.isInstruction()) {
-                _context5.next = 3;
+                _context5.next = 4;
                 break;
               }
               return _context5.abrupt("continue", 1);
-            case 3:
+            case 4:
               if (!(tagObj.group() === 0 || tag === TagHex.DataSetTrailingPadding)) {
-                _context5.next = 4;
+                _context5.next = 5;
                 break;
               }
               // Group length
               stream.increment(tagObj.length);
               return _context5.abrupt("continue", 1);
-            case 4:
+            case 5:
               addTagResult = listener.addTag(tag, tagInfo);
               if (!this.isSequence(tagInfo)) {
-                _context5.next = 6;
+                _context5.next = 7;
                 break;
               }
-              _context5.next = 5;
+              _context5.next = 6;
               return this.readSequence(listener, tagInfo, options);
-            case 5:
-              _context5.next = 12;
-              break;
             case 6:
+              _context5.next = 13;
+              break;
+            case 7:
               if (!tagObj.isPixelDataTag()) {
-                _context5.next = 8;
+                _context5.next = 9;
                 break;
               }
-              _context5.next = 7;
+              _context5.next = 8;
               return this.readPixelData(tagInfo);
-            case 7:
-              _context5.next = 12;
-              break;
             case 8:
+              _context5.next = 13;
+              break;
+            case 9:
               if (!(length === UNDEFINED_LENGTH_FIX)) {
-                _context5.next = 9;
+                _context5.next = 10;
                 break;
               }
               throw new Error("Can't handle tag ".concat(tagInfo.tag, " with -1 length and not sequence"));
-            case 9:
+            case 10:
               if (!((addTagResult === null || addTagResult === void 0 ? void 0 : addTagResult.expectsRaw) === true && length > 0)) {
-                _context5.next = 11;
+                _context5.next = 12;
                 break;
               }
-              _context5.next = 10;
+              _context5.next = 11;
               return this.readRawBinary(tagInfo);
-            case 10:
-              _context5.next = 12;
-              break;
             case 11:
-              _context5.next = 12;
-              return this.readSingle(tagInfo, listener, options);
+              _context5.next = 13;
+              break;
             case 12:
-              listener.pop();
               _context5.next = 13;
-              return this.stream.ensureAvailable();
+              return this.readSingle(tagInfo, listener, options);
             case 13:
+              listener.pop();
+              _context5.next = 14;
+              return this.stream.ensureAvailable();
+            case 14:
               _context5.next = 1;
               break;
-            case 14:
-              return _context5.abrupt("return", listener.pop());
             case 15:
+              return _context5.abrupt("return", listener.pop());
+            case 16:
             case "end":
               return _context5.stop();
           }
@@ -14765,7 +14775,7 @@ var AsyncDicomReader = /*#__PURE__*/function () {
             tagObj: tagObj,
             vr: 0,
             values: 0,
-            untilTag: true
+            isUntilTag: true
           };
         }
       }