dcmjs 0.24.1 → 0.24.2

package/build/dcmjs.js

@@ -1182,7 +1182,8 @@
 
 	    var options = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {
 	      start: null,
-	      stop: null
+	      stop: null,
+	      noCopy: false
 	    };
 
 	    _classCallCheck(this, ReadBufferStream);
@@ -1190,12 +1191,27 @@
 	    _this = _super.call(this, buffer, littleEndian);
 	    _this.offset = options.start || 0;
 	    _this.size = options.stop || _this.buffer.byteLength;
+	    _this.noCopy = options.noCopy;
 	    _this.startOffset = _this.offset;
 	    _this.endOffset = _this.size;
 	    return _this;
 	  }
 
 	  _createClass(ReadBufferStream, [{
+	    key: "getBuffer",
+	    value: function getBuffer(start, end) {
+	      if (this.noCopy) {
+	        return new Uint8Array(this.buffer, start, end - start);
+	      }
+
+	      if (!start && !end) {
+	        start = 0;
+	        end = this.size;
+	      }
+
+	      return this.buffer.slice(start, end);
+	    }
+	  }, {
 	    key: "readString",
 	    value: function readString(length) {
 	      var chars = [];
@@ -1317,25 +1333,10 @@
 	  return _createClass(WriteBufferStream);
 	}(BufferStream);
 
-	function paddingLeft(paddingValue, string) {
-	  return String(paddingValue + string).slice(-paddingValue.length);
-	}
-
 	function rtrim(str) {
 	  return str.replace(/\s*$/g, "");
 	}
 
-	function tagFromNumbers(group, element) {
-	  return new Tag((group << 16 | element) >>> 0);
-	}
-
-	function readTag(stream) {
-	  var group = stream.readUint16(),
-	      element = stream.readUint16();
-	  var tag = tagFromNumbers(group, element);
-	  return tag;
-	}
-
 	function toWindows(inputArray, size) {
 	  return Array.from({
 	    length: inputArray.length - (size - 1)
@@ -1722,7 +1723,8 @@
 
 	              var rangeStream = new ReadBufferStream(stream.buffer, stream.isLittleEndian, {
 	                start: start,
-	                stop: stop
+	                stop: stop,
+	                noCopy: stream.noCopy
 	              });
 	              var frameSize = 0;
 
@@ -1742,16 +1744,21 @@
 
 	              if (fragments.length === 1) {
 	                return fragments[0];
-	              } // Allocate a final ArrayBuffer and concat all buffers into it
-
+	              }
 
-	              var mergedFrame = new ArrayBuffer(frameSize);
-	              var u8Data = new Uint8Array(mergedFrame);
-	              fragments.reduce(function (offset, buffer) {
-	                u8Data.set(buffer, offset);
-	                return offset + buffer.byteLength;
-	              }, 0);
-	              return mergedFrame;
+	              if (rangeStream.noCopy) {
+	                // return the fragments for downstream application to process
+	                return fragments;
+	              } else {
+	                // Allocate a final ArrayBuffer and concat all buffers into it
+	                var mergedFrame = new ArrayBuffer(frameSize);
+	                var u8Data = new Uint8Array(mergedFrame);
+	                fragments.reduce(function (offset, buffer) {
+	                  u8Data.set(new Uint8Array(buffer), offset);
+	                  return offset + buffer.byteLength;
+	                }, 0);
+	                return mergedFrame;
+	              }
 	            });
 	          } // If no offset table, loop through remainder of stream looking for termination tag
 	          else {
@@ -1884,9 +1891,7 @@
 	  _createClass(AttributeTag, [{
 	    key: "readBytes",
 	    value: function readBytes(stream) {
-	      var group = stream.readUint16(),
-	          element = stream.readUint16();
-	      return tagFromNumbers(group, element).value;
+	      return Tag.readTag(stream).value;
 	    }
 	  }, {
 	    key: "writeBytes",
@@ -2323,7 +2328,7 @@
 	        /* eslint-disable-next-line no-constant-condition */
 
 	        while (true) {
-	          var tag = readTag(stream),
+	          var tag = Tag.readTag(stream),
 	              length = null;
 	          read += 4;
 
@@ -2394,7 +2399,9 @@
 
 	              read += toRead;
 	              if (undef) stream.increment(8);
-	              var items = DicomMessage.read(itemStream, syntax);
+
+	              var items = DicomMessage._read(itemStream, syntax);
+
 	              elements.push(items);
 	            }
 
@@ -2826,6 +2833,10 @@
 	var IMPLICIT_LITTLE_ENDIAN = "1.2.840.10008.1.2";
 	var EXPLICIT_LITTLE_ENDIAN = "1.2.840.10008.1.2.1";
 
+	function paddingLeft(paddingValue, string) {
+	  return String(paddingValue + string).slice(-paddingValue.length);
+	}
+
 	var Tag = /*#__PURE__*/function () {
 	  function Tag(value) {
 	    _classCallCheck(this, Tag);
@@ -3395,11 +3406,40 @@
 	    value: function read(bufferStream, syntax, ignoreErrors) {
 	      var untilTag = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : null;
 	      var includeUntilTagValue = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : false;
+	      console.warn("DicomMessage.read to be deprecated after dcmjs 0.24.x");
+	      return this._read(bufferStream, syntax, {
+	        ignoreErrors: ignoreErrors,
+	        untilTag: untilTag,
+	        includeUntilTagValue: includeUntilTagValue
+	      });
+	    }
+	  }, {
+	    key: "readTag",
+	    value: function readTag(bufferStream, syntax) {
+	      var untilTag = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : null;
+	      var includeUntilTagValue = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : false;
+	      console.warn("DicomMessage.readTag to be deprecated after dcmjs 0.24.x");
+	      return this._readTag(bufferStream, syntax, {
+	        untilTag: untilTag,
+	        includeUntilTagValue: includeUntilTagValue
+	      });
+	    }
+	  }, {
+	    key: "_read",
+	    value: function _read(bufferStream, syntax) {
+	      var options = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {
+	        ignoreErrors: false,
+	        untilTag: null,
+	        includeUntilTagValue: false
+	      };
+	      var ignoreErrors = options.ignoreErrors,
+	          untilTag = options.untilTag;
 	      var dict = {};
 
 	      try {
 	        while (!bufferStream.end()) {
-	          var readInfo = DicomMessage.readTag(bufferStream, syntax, untilTag, includeUntilTagValue);
+	          var readInfo = DicomMessage._readTag(bufferStream, syntax, options);
+
 	          var cleanTagString = readInfo.tag.toCleanString();
 	          dict[cleanTagString] = {
 	            vr: readInfo.vr.type,
@@ -3441,12 +3481,12 @@
 	      var options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {
 	        ignoreErrors: false,
 	        untilTag: null,
-	        includeUntilTagValue: false
+	        includeUntilTagValue: false,
+	        noCopy: false
 	      };
-	      var ignoreErrors = options.ignoreErrors,
-	          untilTag = options.untilTag,
-	          includeUntilTagValue = options.includeUntilTagValue;
-	      var stream = new ReadBufferStream(buffer),
+	      var stream = new ReadBufferStream(buffer, null, {
+	        noCopy: options.noCopy
+	      }),
 	          useSyntax = EXPLICIT_LITTLE_ENDIAN$1;
 	      stream.reset();
 	      stream.increment(128);
@@ -3455,15 +3495,20 @@
 	        throw new Error("Invalid a dicom file");
 	      }
 
-	      var el = DicomMessage.readTag(stream, useSyntax),
+	      var el = DicomMessage._readTag(stream, useSyntax),
 	          metaLength = el.values[0]; //read header buffer
 
+
 	      var metaStream = stream.more(metaLength);
-	      var metaHeader = DicomMessage.read(metaStream, useSyntax, ignoreErrors); //get the syntax
+
+	      var metaHeader = DicomMessage._read(metaStream, useSyntax, options); //get the syntax
+
 
 	      var mainSyntax = metaHeader["00020010"].Value[0];
 	      mainSyntax = DicomMessage._normalizeSyntax(mainSyntax);
-	      var objects = DicomMessage.read(stream, mainSyntax, ignoreErrors, untilTag, includeUntilTagValue);
+
+	      var objects = DicomMessage._read(stream, mainSyntax, options);
+
 	      var dicomDict = new DicomDict(metaHeader);
 	      dicomDict.dict = objects;
 	      return dicomDict;
@@ -3489,17 +3534,19 @@
 	      return written;
 	    }
 	  }, {
-	    key: "readTag",
-	    value: function readTag(stream, syntax) {
-	      var untilTag = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : null;
-	      var includeUntilTagValue = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : false;
+	    key: "_readTag",
+	    value: function _readTag(stream, syntax) {
+	      var options = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {
+	        untilTag: null,
+	        includeUntilTagValue: false
+	      };
+	      var untilTag = options.untilTag,
+	          includeUntilTagValue = options.includeUntilTagValue;
 	      var implicit = syntax == IMPLICIT_LITTLE_ENDIAN$1 ? true : false,
 	          isLittleEndian = syntax == IMPLICIT_LITTLE_ENDIAN$1 || syntax == EXPLICIT_LITTLE_ENDIAN$1 ? true : false;
 	      var oldEndian = stream.isLittleEndian;
 	      stream.setEndian(isLittleEndian);
-	      var group = stream.readUint16(),
-	          element = stream.readUint16(),
-	          tag = tagFromNumbers(group, element);
+	      var tag = Tag.readTag(stream);
 
 	      if (untilTag === tag.toCleanString() && untilTag !== null) {
 	        if (!includeUntilTagValue) {