dcmjs 0.24.1 → 0.24.4

package/build/dcmjs.es.js

@@ -794,30 +794,6 @@ function _createForOfIteratorHelper(o, allowArrayLike) {
   };
 }
 
-//http://jonisalonen.com/2012/from-utf-16-to-utf-8-in-javascript/
-function toUTF8Array(str) {
-  var utf8 = [];
-
-  for (var i = 0; i < str.length; i++) {
-    var charcode = str.charCodeAt(i);
-    if (charcode < 0x80) utf8.push(charcode);else if (charcode < 0x800) {
-      utf8.push(0xc0 | charcode >> 6, 0x80 | charcode & 0x3f);
-    } else if (charcode < 0xd800 || charcode >= 0xe000) {
-      utf8.push(0xe0 | charcode >> 12, 0x80 | charcode >> 6 & 0x3f, 0x80 | charcode & 0x3f);
-    } // surrogate pair
-    else {
-      i++; // UTF-16 encodes 0x10000-0x10FFFF by
-      // subtracting 0x10000 and splitting the
-      // 20 bits of 0x0-0xFFFFF into two halves
-
-      charcode = 0x10000 + ((charcode & 0x3ff) << 10 | str.charCodeAt(i) & 0x3ff);
-      utf8.push(0xf0 | charcode >> 18, 0x80 | charcode >> 12 & 0x3f, 0x80 | charcode >> 6 & 0x3f, 0x80 | charcode & 0x3f);
-    }
-  }
-
-  return utf8;
-}
-
 function toInt(val) {
   if (isNaN(val)) {
     throw new Error("Not a number: " + val);
@@ -848,6 +824,7 @@ var BufferStream = /*#__PURE__*/function () {
     this.offset = 0;
     this.isLittleEndian = littleEndian || false;
     this.size = 0;
+    this.encoder = new TextEncoder("utf-8");
   }
 
   _createClass(BufferStream, [{
@@ -862,6 +839,18 @@ var BufferStream = /*#__PURE__*/function () {
       this.view.setUint8(this.offset, toInt(value));
       return this.increment(1);
     }
+  }, {
+    key: "writeUint8Repeat",
+    value: function writeUint8Repeat(value, count) {
+      var v = toInt(value);
+      this.checkSize(count);
+
+      for (var i = 0; i < count; i++) {
+        this.view.setUint8(this.offset + i, v);
+      }
+
+      return this.increment(count);
+    }
   }, {
     key: "writeInt8",
     value: function writeInt8(value) {
@@ -922,48 +911,27 @@ var BufferStream = /*#__PURE__*/function () {
       return this.increment(8);
     }
   }, {
-    key: "writeString",
-    value: function writeString(value) {
-      value = value || "";
-      var utf8 = toUTF8Array(value),
-          bytelen = utf8.length;
-      this.checkSize(bytelen);
-      var startOffset = this.offset;
-
-      for (var i = 0; i < bytelen; i++) {
-        this.view.setUint8(startOffset, utf8[i]);
-        startOffset++;
-      }
-
-      return this.increment(bytelen);
+    key: "writeUTF8String",
+    value: function writeUTF8String(value) {
+      var encodedString = this.encoder.encode(value);
+      this.checkSize(encodedString.byteLength);
+      new Uint8Array(this.buffer).set(encodedString, this.offset);
+      return this.increment(encodedString.byteLength);
     }
   }, {
-    key: "writeHex",
-    value: function writeHex(value) {
-      var len = value.length,
-          blen = len / 2,
-          startOffset = this.offset;
-      this.checkSize(blen);
-
-      for (var i = 0; i < len; i += 2) {
-        var code = parseInt(value[i], 16),
-            nextCode;
-
-        if (i == len - 1) {
-          nextCode = null;
-        } else {
-          nextCode = parseInt(value[i + 1], 16);
-        }
-
-        if (nextCode !== null) {
-          code = code << 4 | nextCode;
-        }
+    key: "writeAsciiString",
+    value: function writeAsciiString(value) {
+      value = value || "";
+      var len = value.length;
+      this.checkSize(len);
+      var startOffset = this.offset;
 
-        this.view.setUint8(startOffset, code);
-        startOffset++;
+      for (var i = 0; i < len; i++) {
+        var charcode = value.charCodeAt(i);
+        this.view.setUint8(startOffset + i, charcode);
       }
 
-      return this.increment(blen);
+      return this.increment(len);
     }
   }, {
     key: "readUint32",
@@ -986,6 +954,11 @@ var BufferStream = /*#__PURE__*/function () {
       this.increment(1);
       return val;
     }
+  }, {
+    key: "peekUint8",
+    value: function peekUint8(offset) {
+      return this.view.getUint8(this.offset + offset);
+    }
   }, {
     key: "readUint8Array",
     value: function readUint8Array(length) {
@@ -1036,9 +1009,9 @@ var BufferStream = /*#__PURE__*/function () {
       return val;
     }
   }, {
-    key: "readString",
-    value: function readString(length) {
-      var chars = [];
+    key: "readAsciiString",
+    value: function readAsciiString(length) {
+      var result = "";
       var start = this.offset;
       var end = this.offset + length;
 
@@ -1047,11 +1020,30 @@ var BufferStream = /*#__PURE__*/function () {
       }
 
       for (var i = start; i < end; ++i) {
-        chars.push(String.fromCharCode(this.view.getUint8(i)));
-        this.increment(1);
+        result += String.fromCharCode(this.view.getUint8(i));
+      }
+
+      this.increment(end - start);
+      return result;
+    }
+  }, {
+    key: "readVR",
+    value: function readVR() {
+      var vr = String.fromCharCode(this.view.getUint8(this.offset)) + String.fromCharCode(this.view.getUint8(this.offset + 1));
+      this.increment(2);
+      return vr;
+    }
+  }, {
+    key: "readEncodedString",
+    value: function readEncodedString(length) {
+      if (this.offset + length >= this.buffer.byteLength) {
+        length = this.buffer.byteLength - this.offset;
       }
 
-      return chars.join("");
+      var view = new DataView(this.buffer, this.offset, length);
+      var result = this.decoder.decode(view);
+      this.increment(length);
+      return result;
     }
   }, {
     key: "readHex",
@@ -1176,7 +1168,8 @@ var ReadBufferStream = /*#__PURE__*/function (_BufferStream) {
 
     var options = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {
       start: null,
-      stop: null
+      stop: null,
+      noCopy: false
     };
 
     _classCallCheck(this, ReadBufferStream);
@@ -1184,28 +1177,31 @@ var ReadBufferStream = /*#__PURE__*/function (_BufferStream) {
     _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;
+    _this.decoder = new TextDecoder("latin1");
     return _this;
   }
 
   _createClass(ReadBufferStream, [{
-    key: "readString",
-    value: function readString(length) {
-      var chars = [];
-      var start = this.offset;
-      var end = this.offset + length;
-
-      if (end >= this.endOffset) {
-        end = this.endOffset;
+    key: "setDecoder",
+    value: function setDecoder(decoder) {
+      this.decoder = decoder;
+    }
+  }, {
+    key: "getBuffer",
+    value: function getBuffer(start, end) {
+      if (this.noCopy) {
+        return new Uint8Array(this.buffer, start, end - start);
       }
 
-      for (var i = start; i < end; ++i) {
-        chars.push(String.fromCharCode(this.view.getUint8(i)));
-        this.increment(1);
+      if (!start && !end) {
+        start = 0;
+        end = this.size;
       }
 
-      return chars.join("");
+      return this.buffer.slice(start, end);
     }
   }, {
     key: "reset",
@@ -1228,6 +1224,11 @@ var ReadBufferStream = /*#__PURE__*/function (_BufferStream) {
     value: function writeUint8(value) {
       throw new Error(value, "writeUint8 not implemented");
     }
+  }, {
+    key: "writeUint8Repeat",
+    value: function writeUint8Repeat(value, count) {
+      throw new Error(value, "writeUint8Repeat not implemented");
+    }
   }, {
     key: "writeInt8",
     value: function writeInt8(value) {
@@ -1269,14 +1270,14 @@ var ReadBufferStream = /*#__PURE__*/function (_BufferStream) {
       throw new Error(value, "writeDouble not implemented");
     }
   }, {
-    key: "writeString",
-    value: function writeString(value) {
-      throw new Error(value, "writeString not implemented");
+    key: "writeAsciiString",
+    value: function writeAsciiString(value) {
+      throw new Error(value, "writeAsciiString not implemented");
     }
   }, {
-    key: "writeHex",
-    value: function writeHex(value) {
-      throw new Error(value, "writeHex not implemented");
+    key: "writeUTF8String",
+    value: function writeUTF8String(value) {
+      throw new Error(value, "writeUTF8String not implemented");
     }
   }, {
     key: "checkSize",
@@ -1311,25 +1312,10 @@ var WriteBufferStream = /*#__PURE__*/function (_BufferStream2) {
   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)
@@ -1350,22 +1336,25 @@ var ValueRepresentation = /*#__PURE__*/function () {
 
     this.type = type;
     this.multi = false;
+    this._isBinary = binaryVRs.indexOf(this.type) != -1;
+    this._allowMultiple = !this._isBinary && singleVRs.indexOf(this.type) == -1;
+    this._isExplicit = explicitVRs.indexOf(this.type) != -1;
   }
 
   _createClass(ValueRepresentation, [{
     key: "isBinary",
     value: function isBinary() {
-      return binaryVRs.indexOf(this.type) != -1;
+      return this._isBinary;
     }
   }, {
     key: "allowMultiple",
     value: function allowMultiple() {
-      return !this.isBinary() && singleVRs.indexOf(this.type) == -1;
+      return this._allowMultiple;
     }
   }, {
     key: "isExplicit",
     value: function isExplicit() {
-      return explicitVRs.indexOf(this.type) != -1;
+      return this._isExplicit;
     }
   }, {
     key: "read",
@@ -1380,34 +1369,19 @@ var ValueRepresentation = /*#__PURE__*/function () {
   }, {
     key: "readBytes",
     value: function readBytes(stream, length) {
-      return stream.readString(length);
+      return stream.readAsciiString(length);
     }
   }, {
     key: "readNullPaddedString",
     value: function readNullPaddedString(stream, length) {
       if (!length) return "";
-      var str = stream.readString(length - 1);
-
-      if (stream.readUint8() != 0) {
-        stream.increment(-1);
-        str += stream.readString(1);
-      }
 
-      return str;
-    }
-  }, {
-    key: "writeFilledString",
-    value: function writeFilledString(stream, value, length) {
-      if (length < this.maxLength && length >= 0) {
-        var written = 0;
-        if (length > 0) written += stream.writeString(value);
-        var zeroLength = this.maxLength - length;
-        written += stream.writeHex(this.fillWith.repeat(zeroLength));
-        return written;
-      } else if (length == this.maxLength) {
-        return stream.writeString(value);
+      if (stream.peekUint8(length - 1) !== 0) {
+        return stream.readAsciiString(length);
       } else {
-        throw "Length mismatch";
+        var val = stream.readAsciiString(length - 1);
+        stream.increment(1);
+        return val;
       }
     }
   }, {
@@ -1416,7 +1390,7 @@ var ValueRepresentation = /*#__PURE__*/function () {
       var args = Array.from(arguments);
 
       if (args[2] === null || args[2] === "" || args[2] === undefined) {
-        return [stream.writeString("")];
+        return [stream.writeAsciiString("")];
       } else {
         var written = [],
             valueArgs = args.slice(2),
@@ -1429,7 +1403,7 @@ var ValueRepresentation = /*#__PURE__*/function () {
             var self = this;
             valueArgs[0].forEach(function (v, k) {
               if (self.allowMultiple() && k > 0) {
-                stream.writeHex("5C"); //byteCount++;
+                stream.writeUint8(0x5c);
               }
 
               var singularArgs = [v].concat(valueArgs.slice(1));
@@ -1491,7 +1465,7 @@ var ValueRepresentation = /*#__PURE__*/function () {
       var written = total;
 
       if (total & 1) {
-        stream.writeHex(this.padByte);
+        stream.writeUint8(this.padByte);
         written++;
       }
 
@@ -1500,19 +1474,23 @@ var ValueRepresentation = /*#__PURE__*/function () {
   }], [{
     key: "createByTypeString",
     value: function createByTypeString(type) {
-      var vr = null;
-      if (type == "AE") vr = new ApplicationEntity();else if (type == "AS") vr = new AgeString();else if (type == "AT") vr = new AttributeTag();else if (type == "CS") vr = new CodeString();else if (type == "DA") vr = new DateValue();else if (type == "DS") vr = new DecimalString();else if (type == "DT") vr = new DateTime();else if (type == "FL") vr = new FloatingPointSingle();else if (type == "FD") vr = new FloatingPointDouble();else if (type == "IS") vr = new IntegerString();else if (type == "LO") vr = new LongString();else if (type == "LT") vr = new LongText();else if (type == "OB") vr = new OtherByteString();else if (type == "OD") vr = new OtherDoubleString();else if (type == "OF") vr = new OtherFloatString();else if (type == "OW") vr = new OtherWordString();else if (type == "PN") vr = new PersonName();else if (type == "SH") vr = new ShortString();else if (type == "SL") vr = new SignedLong();else if (type == "SQ") vr = new SequenceOfItems();else if (type == "SS") vr = new SignedShort();else if (type == "ST") vr = new ShortText();else if (type == "TM") vr = new TimeValue();else if (type == "UC") vr = new UnlimitedCharacters();else if (type == "UI") vr = new UniqueIdentifier();else if (type == "UL") vr = new UnsignedLong();else if (type == "UN") vr = new UnknownValue();else if (type == "UR") vr = new UniversalResource();else if (type == "US") vr = new UnsignedShort();else if (type == "UT") vr = new UnlimitedText();else if (type == "ox") {
-        // TODO: determine VR based on context (could be 1 byte pixel data)
-        // https://github.com/dgobbi/vtk-dicom/issues/38
-        log.error("Invalid vr type " + type + " - using OW");
-        vr = new OtherWordString();
-      } else if (type == "xs") {
-        log.error("Invalid vr type " + type + " - using US");
-        vr = new UnsignedShort();
-      } else {
-        log.error("Invalid vr type " + type + " - using UN");
-        vr = new UnknownValue();
+      var vr = VRinstances[type];
+
+      if (vr === undefined) {
+        if (type == "ox") {
+          // TODO: determine VR based on context (could be 1 byte pixel data)
+          // https://github.com/dgobbi/vtk-dicom/issues/38
+          log.error("Invalid vr type " + type + " - using OW");
+          vr = VRinstances["OW"];
+        } else if (type == "xs") {
+          log.error("Invalid vr type " + type + " - using US");
+          vr = VRinstances["US"];
+        } else {
+          log.error("Invalid vr type " + type + " - using UN");
+          vr = VRinstances["UN"];
+        }
       }
+
       return vr;
     }
   }]);
@@ -1520,46 +1498,71 @@ var ValueRepresentation = /*#__PURE__*/function () {
   return ValueRepresentation;
 }();
 
-var StringRepresentation = /*#__PURE__*/function (_ValueRepresentation) {
-  _inherits(StringRepresentation, _ValueRepresentation);
+var AsciiStringRepresentation = /*#__PURE__*/function (_ValueRepresentation) {
+  _inherits(AsciiStringRepresentation, _ValueRepresentation);
 
-  var _super = _createSuper(StringRepresentation);
+  var _super = _createSuper(AsciiStringRepresentation);
 
-  function StringRepresentation(type) {
-    _classCallCheck(this, StringRepresentation);
+  function AsciiStringRepresentation(type) {
+    _classCallCheck(this, AsciiStringRepresentation);
 
     return _super.call(this, type);
   }
 
-  _createClass(StringRepresentation, [{
+  _createClass(AsciiStringRepresentation, [{
     key: "readBytes",
     value: function readBytes(stream, length) {
-      return stream.readString(length);
+      return stream.readAsciiString(length);
     }
   }, {
     key: "writeBytes",
     value: function writeBytes(stream, value, writeOptions) {
-      // TODO will delete
-      if (!writeOptions) throw new Error("writeOptions is undefined");
+      var written = _get(_getPrototypeOf(AsciiStringRepresentation.prototype), "write", this).call(this, stream, "AsciiString", value);
+
+      return _get(_getPrototypeOf(AsciiStringRepresentation.prototype), "writeBytes", this).call(this, stream, value, written, writeOptions);
+    }
+  }]);
+
+  return AsciiStringRepresentation;
+}(ValueRepresentation);
 
-      var written = _get(_getPrototypeOf(StringRepresentation.prototype), "write", this).call(this, stream, "String", value);
+var EncodedStringRepresentation = /*#__PURE__*/function (_ValueRepresentation2) {
+  _inherits(EncodedStringRepresentation, _ValueRepresentation2);
 
-      return _get(_getPrototypeOf(StringRepresentation.prototype), "writeBytes", this).call(this, stream, value, written, writeOptions);
+  var _super2 = _createSuper(EncodedStringRepresentation);
+
+  function EncodedStringRepresentation(type) {
+    _classCallCheck(this, EncodedStringRepresentation);
+
+    return _super2.call(this, type);
+  }
+
+  _createClass(EncodedStringRepresentation, [{
+    key: "readBytes",
+    value: function readBytes(stream, length) {
+      return stream.readEncodedString(length);
+    }
+  }, {
+    key: "writeBytes",
+    value: function writeBytes(stream, value, writeOptions) {
+      var written = _get(_getPrototypeOf(EncodedStringRepresentation.prototype), "write", this).call(this, stream, "UTF8String", value);
+
+      return _get(_getPrototypeOf(EncodedStringRepresentation.prototype), "writeBytes", this).call(this, stream, value, written, writeOptions);
     }
   }]);
 
-  return StringRepresentation;
+  return EncodedStringRepresentation;
 }(ValueRepresentation);
 
-var BinaryRepresentation = /*#__PURE__*/function (_ValueRepresentation2) {
-  _inherits(BinaryRepresentation, _ValueRepresentation2);
+var BinaryRepresentation = /*#__PURE__*/function (_ValueRepresentation3) {
+  _inherits(BinaryRepresentation, _ValueRepresentation3);
 
-  var _super2 = _createSuper(BinaryRepresentation);
+  var _super3 = _createSuper(BinaryRepresentation);
 
   function BinaryRepresentation(type) {
     _classCallCheck(this, BinaryRepresentation);
 
-    return _super2.call(this, type);
+    return _super3.call(this, type);
   }
 
   _createClass(BinaryRepresentation, [{
@@ -1638,7 +1641,7 @@ var BinaryRepresentation = /*#__PURE__*/function (_ValueRepresentation2) {
         var written = 8 + binaryStream.size + startOffset.length * 4 + 8;
 
         if (written & 1) {
-          stream.writeHex(this.padByte);
+          stream.writeUint8(this.padByte);
           written++;
         }
 
@@ -1716,7 +1719,8 @@ var BinaryRepresentation = /*#__PURE__*/function (_ValueRepresentation2) {
 
               var rangeStream = new ReadBufferStream(stream.buffer, stream.isLittleEndian, {
                 start: start,
-                stop: stop
+                stop: stop,
+                noCopy: stream.noCopy
               });
               var frameSize = 0;
 
@@ -1736,16 +1740,21 @@ var BinaryRepresentation = /*#__PURE__*/function (_ValueRepresentation2) {
 
               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 {
@@ -1782,95 +1791,93 @@ var BinaryRepresentation = /*#__PURE__*/function (_ValueRepresentation2) {
   return BinaryRepresentation;
 }(ValueRepresentation);
 
-var ApplicationEntity = /*#__PURE__*/function (_StringRepresentation) {
-  _inherits(ApplicationEntity, _StringRepresentation);
+var ApplicationEntity = /*#__PURE__*/function (_AsciiStringRepresent) {
+  _inherits(ApplicationEntity, _AsciiStringRepresent);
 
-  var _super3 = _createSuper(ApplicationEntity);
+  var _super4 = _createSuper(ApplicationEntity);
 
   function ApplicationEntity() {
     var _this;
 
     _classCallCheck(this, ApplicationEntity);
 
-    _this = _super3.call(this, "AE");
+    _this = _super4.call(this, "AE");
     _this.maxLength = 16;
-    _this.padByte = "20";
-    _this.fillWith = "20";
+    _this.padByte = 0x20;
     return _this;
   }
 
   _createClass(ApplicationEntity, [{
     key: "readBytes",
     value: function readBytes(stream, length) {
-      return stream.readString(length).trim();
+      return stream.readAsciiString(length).trim();
     }
   }]);
 
   return ApplicationEntity;
-}(StringRepresentation);
+}(AsciiStringRepresentation);
 
-var CodeString = /*#__PURE__*/function (_StringRepresentation2) {
-  _inherits(CodeString, _StringRepresentation2);
+var CodeString = /*#__PURE__*/function (_AsciiStringRepresent2) {
+  _inherits(CodeString, _AsciiStringRepresent2);
 
-  var _super4 = _createSuper(CodeString);
+  var _super5 = _createSuper(CodeString);
 
   function CodeString() {
     var _this2;
 
     _classCallCheck(this, CodeString);
 
-    _this2 = _super4.call(this, "CS");
+    _this2 = _super5.call(this, "CS");
     _this2.maxLength = 16;
-    _this2.padByte = "20";
+    _this2.padByte = 0x20;
     return _this2;
   }
 
   _createClass(CodeString, [{
     key: "readBytes",
     value: function readBytes(stream, length) {
-      //return this.readNullPaddedString(stream, length).trim();
-      return stream.readString(length).trim();
+      return stream.readAsciiString(length).trim();
     }
   }]);
 
   return CodeString;
-}(StringRepresentation);
+}(AsciiStringRepresentation);
 
-var AgeString = /*#__PURE__*/function (_StringRepresentation3) {
-  _inherits(AgeString, _StringRepresentation3);
+var AgeString = /*#__PURE__*/function (_AsciiStringRepresent3) {
+  _inherits(AgeString, _AsciiStringRepresent3);
 
-  var _super5 = _createSuper(AgeString);
+  var _super6 = _createSuper(AgeString);
 
   function AgeString() {
     var _this3;
 
     _classCallCheck(this, AgeString);
 
-    _this3 = _super5.call(this, "AS");
+    _this3 = _super6.call(this, "AS");
     _this3.maxLength = 4;
-    _this3.padByte = "20";
+    _this3.padByte = 0x20;
     _this3.fixed = true;
     _this3.defaultValue = "";
     return _this3;
   }
 
   return _createClass(AgeString);
-}(StringRepresentation);
+}(AsciiStringRepresentation);
 
-var AttributeTag = /*#__PURE__*/function (_ValueRepresentation3) {
-  _inherits(AttributeTag, _ValueRepresentation3);
+var AttributeTag = /*#__PURE__*/function (_ValueRepresentation4) {
+  _inherits(AttributeTag, _ValueRepresentation4);
 
-  var _super6 = _createSuper(AttributeTag);
+  var _super7 = _createSuper(AttributeTag);
 
   function AttributeTag() {
     var _this4;
 
     _classCallCheck(this, AttributeTag);
 
-    _this4 = _super6.call(this, "AT");
+    _this4 = _super7.call(this, "AT");
     _this4.maxLength = 4;
     _this4.valueLength = 4;
-    _this4.padByte = "00";
+    _this4.padByte = 0;
     _this4.fixed = true;
     return _this4;
   }
@@ -1878,9 +1885,7 @@ var AttributeTag = /*#__PURE__*/function (_ValueRepresentation3) {
   _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",
@@ -1892,49 +1897,48 @@ var AttributeTag = /*#__PURE__*/function (_ValueRepresentation3) {
   return AttributeTag;
 }(ValueRepresentation);
 
-var DateValue = /*#__PURE__*/function (_StringRepresentation4) {
-  _inherits(DateValue, _StringRepresentation4);
+var DateValue = /*#__PURE__*/function (_AsciiStringRepresent4) {
+  _inherits(DateValue, _AsciiStringRepresent4);
 
-  var _super7 = _createSuper(DateValue);
+  var _super8 = _createSuper(DateValue);
 
   function DateValue(value) {
     var _this5;
 
     _classCallCheck(this, DateValue);
 
-    _this5 = _super7.call(this, "DA", value);
+    _this5 = _super8.call(this, "DA", value);
     _this5.maxLength = 18;
-    _this5.padByte = "20"; //this.fixed = true;
+    _this5.padByte = 0x20; //this.fixed = true;
 
     _this5.defaultValue = "";
     return _this5;
   }
 
   return _createClass(DateValue);
-}(StringRepresentation);
+}(AsciiStringRepresentation);
 
-var DecimalString = /*#__PURE__*/function (_StringRepresentation5) {
-  _inherits(DecimalString, _StringRepresentation5);
+var DecimalString = /*#__PURE__*/function (_AsciiStringRepresent5) {
+  _inherits(DecimalString, _AsciiStringRepresent5);
 
-  var _super8 = _createSuper(DecimalString);
+  var _super9 = _createSuper(DecimalString);
 
   function DecimalString() {
     var _this6;
 
     _classCallCheck(this, DecimalString);
 
-    _this6 = _super8.call(this, "DS");
+    _this6 = _super9.call(this, "DS");
     _this6.maxLength = 16;
-    _this6.padByte = "20";
+    _this6.padByte = 0x20;
     return _this6;
   }
 
   _createClass(DecimalString, [{
     key: "readBytes",
     value: function readBytes(stream, length) {
-      var BACKSLASH = String.fromCharCode(0x5c); //return this.readNullPaddedString(stream, length).trim();
-
-      var ds = stream.readString(length);
+      var BACKSLASH = String.fromCharCode(0x5c);
+      var ds = stream.readAsciiString(length);
       ds = ds.replace(/[^0-9.\\\-+e]/gi, "");
 
       if (ds.indexOf(BACKSLASH) !== -1) {
@@ -1977,40 +1981,40 @@ var DecimalString = /*#__PURE__*/function (_StringRepresentation5) {
   }]);
 
   return DecimalString;
-}(StringRepresentation);
+}(AsciiStringRepresentation);
 
-var DateTime = /*#__PURE__*/function (_StringRepresentation6) {
-  _inherits(DateTime, _StringRepresentation6);
+var DateTime = /*#__PURE__*/function (_AsciiStringRepresent6) {
+  _inherits(DateTime, _AsciiStringRepresent6);
 
-  var _super9 = _createSuper(DateTime);
+  var _super10 = _createSuper(DateTime);
 
   function DateTime() {
     var _this8;
 
     _classCallCheck(this, DateTime);
 
-    _this8 = _super9.call(this, "DT");
+    _this8 = _super10.call(this, "DT");
     _this8.maxLength = 26;
-    _this8.padByte = "20";
+    _this8.padByte = 0x20;
     return _this8;
   }
 
   return _createClass(DateTime);
-}(StringRepresentation);
+}(AsciiStringRepresentation);
 
-var FloatingPointSingle = /*#__PURE__*/function (_ValueRepresentation4) {
-  _inherits(FloatingPointSingle, _ValueRepresentation4);
+var FloatingPointSingle = /*#__PURE__*/function (_ValueRepresentation5) {
+  _inherits(FloatingPointSingle, _ValueRepresentation5);
 
-  var _super10 = _createSuper(FloatingPointSingle);
+  var _super11 = _createSuper(FloatingPointSingle);
 
   function FloatingPointSingle() {
     var _this9;
 
     _classCallCheck(this, FloatingPointSingle);
 
-    _this9 = _super10.call(this, "FL");
+    _this9 = _super11.call(this, "FL");
     _this9.maxLength = 4;
-    _this9.padByte = "00";
+    _this9.padByte = 0;
     _this9.fixed = true;
     _this9.defaultValue = 0.0;
     return _this9;
@@ -2031,19 +2035,19 @@ var FloatingPointSingle = /*#__PURE__*/function (_ValueRepresentation4) {
   return FloatingPointSingle;
 }(ValueRepresentation);
 
-var FloatingPointDouble = /*#__PURE__*/function (_ValueRepresentation5) {
-  _inherits(FloatingPointDouble, _ValueRepresentation5);
+var FloatingPointDouble = /*#__PURE__*/function (_ValueRepresentation6) {
+  _inherits(FloatingPointDouble, _ValueRepresentation6);
 
-  var _super11 = _createSuper(FloatingPointDouble);
+  var _super12 = _createSuper(FloatingPointDouble);
 
   function FloatingPointDouble() {
     var _this10;
 
     _classCallCheck(this, FloatingPointDouble);
 
-    _this10 = _super11.call(this, "FD");
+    _this10 = _super12.call(this, "FD");
     _this10.maxLength = 8;
-    _this10.padByte = "00";
+    _this10.padByte = 0;
     _this10.fixed = true;
     _this10.defaultValue = 0.0;
     return _this10;
@@ -2064,19 +2068,19 @@ var FloatingPointDouble = /*#__PURE__*/function (_ValueRepresentation5) {
   return FloatingPointDouble;
 }(ValueRepresentation);
 
-var IntegerString = /*#__PURE__*/function (_StringRepresentation7) {
-  _inherits(IntegerString, _StringRepresentation7);
+var IntegerString = /*#__PURE__*/function (_AsciiStringRepresent7) {
+  _inherits(IntegerString, _AsciiStringRepresent7);
 
-  var _super12 = _createSuper(IntegerString);
+  var _super13 = _createSuper(IntegerString);
 
   function IntegerString() {
     var _this11;
 
     _classCallCheck(this, IntegerString);
 
-    _this11 = _super12.call(this, "IS");
+    _this11 = _super13.call(this, "IS");
     _this11.maxLength = 12;
-    _this11.padByte = "20";
+    _this11.padByte = 0x20;
     return _this11;
   }
 
@@ -2084,7 +2088,7 @@ var IntegerString = /*#__PURE__*/function (_StringRepresentation7) {
     key: "readBytes",
     value: function readBytes(stream, length) {
       var BACKSLASH = String.fromCharCode(0x5c);
-      var is = stream.readString(length).trim();
+      var is = stream.readAsciiString(length).trim();
       is = is.replace(/[^0-9.\\\-+e]/gi, "");
 
       if (is.indexOf(BACKSLASH) !== -1) {
@@ -2117,75 +2121,73 @@ var IntegerString = /*#__PURE__*/function (_StringRepresentation7) {
   }]);
 
   return IntegerString;
-}(StringRepresentation);
+}(AsciiStringRepresentation);
 
-var LongString = /*#__PURE__*/function (_StringRepresentation8) {
-  _inherits(LongString, _StringRepresentation8);
+var LongString = /*#__PURE__*/function (_EncodedStringReprese) {
+  _inherits(LongString, _EncodedStringReprese);
 
-  var _super13 = _createSuper(LongString);
+  var _super14 = _createSuper(LongString);
 
   function LongString() {
     var _this13;
 
     _classCallCheck(this, LongString);
 
-    _this13 = _super13.call(this, "LO");
+    _this13 = _super14.call(this, "LO");
     _this13.maxCharLength = 64;
-    _this13.padByte = "20";
+    _this13.padByte = 0x20;
     return _this13;
   }
 
   _createClass(LongString, [{
     key: "readBytes",
     value: function readBytes(stream, length) {
-      //return this.readNullPaddedString(stream, length).trim();
-      return stream.readString(length).trim();
+      return stream.readEncodedString(length).trim();
     }
   }]);
 
   return LongString;
-}(StringRepresentation);
+}(EncodedStringRepresentation);
 
-var LongText = /*#__PURE__*/function (_StringRepresentation9) {
-  _inherits(LongText, _StringRepresentation9);
+var LongText = /*#__PURE__*/function (_EncodedStringReprese2) {
+  _inherits(LongText, _EncodedStringReprese2);
 
-  var _super14 = _createSuper(LongText);
+  var _super15 = _createSuper(LongText);
 
   function LongText() {
     var _this14;
 
     _classCallCheck(this, LongText);
 
-    _this14 = _super14.call(this, "LT");
+    _this14 = _super15.call(this, "LT");
     _this14.maxCharLength = 10240;
-    _this14.padByte = "20";
+    _this14.padByte = 0x20;
     return _this14;
   }
 
   _createClass(LongText, [{
     key: "readBytes",
     value: function readBytes(stream, length) {
-      //return rtrim(this.readNullPaddedString(stream, length));
-      return rtrim(stream.readString(length));
+      return rtrim(stream.readEncodedString(length));
     }
   }]);
 
   return LongText;
-}(StringRepresentation);
+}(EncodedStringRepresentation);
 
-var PersonName = /*#__PURE__*/function (_StringRepresentation10) {
-  _inherits(PersonName, _StringRepresentation10);
+var PersonName = /*#__PURE__*/function (_EncodedStringReprese3) {
+  _inherits(PersonName, _EncodedStringReprese3);
 
-  var _super15 = _createSuper(PersonName);
+  var _super16 = _createSuper(PersonName);
 
   function PersonName() {
     var _this15;
 
     _classCallCheck(this, PersonName);
 
-    _this15 = _super15.call(this, "PN");
+    _this15 = _super16.call(this, "PN");
     _this15.maxLength = null;
-    _this15.padByte = "20";
+    _this15.padByte = 0x20;
     return _this15;
   }
 
@@ -2220,54 +2222,52 @@ var PersonName = /*#__PURE__*/function (_StringRepresentation10) {
   }, {
     key: "readBytes",
     value: function readBytes(stream, length) {
-      //return rtrim(this.readNullPaddedString(stream, length));
-      return rtrim(stream.readString(length));
+      return rtrim(stream.readEncodedString(length));
     }
   }]);
 
   return PersonName;
-}(StringRepresentation);
+}(EncodedStringRepresentation);
 
-var ShortString = /*#__PURE__*/function (_StringRepresentation11) {
-  _inherits(ShortString, _StringRepresentation11);
+var ShortString = /*#__PURE__*/function (_EncodedStringReprese4) {
+  _inherits(ShortString, _EncodedStringReprese4);
 
-  var _super16 = _createSuper(ShortString);
+  var _super17 = _createSuper(ShortString);
 
   function ShortString() {
     var _this16;
 
     _classCallCheck(this, ShortString);
 
-    _this16 = _super16.call(this, "SH");
+    _this16 = _super17.call(this, "SH");
     _this16.maxCharLength = 16;
-    _this16.padByte = "20";
+    _this16.padByte = 0x20;
     return _this16;
   }
 
   _createClass(ShortString, [{
     key: "readBytes",
     value: function readBytes(stream, length) {
-      //return this.readNullPaddedString(stream, length).trim();
-      return stream.readString(length).trim();
+      return stream.readEncodedString(length).trim();
     }
   }]);
 
   return ShortString;
-}(StringRepresentation);
+}(EncodedStringRepresentation);
 
-var SignedLong = /*#__PURE__*/function (_ValueRepresentation6) {
-  _inherits(SignedLong, _ValueRepresentation6);
+var SignedLong = /*#__PURE__*/function (_ValueRepresentation7) {
+  _inherits(SignedLong, _ValueRepresentation7);
 
-  var _super17 = _createSuper(SignedLong);
+  var _super18 = _createSuper(SignedLong);
 
   function SignedLong() {
     var _this17;
 
     _classCallCheck(this, SignedLong);
 
-    _this17 = _super17.call(this, "SL");
+    _this17 = _super18.call(this, "SL");
     _this17.maxLength = 4;
-    _this17.padByte = "00";
+    _this17.padByte = 0;
     _this17.fixed = true;
     _this17.defaultValue = 0;
     return _this17;
@@ -2288,19 +2288,19 @@ var SignedLong = /*#__PURE__*/function (_ValueRepresentation6) {
   return SignedLong;
 }(ValueRepresentation);
 
-var SequenceOfItems = /*#__PURE__*/function (_ValueRepresentation7) {
-  _inherits(SequenceOfItems, _ValueRepresentation7);
+var SequenceOfItems = /*#__PURE__*/function (_ValueRepresentation8) {
+  _inherits(SequenceOfItems, _ValueRepresentation8);
 
-  var _super18 = _createSuper(SequenceOfItems);
+  var _super19 = _createSuper(SequenceOfItems);
 
   function SequenceOfItems() {
     var _this18;
 
     _classCallCheck(this, SequenceOfItems);
 
-    _this18 = _super18.call(this, "SQ");
+    _this18 = _super19.call(this, "SQ");
     _this18.maxLength = null;
-    _this18.padByte = "00";
+    _this18.padByte = 0;
     _this18.noMultiple = true;
     return _this18;
   }
@@ -2317,7 +2317,7 @@ var SequenceOfItems = /*#__PURE__*/function (_ValueRepresentation7) {
         /* eslint-disable-next-line no-constant-condition */
 
         while (true) {
-          var tag = readTag(stream),
+          var tag = Tag.readTag(stream),
               length = null;
           read += 4;
 
@@ -2388,7 +2388,9 @@ var SequenceOfItems = /*#__PURE__*/function (_ValueRepresentation7) {
 
               read += toRead;
               if (undef) stream.increment(8);
-              var items = DicomMessage.read(itemStream, syntax);
+
+              var items = DicomMessage._read(itemStream, syntax);
+
               elements.push(items);
             }
 
@@ -2442,20 +2444,20 @@ var SequenceOfItems = /*#__PURE__*/function (_ValueRepresentation7) {
   return SequenceOfItems;
 }(ValueRepresentation);
 
-var SignedShort = /*#__PURE__*/function (_ValueRepresentation8) {
-  _inherits(SignedShort, _ValueRepresentation8);
+var SignedShort = /*#__PURE__*/function (_ValueRepresentation9) {
+  _inherits(SignedShort, _ValueRepresentation9);
 
-  var _super19 = _createSuper(SignedShort);
+  var _super20 = _createSuper(SignedShort);
 
   function SignedShort() {
     var _this19;
 
     _classCallCheck(this, SignedShort);
 
-    _this19 = _super19.call(this, "SS");
+    _this19 = _super20.call(this, "SS");
     _this19.maxLength = 2;
     _this19.valueLength = 2;
-    _this19.padByte = "00";
+    _this19.padByte = 0;
     _this19.fixed = true;
     _this19.defaultValue = 0;
     return _this19;
@@ -2476,126 +2478,124 @@ var SignedShort = /*#__PURE__*/function (_ValueRepresentation8) {
   return SignedShort;
 }(ValueRepresentation);
 
-var ShortText = /*#__PURE__*/function (_StringRepresentation12) {
-  _inherits(ShortText, _StringRepresentation12);
+var ShortText = /*#__PURE__*/function (_EncodedStringReprese5) {
+  _inherits(ShortText, _EncodedStringReprese5);
 
-  var _super20 = _createSuper(ShortText);
+  var _super21 = _createSuper(ShortText);
 
   function ShortText() {
     var _this20;
 
     _classCallCheck(this, ShortText);
 
-    _this20 = _super20.call(this, "ST");
+    _this20 = _super21.call(this, "ST");
     _this20.maxCharLength = 1024;
-    _this20.padByte = "20";
+    _this20.padByte = 0x20;
     return _this20;
   }
 
   _createClass(ShortText, [{
     key: "readBytes",
     value: function readBytes(stream, length) {
-      //return rtrim(this.readNullPaddedString(stream, length));
-      return rtrim(stream.readString(length));
+      return rtrim(stream.readEncodedString(length));
     }
   }]);
 
   return ShortText;
-}(StringRepresentation);
+}(EncodedStringRepresentation);
 
-var TimeValue = /*#__PURE__*/function (_StringRepresentation13) {
-  _inherits(TimeValue, _StringRepresentation13);
+var TimeValue = /*#__PURE__*/function (_AsciiStringRepresent8) {
+  _inherits(TimeValue, _AsciiStringRepresent8);
 
-  var _super21 = _createSuper(TimeValue);
+  var _super22 = _createSuper(TimeValue);
 
   function TimeValue() {
     var _this21;
 
     _classCallCheck(this, TimeValue);
 
-    _this21 = _super21.call(this, "TM");
+    _this21 = _super22.call(this, "TM");
     _this21.maxLength = 14;
-    _this21.padByte = "20";
+    _this21.padByte = 0x20;
     return _this21;
   }
 
   _createClass(TimeValue, [{
     key: "readBytes",
     value: function readBytes(stream, length) {
-      return rtrim(stream.readString(length));
+      return rtrim(stream.readAsciiString(length));
     }
   }]);
 
   return TimeValue;
-}(StringRepresentation);
+}(AsciiStringRepresentation);
 
-var UnlimitedCharacters = /*#__PURE__*/function (_StringRepresentation14) {
-  _inherits(UnlimitedCharacters, _StringRepresentation14);
+var UnlimitedCharacters = /*#__PURE__*/function (_EncodedStringReprese6) {
+  _inherits(UnlimitedCharacters, _EncodedStringReprese6);
 
-  var _super22 = _createSuper(UnlimitedCharacters);
+  var _super23 = _createSuper(UnlimitedCharacters);
 
   function UnlimitedCharacters() {
     var _this22;
 
     _classCallCheck(this, UnlimitedCharacters);
 
-    _this22 = _super22.call(this, "UC");
+    _this22 = _super23.call(this, "UC");
     _this22.maxLength = null;
     _this22.multi = true;
-    _this22.padByte = "20";
+    _this22.padByte = 0x20;
     return _this22;
   }
 
   _createClass(UnlimitedCharacters, [{
     key: "readBytes",
     value: function readBytes(stream, length) {
-      return rtrim(stream.readString(length));
+      return rtrim(stream.readEncodedString(length));
     }
   }]);
 
   return UnlimitedCharacters;
-}(StringRepresentation);
+}(EncodedStringRepresentation);
 
-var UnlimitedText = /*#__PURE__*/function (_StringRepresentation15) {
-  _inherits(UnlimitedText, _StringRepresentation15);
+var UnlimitedText = /*#__PURE__*/function (_EncodedStringReprese7) {
+  _inherits(UnlimitedText, _EncodedStringReprese7);
 
-  var _super23 = _createSuper(UnlimitedText);
+  var _super24 = _createSuper(UnlimitedText);
 
   function UnlimitedText() {
     var _this23;
 
     _classCallCheck(this, UnlimitedText);
 
-    _this23 = _super23.call(this, "UT");
+    _this23 = _super24.call(this, "UT");
     _this23.maxLength = null;
-    _this23.padByte = "20";
+    _this23.padByte = 0x20;
     return _this23;
   }
 
   _createClass(UnlimitedText, [{
     key: "readBytes",
     value: function readBytes(stream, length) {
-      //return this.readNullPaddedString(stream, length);
-      return rtrim(stream.readString(length));
+      return rtrim(stream.readEncodedString(length));
     }
   }]);
 
   return UnlimitedText;
-}(StringRepresentation);
+}(EncodedStringRepresentation);
 
-var UnsignedShort = /*#__PURE__*/function (_ValueRepresentation9) {
-  _inherits(UnsignedShort, _ValueRepresentation9);
+var UnsignedShort = /*#__PURE__*/function (_ValueRepresentation10) {
+  _inherits(UnsignedShort, _ValueRepresentation10);
 
-  var _super24 = _createSuper(UnsignedShort);
+  var _super25 = _createSuper(UnsignedShort);
 
   function UnsignedShort() {
     var _this24;
 
     _classCallCheck(this, UnsignedShort);
 
-    _this24 = _super24.call(this, "US");
+    _this24 = _super25.call(this, "US");
     _this24.maxLength = 2;
-    _this24.padByte = "00";
+    _this24.padByte = 0;
     _this24.fixed = true;
     _this24.defaultValue = 0;
     return _this24;
@@ -2616,19 +2616,19 @@ var UnsignedShort = /*#__PURE__*/function (_ValueRepresentation9) {
   return UnsignedShort;
 }(ValueRepresentation);
 
-var UnsignedLong = /*#__PURE__*/function (_ValueRepresentation10) {
-  _inherits(UnsignedLong, _ValueRepresentation10);
+var UnsignedLong = /*#__PURE__*/function (_ValueRepresentation11) {
+  _inherits(UnsignedLong, _ValueRepresentation11);
 
-  var _super25 = _createSuper(UnsignedLong);
+  var _super26 = _createSuper(UnsignedLong);
 
   function UnsignedLong() {
     var _this25;
 
     _classCallCheck(this, UnsignedLong);
 
-    _this25 = _super25.call(this, "UL");
+    _this25 = _super26.call(this, "UL");
     _this25.maxLength = 4;
-    _this25.padByte = "00";
+    _this25.padByte = 0;
     _this25.fixed = true;
     _this25.defaultValue = 0;
     return _this25;
@@ -2649,19 +2649,19 @@ var UnsignedLong = /*#__PURE__*/function (_ValueRepresentation10) {
   return UnsignedLong;
 }(ValueRepresentation);
 
-var UniqueIdentifier = /*#__PURE__*/function (_StringRepresentation16) {
-  _inherits(UniqueIdentifier, _StringRepresentation16);
+var UniqueIdentifier = /*#__PURE__*/function (_AsciiStringRepresent9) {
+  _inherits(UniqueIdentifier, _AsciiStringRepresent9);
 
-  var _super26 = _createSuper(UniqueIdentifier);
+  var _super27 = _createSuper(UniqueIdentifier);
 
   function UniqueIdentifier() {
     var _this26;
 
     _classCallCheck(this, UniqueIdentifier);
 
-    _this26 = _super26.call(this, "UI");
+    _this26 = _super27.call(this, "UI");
     _this26.maxLength = 64;
-    _this26.padByte = "00";
+    _this26.padByte = 0;
     return _this26;
   }
 
@@ -2689,47 +2689,47 @@ var UniqueIdentifier = /*#__PURE__*/function (_StringRepresentation16) {
   }]);
 
   return UniqueIdentifier;
-}(StringRepresentation);
+}(AsciiStringRepresentation);
 
-var UniversalResource = /*#__PURE__*/function (_StringRepresentation17) {
-  _inherits(UniversalResource, _StringRepresentation17);
+var UniversalResource = /*#__PURE__*/function (_AsciiStringRepresent10) {
+  _inherits(UniversalResource, _AsciiStringRepresent10);
 
-  var _super27 = _createSuper(UniversalResource);
+  var _super28 = _createSuper(UniversalResource);
 
   function UniversalResource() {
     var _this27;
 
     _classCallCheck(this, UniversalResource);
 
-    _this27 = _super27.call(this, "UR");
+    _this27 = _super28.call(this, "UR");
     _this27.maxLength = null;
-    _this27.padByte = "20";
+    _this27.padByte = 0x20;
     return _this27;
   }
 
   _createClass(UniversalResource, [{
     key: "readBytes",
     value: function readBytes(stream, length) {
-      return stream.readString(length);
+      return stream.readAsciiString(length);
     }
   }]);
 
   return UniversalResource;
-}(StringRepresentation);
+}(AsciiStringRepresentation);
 
 var UnknownValue = /*#__PURE__*/function (_BinaryRepresentation) {
   _inherits(UnknownValue, _BinaryRepresentation);
 
-  var _super28 = _createSuper(UnknownValue);
+  var _super29 = _createSuper(UnknownValue);
 
   function UnknownValue() {
     var _this28;
 
     _classCallCheck(this, UnknownValue);
 
-    _this28 = _super28.call(this, "UN");
+    _this28 = _super29.call(this, "UN");
     _this28.maxLength = null;
-    _this28.padByte = "00";
+    _this28.padByte = 0;
     _this28.noMultiple = true;
     return _this28;
   }
@@ -2740,16 +2740,16 @@ var UnknownValue = /*#__PURE__*/function (_BinaryRepresentation) {
 var OtherWordString = /*#__PURE__*/function (_BinaryRepresentation2) {
   _inherits(OtherWordString, _BinaryRepresentation2);
 
-  var _super29 = _createSuper(OtherWordString);
+  var _super30 = _createSuper(OtherWordString);
 
   function OtherWordString() {
     var _this29;
 
     _classCallCheck(this, OtherWordString);
 
-    _this29 = _super29.call(this, "OW");
+    _this29 = _super30.call(this, "OW");
     _this29.maxLength = null;
-    _this29.padByte = "00";
+    _this29.padByte = 0;
     _this29.noMultiple = true;
     return _this29;
   }
@@ -2760,16 +2760,16 @@ var OtherWordString = /*#__PURE__*/function (_BinaryRepresentation2) {
 var OtherByteString = /*#__PURE__*/function (_BinaryRepresentation3) {
   _inherits(OtherByteString, _BinaryRepresentation3);
 
-  var _super30 = _createSuper(OtherByteString);
+  var _super31 = _createSuper(OtherByteString);
 
   function OtherByteString() {
     var _this30;
 
     _classCallCheck(this, OtherByteString);
 
-    _this30 = _super30.call(this, "OB");
+    _this30 = _super31.call(this, "OB");
     _this30.maxLength = null;
-    _this30.padByte = "00";
+    _this30.padByte = 0;
     _this30.noMultiple = true;
     return _this30;
   }
@@ -2780,16 +2780,16 @@ var OtherByteString = /*#__PURE__*/function (_BinaryRepresentation3) {
 var OtherDoubleString = /*#__PURE__*/function (_BinaryRepresentation4) {
   _inherits(OtherDoubleString, _BinaryRepresentation4);
 
-  var _super31 = _createSuper(OtherDoubleString);
+  var _super32 = _createSuper(OtherDoubleString);
 
   function OtherDoubleString() {
     var _this31;
 
     _classCallCheck(this, OtherDoubleString);
 
-    _this31 = _super31.call(this, "OD");
+    _this31 = _super32.call(this, "OD");
     _this31.maxLength = null;
-    _this31.padByte = "00";
+    _this31.padByte = 0;
     _this31.noMultiple = true;
     return _this31;
   }
@@ -2800,26 +2800,64 @@ var OtherDoubleString = /*#__PURE__*/function (_BinaryRepresentation4) {
 var OtherFloatString = /*#__PURE__*/function (_BinaryRepresentation5) {
   _inherits(OtherFloatString, _BinaryRepresentation5);
 
-  var _super32 = _createSuper(OtherFloatString);
+  var _super33 = _createSuper(OtherFloatString);
 
   function OtherFloatString() {
     var _this32;
 
     _classCallCheck(this, OtherFloatString);
 
-    _this32 = _super32.call(this, "OF");
+    _this32 = _super33.call(this, "OF");
     _this32.maxLength = null;
-    _this32.padByte = "00";
+    _this32.padByte = 0;
     _this32.noMultiple = true;
     return _this32;
   }
 
   return _createClass(OtherFloatString);
-}(BinaryRepresentation);
+}(BinaryRepresentation); // these VR instances are precreate and are reused for each requested vr/tag
+
+
+var VRinstances = {
+  AE: new ApplicationEntity(),
+  AS: new AgeString(),
+  AT: new AttributeTag(),
+  CS: new CodeString(),
+  DA: new DateValue(),
+  DS: new DecimalString(),
+  DT: new DateTime(),
+  FL: new FloatingPointSingle(),
+  FD: new FloatingPointDouble(),
+  IS: new IntegerString(),
+  LO: new LongString(),
+  LT: new LongText(),
+  OB: new OtherByteString(),
+  OD: new OtherDoubleString(),
+  OF: new OtherFloatString(),
+  OW: new OtherWordString(),
+  PN: new PersonName(),
+  SH: new ShortString(),
+  SL: new SignedLong(),
+  SQ: new SequenceOfItems(),
+  SS: new SignedShort(),
+  ST: new ShortText(),
+  TM: new TimeValue(),
+  UC: new UnlimitedCharacters(),
+  UI: new UniqueIdentifier(),
+  UL: new UnsignedLong(),
+  UN: new UnknownValue(),
+  UR: new UniversalResource(),
+  US: new UnsignedShort(),
+  UT: new UnlimitedText()
+};
 
 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);
@@ -2900,12 +2938,12 @@ var Tag = /*#__PURE__*/function () {
         written += 4;
       } else {
         if (vr.isExplicit()) {
-          stream.writeString(vr.type);
-          stream.writeHex("0000");
+          stream.writeAsciiString(vr.type);
+          stream.writeUint16(0);
           stream.writeUint32(valueLength);
           written += 8;
         } else {
-          stream.writeString(vr.type);
+          stream.writeAsciiString(vr.type);
           stream.writeUint16(valueLength);
           written += 4;
         }
@@ -3377,6 +3415,10 @@ var IMPLICIT_LITTLE_ENDIAN$1 = "1.2.840.10008.1.2";
 var EXPLICIT_LITTLE_ENDIAN$1 = "1.2.840.10008.1.2.1";
 var EXPLICIT_BIG_ENDIAN = "1.2.840.10008.1.2.2";
 var singleVRs$1 = ["SQ", "OF", "OW", "OB", "UN", "LT"];
+var encodingMapping = {
+  "iso-ir-192": "utf-8",
+  "": "latin1"
+};
 var encapsulatedSyntaxes = ["1.2.840.10008.1.2.4.50", "1.2.840.10008.1.2.4.51", "1.2.840.10008.1.2.4.57", "1.2.840.10008.1.2.4.70", "1.2.840.10008.1.2.4.80", "1.2.840.10008.1.2.4.81", "1.2.840.10008.1.2.4.90", "1.2.840.10008.1.2.4.91", "1.2.840.10008.1.2.4.92", "1.2.840.10008.1.2.4.93", "1.2.840.10008.1.2.4.94", "1.2.840.10008.1.2.4.95", "1.2.840.10008.1.2.5", "1.2.840.10008.1.2.6.1", "1.2.840.10008.1.2.4.100", "1.2.840.10008.1.2.4.102", "1.2.840.10008.1.2.4.103"];
 
 var DicomMessage = /*#__PURE__*/function () {
@@ -3389,12 +3431,65 @@ var DicomMessage = /*#__PURE__*/function () {
     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();
+
+          if (cleanTagString === "00080005") {
+            if (readInfo.values.length > 0) {
+              var coding = readInfo.values[0];
+              coding = coding.replaceAll("_", "-").replaceAll(" ", "-").toLowerCase();
+
+              if (coding in encodingMapping) {
+                coding = encodingMapping[coding];
+              }
+
+              try {
+                bufferStream.setDecoder(new TextDecoder(coding));
+              } catch (error) {
+                console.warn(error);
+              }
+            }
+
+            if (readInfo.values.length > 1) {
+              console.warn("multiple encodings not supported, using first encoding!", readInfo.values);
+            }
+
+            readInfo.values = ["ISO_IR 192"]; // change SpecificCharacterSet to UTF-8
+          }
+
           dict[cleanTagString] = {
             vr: readInfo.vr.type,
             Value: readInfo.values
@@ -3435,29 +3530,34 @@ var DicomMessage = /*#__PURE__*/function () {
       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);
 
-      if (stream.readString(4) !== "DICM") {
+      if (stream.readAsciiString(4) !== "DICM") {
         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;
@@ -3483,17 +3583,19 @@ var DicomMessage = /*#__PURE__*/function () {
       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) {
@@ -3532,7 +3634,7 @@ var DicomMessage = /*#__PURE__*/function () {
 
         vr = ValueRepresentation.createByTypeString(vrType);
       } else {
-        vrType = stream.readString(2);
+        vrType = stream.readVR();
         vr = ValueRepresentation.createByTypeString(vrType);
 
         if (vr.isExplicit()) {
@@ -3617,8 +3719,8 @@ var DicomDict = /*#__PURE__*/function () {
       };
       var metaSyntax = EXPLICIT_LITTLE_ENDIAN$2;
       var fileStream = new WriteBufferStream(4096, true);
-      fileStream.writeHex("00".repeat(128));
-      fileStream.writeString("DICM");
+      fileStream.writeUint8Repeat(0, 128);
+      fileStream.writeAsciiString("DICM");
       var metaStream = new WriteBufferStream(1024);
 
       if (!this.meta["00020010"]) {