Skip to content

Commit e65e736

Browse files
authored
Merge pull request #37 from rii-mango/korbinian90-patch-1
Korbinian90 patch 1 (with release related additions)
2 parents a4ce01d + 77749d0 commit e65e736

File tree

9 files changed

+28
-11
lines changed

9 files changed

+28
-11
lines changed

.github/workflows/test-linux-node18.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ name: test-linux-node18
55

66
on:
77
pull_request:
8-
branches: [main]
8+
branches: [master]
99

1010
jobs:
1111
build:

dist/src/nifti1.d.ts.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/src/nifti1.js

Lines changed: 6 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/src/nifti1.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package-lock.json

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "nifti-reader-js",
3-
"version": "0.6.6",
3+
"version": "0.6.7",
44
"description": "A JavaScript NIfTI file format reader.",
55
"main": "dist/src/nifti.js",
66
"browser": "release/current/nifti-reader.js",

release/current/nifti-reader-min.js

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

release/current/nifti-reader.js

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2562,7 +2562,12 @@ var require_nifti1 = __commonJS({
25622562
this.extensionFlag[1] = utilities_1.Utils.getByteAt(rawData, 348 + 1);
25632563
this.extensionFlag[2] = utilities_1.Utils.getByteAt(rawData, 348 + 2);
25642564
this.extensionFlag[3] = utilities_1.Utils.getByteAt(rawData, 348 + 3);
2565-
if (this.extensionFlag[0]) {
2565+
let isExtensionCapable = true;
2566+
if (!this.isHDR && this.vox_offset <= 352)
2567+
isExtensionCapable = false;
2568+
if (rawData.byteLength <= 352 + 16)
2569+
isExtensionCapable = false;
2570+
if (isExtensionCapable && this.extensionFlag[0]) {
25662571
this.extensions = utilities_1.Utils.getExtensionsAt(rawData, this.getExtensionLocation(), this.littleEndian, this.vox_offset);
25672572
this.extensionSize = this.extensions[0].esize;
25682573
this.extensionCode = this.extensions[0].ecode;

src/nifti1.ts

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -388,7 +388,14 @@ import { Utils } from "./utilities";
388388
this.extensionFlag[1] = Utils.getByteAt(rawData, 348 + 1);
389389
this.extensionFlag[2] = Utils.getByteAt(rawData, 348 + 2);
390390
this.extensionFlag[3] = Utils.getByteAt(rawData, 348 + 3);
391-
if (this.extensionFlag[0]) {
391+
392+
let isExtensionCapable = true;
393+
if ((!this.isHDR) && (this.vox_offset <= 352))
394+
isExtensionCapable = false;
395+
if (rawData.byteLength <= (352 + 16))
396+
isExtensionCapable = false;
397+
398+
if (isExtensionCapable && this.extensionFlag[0]) {
392399
// read our extensions
393400
this.extensions = Utils.getExtensionsAt(
394401
rawData,

0 commit comments

Comments
 (0)