dcmjs 0.24.4 → 0.24.7

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];
@@ -3031,7 +3033,7 @@ var handler = {
  * assert src.b === 'innerChange'
  */
 
-var addAccessors$1 = function addAccessors(dest, sqZero) {
+var addAccessors = function addAccessors(dest, sqZero) {
   if (dest.__isProxy) return dest;
   var itemZero = sqZero;
 
@@ -3202,7 +3204,7 @@ var DicomMetaDictionary = /*#__PURE__*/function () {
             var sqZero = naturalDataset[naturalName][0];
 
             if (sqZero && _typeof(sqZero) === "object" && !sqZero.length) {
-              naturalDataset[naturalName] = addAccessors$1(naturalDataset[naturalName], sqZero);
+              naturalDataset[naturalName] = addAccessors(naturalDataset[naturalName], sqZero);
             } else {
               naturalDataset[naturalName] = sqZero;
             }
@@ -3470,7 +3472,7 @@ var DicomMessage = /*#__PURE__*/function () {
           if (cleanTagString === "00080005") {
             if (readInfo.values.length > 0) {
               var coding = readInfo.values[0];
-              coding = coding.replaceAll("_", "-").replaceAll(" ", "-").toLowerCase();
+              coding = coding.replace(/[_ ]/g, "-").toLowerCase();
 
               if (coding in encodingMapping) {
                 coding = encodingMapping[coding];
@@ -7296,25 +7298,25 @@ var TID1500MeasurementReport = /*#__PURE__*/function () {
       ContentSequence: [{
         RelationshipType: "HAS CONCEPT MOD",
         ValueType: "CODE",
-        ConceptNameCodeSequence: addAccessors$1({
+        ConceptNameCodeSequence: addAccessors({
           CodeValue: "121049",
           CodingSchemeDesignator: "DCM",
           CodeMeaning: "Language of Content Item and Descendants"
         }),
-        ConceptCodeSequence: addAccessors$1({
+        ConceptCodeSequence: addAccessors({
           CodeValue: "eng",
           CodingSchemeDesignator: "RFC5646",
           CodeMeaning: "English"
         }),
-        ContentSequence: addAccessors$1({
+        ContentSequence: addAccessors({
           RelationshipType: "HAS CONCEPT MOD",
           ValueType: "CODE",
-          ConceptNameCodeSequence: addAccessors$1({
+          ConceptNameCodeSequence: addAccessors({
             CodeValue: "121046",
             CodingSchemeDesignator: "DCM",
             CodeMeaning: "Country of Language"
           }),
-          ConceptCodeSequence: addAccessors$1({
+          ConceptCodeSequence: addAccessors({
             CodeValue: "US",
             CodingSchemeDesignator: "ISO3166_1",
             CodeMeaning: "United States"
@@ -7323,12 +7325,12 @@ var TID1500MeasurementReport = /*#__PURE__*/function () {
       }, this.PersonObserverName, {
         RelationshipType: "HAS CONCEPT MOD",
         ValueType: "CODE",
-        ConceptNameCodeSequence: addAccessors$1({
+        ConceptNameCodeSequence: addAccessors({
           CodeValue: "121058",
           CodingSchemeDesignator: "DCM",
           CodeMeaning: "Procedure reported"
         }),
-        ConceptCodeSequence: addAccessors$1({
+        ConceptCodeSequence: addAccessors({
           CodeValue: "1",
           CodingSchemeDesignator: "99dcmjs",
           CodeMeaning: "Unknown procedure"
@@ -7839,12 +7841,12 @@ var TID300Measurement = /*#__PURE__*/function () {
       return [{
         RelationshipType: "CONTAINS",
         ValueType: "CODE",
-        ConceptNameCodeSequence: addAccessors$1({
+        ConceptNameCodeSequence: addAccessors({
           CodeValue: "121071",
           CodingSchemeDesignator: "DCM",
           CodeMeaning: "Finding"
         }),
-        ConceptCodeSequence: addAccessors$1({
+        ConceptCodeSequence: addAccessors({
           CodeValue: CodeValue,
           //: "SAMPLE FINDING",
           CodingSchemeDesignator: CodingSchemeDesignator,
@@ -7865,12 +7867,12 @@ var TID300Measurement = /*#__PURE__*/function () {
         return {
           RelationshipType: "CONTAINS",
           ValueType: "CODE",
-          ConceptNameCodeSequence: addAccessors$1({
+          ConceptNameCodeSequence: addAccessors({
             CodeValue: "363698007",
             CodingSchemeDesignator: "SCT",
             CodeMeaning: "Finding Site"
           }),
-          ConceptCodeSequence: addAccessors$1({
+          ConceptCodeSequence: addAccessors({
             CodeValue: CodeValue,
             //: "SAMPLE FINDING SITE",
             CodingSchemeDesignator: CodingSchemeDesignator,
@@ -16998,7 +17000,7 @@ var utilities = {
   TID1500: TID1500,
   TID300: TID300,
   message: message,
-  addAccessors: addAccessors$1
+  addAccessors: addAccessors
 };
 
 var Code = /*#__PURE__*/function () {