element needs tag

jssuttles · Jul 16, 2016 · 1758682 · 1758682
1 parent b9f6fea
commit 1758682
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 7 deletions.
diff --git a/dist/dicomParser.js b/dist/dicomParser.js
@@ -1752,7 +1752,7 @@ var dicomParser = (function (dicomParser)
         while(byteStream.position < maxPosition)
         {
             var element = dicomParser.readDicomElementExplicit(byteStream, dataSet.warnings, options.untilTag);
-            if (element) {
+            if (('vr' in element) || ('length') in element) {
               elements[element.tag] = element;
             }
             switch (typeof options.untilTag) {
@@ -1860,7 +1860,7 @@ var dicomParser = (function (dicomParser)
         var isUntilTag = false;
         if (typeof untilTag === 'object' && tag === untilTag.tag) {
           if (untilTag.include === false) {
-            return false;
+            return {tag: tag};
           } else {
             isUntilTag = true;
           }
@@ -1963,7 +1963,7 @@ var dicomParser = (function (dicomParser)
         var isUntilTag = false;
         if (typeof untilTag === 'object' && tag === untilTag.tag) {
           if (untilTag.include === false) {
-            return false;
+            return {tag: tag};
           } else {
             isUntilTag = true;
           }

diff --git a/dist/dicomParser.min.js b/dist/dicomParser.min.js
diff --git a/src/parseDicomDataSet.js b/src/parseDicomDataSet.js
@@ -34,7 +34,7 @@ var dicomParser = (function (dicomParser)
         while(byteStream.position < maxPosition)
         {
             var element = dicomParser.readDicomElementExplicit(byteStream, dataSet.warnings, options.untilTag);
-            if (element) {
+            if (('vr' in element) || ('length') in element) {
               elements[element.tag] = element;
             }
             switch (typeof options.untilTag) {

diff --git a/src/readDicomElementExplicit.js b/src/readDicomElementExplicit.js
@@ -39,7 +39,7 @@ var dicomParser = (function (dicomParser)
         var isUntilTag = false;
         if (typeof untilTag === 'object' && tag === untilTag.tag) {
           if (untilTag.include === false) {
-            return false;
+            return {tag: tag};
           } else {
             isUntilTag = true;
           }

diff --git a/src/readDicomElementImplicit.js b/src/readDicomElementImplicit.js
@@ -40,7 +40,7 @@ var dicomParser = (function (dicomParser)
         var isUntilTag = false;
         if (typeof untilTag === 'object' && tag === untilTag.tag) {
           if (untilTag.include === false) {
-            return false;
+            return {tag: tag};
           } else {
             isUntilTag = true;
           }