Merge pull request #23 from rii-mango/rordenlab-master

Rordenlab master
rii-mango · Mar 17, 2023 · 01675ae · 01675ae
2 parents d1893ab + 9d0a55b
commit 01675ae
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 7 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "nifti-reader-js",
-  "version": "0.6.1",
+  "version": "0.6.2",
   "description": "A JavaScript NIfTI file format reader.",
   "main": "src/nifti.js",
   "directories": {

diff --git a/release/current/nifti-reader-min.js b/release/current/nifti-reader-min.js
diff --git a/release/current/nifti-reader.js b/release/current/nifti-reader.js
@@ -4769,7 +4769,8 @@ nifti.isCompressed = function (data) {
  * @returns {ArrayBuffer}
  */
 nifti.decompress = function (data) {
-    return fflate.decompressSync(new Uint8Array(data)).buffer;
+    const decompressed = fflate.decompressSync(new Uint8Array(data)).buffer;
+    return decompressed
 };
 
 
@@ -5117,7 +5118,7 @@ nifti.NIFTI1.prototype.readHeader = function (data) {
     // Added by znshje on 27/11/2021
     //
     /* See: https://nifti.nimh.nih.gov/pub/dist/src/niftilib/nifti1.h */
-    if (this.qform_code > 0) {
+    if ((this.qform_code > 0) && (this.sform_code < this.qform_code)) {
         //   METHOD 2 (used when qform_code > 0, which should be the "normal" case):
         //    ---------------------------------------------------------------------
         //    The (x,y,z) coordinates are given by the pixdim[] scales, a rotation

diff --git a/src/nifti1.js b/src/nifti1.js
@@ -238,7 +238,7 @@ nifti.NIFTI1.prototype.readHeader = function (data) {
     // Added by znshje on 27/11/2021
     //
     /* See: https://nifti.nimh.nih.gov/pub/dist/src/niftilib/nifti1.h */
-    if (this.qform_code > 0) {
+    if ((this.qform_code > 0) && (this.sform_code < this.qform_code)) {
         //   METHOD 2 (used when qform_code > 0, which should be the "normal" case):
         //    ---------------------------------------------------------------------
         //    The (x,y,z) coordinates are given by the pixdim[] scales, a rotation