dcmjs 0.29.4 → 0.29.6

package/README.md

@@ -9,6 +9,8 @@
 
 **Note: this code is a work-in-progress and should not be used for production or clinical purposes**
 
+This is a community effort so please help improve support for a wide range of DICOM data and use cases.
+
 See [live examples here](https://dcmjs.netlify.com/)
 
 # Goals

package/build/dcmjs.es.js

@@ -9064,30 +9064,34 @@ var SequenceOfItems = /*#__PURE__*/function (_ValueRepresentation8) {
                 if (g == 0xfffe) {
                   // some control tag is about to be read
                   var ge = stream.readUint16();
+                  var itemLength = stream.readUint32();
+                  stream.increment(-4);
 
                   if (ge == 0xe00d) {
-                    // item delimitation tag has been read
-                    stack--;
-
-                    if (stack < 0) {
-                      // if we are outside every stack, then we are finished reading the sequence of items
-                      stream.increment(4);
-                      read += 8;
-                      break;
+                    if (itemLength === 0) {
+                      // item delimitation tag (0xfffee00d) + item length (0x00000000) has been read
+                      stack--;
+
+                      if (stack < 0) {
+                        // if we are outside every stack, then we are finished reading the sequence of items
+                        stream.increment(4);
+                        read += 8;
+                        break;
+                      } else {
+                        // otherwise, we were in a nested sequence of items
+                        toRead += 4;
+                      }
                     } else {
-                      // otherwise, we were in a nested sequence of items
-                      toRead += 4;
+                      // anything else has been read
+                      toRead += 2;
                     }
                   } else if (ge == 0xe000) {
                     // a new item has been found
-                    stack++;
                     toRead += 4;
-                    var itemLength = stream.readUint32();
-                    stream.increment(-4);
 
-                    if (itemLength === 0) {
-                      // in some odd cases, DICOMs rely on the length being zero to denote that the item has closed
-                      stack--;
+                    if (itemLength == 0xffffffff) {
+                      // a new item with undefined length has been found
+                      stack++;
                     }
                   } else {
                     // some control tag that does not concern sequence of items has been read
@@ -9801,6 +9805,23 @@ var DicomMetaDictionary = /*#__PURE__*/function () {
       }
 
       return tag.substring(1, 10).replace(",", "");
+    }
+  }, {
+    key: "parseIntFromTag",
+    value: function parseIntFromTag(tag) {
+      var integerValue = parseInt("0x" + DicomMetaDictionary.unpunctuateTag(tag));
+      return integerValue;
+    }
+  }, {
+    key: "tagAsIntegerFromName",
+    value: function tagAsIntegerFromName(name) {
+      var item = DicomMetaDictionary.nameMap[name];
+
+      if (item != undefined) {
+        return this.parseIntFromTag(item.tag);
+      } else {
+        return undefined;
+      }
     } // fixes some common errors in VRs
     // TODO: if this gets longer it could go in ValueRepresentation.js
     // or in a dedicated class
@@ -23571,7 +23592,9 @@ var TID300 = {
   CobbAngle: CobbAngle,
   Bidirectional: Bidirectional,
   Polyline: Polyline,
-  Ellipse: Ellipse
+  Polygon: Polygon,
+  Ellipse: Ellipse,
+  Circle: Circle
 };
 
 /**