dcmjs 0.24.5 → 0.24.6

package/build/dcmjs.es.js

@@ -1583,7 +1583,8 @@ var BinaryRepresentation = /*#__PURE__*/function (_ValueRepresentation3) {
         var bufferLength = 0;
 
         for (i = 0; i < frames; i++) {
-          bufferLength += value[i].byteLength;
+          var needsPadding = Boolean(value[i].byteLength & 1);
+          bufferLength += value[i].byteLength + (needsPadding ? 1 : 0);
           var _fragmentsLength = 1;
 
           if (fragmentMultiframe) {
@@ -1597,6 +1598,8 @@ var BinaryRepresentation = /*#__PURE__*/function (_ValueRepresentation3) {
         binaryStream = new WriteBufferStream(bufferLength, stream.isLittleEndian);
 
         for (i = 0; i < frames; i++) {
+          var _needsPadding = Boolean(value[i].byteLength & 1);
+
           startOffset.push(binaryStream.size);
           var frameBuffer = value[i],
               frameStream = new ReadBufferStream(frameBuffer);
@@ -1607,13 +1610,14 @@ var BinaryRepresentation = /*#__PURE__*/function (_ValueRepresentation3) {
           }
 
           for (var j = 0, fragmentStart = 0; j < fragmentsLength; j++) {
+            var isFinalFragment = j === fragmentsLength - 1;
             var fragmentEnd = fragmentStart + frameStream.size;
 
             if (fragmentMultiframe) {
               fragmentEnd = fragmentStart + fragmentSize;
             }
 
-            if (j == fragmentsLength - 1) {
+            if (isFinalFragment) {
               fragmentEnd = frameStream.size;
             }
 
@@ -1621,8 +1625,13 @@ var BinaryRepresentation = /*#__PURE__*/function (_ValueRepresentation3) {
             fragmentStart = fragmentEnd;
             binaryStream.writeUint16(0xfffe);
             binaryStream.writeUint16(0xe000);
-            binaryStream.writeUint32(fragStream.size);
+            var addPaddingByte = isFinalFragment && _needsPadding;
+            binaryStream.writeUint32(fragStream.size + (addPaddingByte ? 1 : 0));
             binaryStream.concat(fragStream);
+
+            if (addPaddingByte) {
+              binaryStream.writeInt8(this.padByte);
+            }
           }
         }
 
@@ -1638,13 +1647,6 @@ var BinaryRepresentation = /*#__PURE__*/function (_ValueRepresentation3) {
         stream.writeUint16(0xfffe);
         stream.writeUint16(0xe0dd);
         stream.writeUint32(0x0);
-        var written = 8 + binaryStream.size + startOffset.length * 4 + 8;
-
-        if (written & 1) {
-          stream.writeUint8(this.padByte);
-          written++;
-        }
-
         return 0xffffffff;
       } else {
         var binaryData = value[0];