reverting to libraries from v1.2.42

Switching back to pako
Commenting out dicom-character-set
Using older xss version
Using these newer libraries would build and test fine inside Daikon, but would cause building Papaya to break

package.json

@@ -9,8 +9,9 @@
   "dependencies": {
     "@wearemothership/dicom-character-set": "^1.0.4-opt.1",
     "jpeg-lossless-decoder-js": "^2.0.7",
+    "pako": "^1.0",
     "fflate": "*",
-    "xss": "^1.0.14"
+    "xss": "0.0.9"
   },
   "devDependencies": {
     "esbuild": "*",

src/main.js

@@ -36,8 +36,8 @@ var CharLS = CharLS || ((typeof require !== 'undefined') ? require('../lib/charL
 var JpegLSDecoder = JpegLSDecoder || ((typeof require !== 'undefined') ? require('../lib/jpeg-ls.js') : null);
 
 //use fflate not pako
-//var pako = pako || ((typeof require !== 'undefined') ? require('pako') : null);
-var fflate = fflate || ((typeof require !== 'undefined') ? require('fflate') : null);
+var pako = pako || ((typeof require !== 'undefined') ? require('pako') : null);
+//var fflate = fflate || ((typeof require !== 'undefined') ? require('fflate') : null);
 
 /*** Exports ***/
 

src/parser.js

@@ -12,8 +12,8 @@ daikon.Dictionary = daikon.Dictionary || ((typeof require !== 'undefined') ? req
 daikon.Image = daikon.Image || ((typeof require !== 'undefined') ? require('./image.js') : null);
 
 //use fflate not pako
-//var pako = pako || ((typeof require !== 'undefined') ? require('pako') : null);
-var fflate = fflate || ((typeof require !== 'undefined') ? require('fflate') : null);
+var pako = pako || ((typeof require !== 'undefined') ? require('pako') : null);
+//var fflate = fflate || ((typeof require !== 'undefined') ? require('fflate') : null);
 
 /*** Constructor ***/
 
@@ -120,8 +120,8 @@ daikon.Parser.prototype.parse = function (data) {
                 this.needsDeflate = false;
                 copyMeta = data.buffer.slice(0, tag.offsetEnd);
                 copyDeflated = data.buffer.slice(tag.offsetEnd);
-                //this.inflated = daikon.Utils.concatArrayBuffers(copyMeta, pako.inflateRaw(copyDeflated));
-                this.inflated = daikon.Utils.concatArrayBuffers(copyMeta, fflate.decompressSync(new Uint8Array(copyDeflated)));
+                this.inflated = daikon.Utils.concatArrayBuffers(copyMeta, pako.inflateRaw(copyDeflated));
+                //this.inflated = daikon.Utils.concatArrayBuffers(copyMeta, fflate.decompressSync(new Uint8Array(copyDeflated)));
                 data = new DataView(this.inflated);
             }
 

src/utilities.js

@@ -5,7 +5,7 @@
 "use strict";
 
 /*** Imports ***/
-var convertBytes = require('@wearemothership/dicom-character-set').convertBytes;
+//var convertBytes = require('@wearemothership/dicom-character-set').convertBytes;
 var daikon = daikon || {};
 daikon.Utils = daikon.Utils || {};
 
@@ -43,13 +43,23 @@ daikon.Utils.createArray = function (length) {
 
 
 daikon.Utils.getStringAt = function (dataview, start, length, charset, vr) {
+    var str = "", ctr, ch;
+
+    for (ctr = 0; ctr < length; ctr += 1) {
+        ch = dataview.getUint8(start + ctr);
+
+        if (ch !== 0) {
+            str += String.fromCharCode(ch);
+        }
+    }
+
+	/* - @from wearemothership dicom-character-set
     var strBuff = new Uint8Array(dataview.buffer, dataview.byteOffset + start, length);
     var str = convertBytes(charset || "ISO 2022 IR 6", strBuff, {vr: vr} );
-
     while (str && str.charCodeAt(str.length - 1) === 0) {
         str = str.slice(0,-1);
     }
-
+	*/
     return str;
 };