Use fflate not pako

rii-mango · Apr 1, 2023 · 49003b2 · 49003b2
1 parent 6853707
commit 49003b2
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 6 deletions.
diff --git a/bower.json b/bower.json
@@ -10,7 +10,7 @@
       ".gitignore"
   ],
   "dependencies": {
-    "pako": "*",
+    "fflate": "*",
     "jpeg-lossless-decoder-js": "git+https://github.com/rii-mango/JPEGLosslessDecoderJS.git"
   },
   "devDependencies": {

diff --git a/package.json b/package.json
@@ -9,7 +9,7 @@
   "dependencies": {
     "@wearemothership/dicom-character-set": "^1.0.4-opt.1",
     "jpeg-lossless-decoder-js": "git+https://github.com/rii-mango/JPEGLosslessDecoderJS.git#v2.0.4",
-    "pako": "^1.0.10"
+    "fflate": "*"
   },
   "devDependencies": {
     "browserify": "^16.5.0",

diff --git a/src/main.js b/src/main.js
@@ -35,7 +35,9 @@ var JpxImage = JpxImage || ((typeof require !== 'undefined') ? require('../lib/j
 var CharLS = CharLS || ((typeof require !== 'undefined') ? require('../lib/charLS-DynamicMemory-browser.js') : null);
 var JpegLSDecoder = JpegLSDecoder || ((typeof require !== 'undefined') ? require('../lib/jpeg-ls.js') : null);
 
-var pako = pako || ((typeof require !== 'undefined') ? require('pako') : null);
+//use fflate not pako
+//var pako = pako || ((typeof require !== 'undefined') ? require('pako') : null);
+var fflate = fflate || ((typeof require !== 'undefined') ? require('fflate') : null);
 
 /*** Exports ***/
 

diff --git a/src/parser.js b/src/parser.js
@@ -11,8 +11,9 @@ daikon.Utils = daikon.Utils || ((typeof require !== 'undefined') ? require('./ut
 daikon.Dictionary = daikon.Dictionary || ((typeof require !== 'undefined') ? require('./dictionary.js') : null);
 daikon.Image = daikon.Image || ((typeof require !== 'undefined') ? require('./image.js') : null);
 
-var pako = pako || ((typeof require !== 'undefined') ? require('pako') : null);
-
+//use fflate not pako
+//var pako = pako || ((typeof require !== 'undefined') ? require('pako') : null);
+var fflate = fflate || ((typeof require !== 'undefined') ? require('fflate') : null);
 
 /*** Constructor ***/
 
@@ -119,7 +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, pako.inflateRaw(copyDeflated));
+                this.inflated = daikon.Utils.concatArrayBuffers(copyMeta, fflate.decompressSync(new Uint8Array(copyDeflated)));
                 data = new DataView(this.inflated);
             }