From d7654cb85ebb5bf24acf6b5fede2e229e5171565 Mon Sep 17 00:00:00 2001 From: Taylor Hanayik Date: Mon, 9 Dec 2024 22:32:27 +0000 Subject: [PATCH] add zlib to wasm compile command and bump version --- console/makefile | 2 +- js/index.html | 2 +- js/package-lock.json | 4 ++-- js/package.json | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/console/makefile b/console/makefile index fcb351e1..5f91bbda 100644 --- a/console/makefile +++ b/console/makefile @@ -59,6 +59,6 @@ noroi: g++ $(CFLAGS) -I. $(JSFLAGS) $(JFLAGS) $(LFLAGS) $(UFILES) -DmyNoRois wasm: - emcc -O3 $(UFILES) -s DEMANGLE_SUPPORT=1 -s EXPORTED_RUNTIME_METHODS='["callMain", "ccall", "cwrap", "FS", "FS_createDataFile", "FS_readFile", "FS_unlink", "allocateUTF8", "getValue", "stringToUTF8", "setValue"]' -s STACK_OVERFLOW_CHECK=2 -s STACK_SIZE=16MB -s ALLOW_MEMORY_GROWTH=1 -s WASM=1 -s EXPORT_ES6=1 -s MODULARIZE=1 -s EXPORTED_FUNCTIONS='["_main", "_malloc", "_free"]' -s FORCE_FILESYSTEM=1 -s INVOKE_RUN=0 -o ../js/src/dcm2niix.js + emcc -O3 $(UFILES) -lz -s USE_ZLIB -s DEMANGLE_SUPPORT=1 -s EXPORTED_RUNTIME_METHODS='["callMain", "ccall", "cwrap", "FS", "FS_createDataFile", "FS_readFile", "FS_unlink", "allocateUTF8", "getValue", "stringToUTF8", "setValue"]' -s STACK_OVERFLOW_CHECK=2 -s STACK_SIZE=16MB -s ALLOW_MEMORY_GROWTH=1 -s WASM=1 -s EXPORT_ES6=1 -s MODULARIZE=1 -s EXPORTED_FUNCTIONS='["_main", "_malloc", "_free"]' -s FORCE_FILESYSTEM=1 -s INVOKE_RUN=0 -o ../js/src/dcm2niix.js # STACK_SIZE=16MB is the minimum value found to work with the current codebase when targeting WASM diff --git a/js/index.html b/js/index.html index 1c2c1547..467bf204 100644 --- a/js/index.html +++ b/js/index.html @@ -114,7 +114,7 @@

dcm2niix WASM Demo

const t0 = performance.now(); const inputFileList = selectedFiles - const resultFileList = await dcm2niix.input(inputFileList).run() + const resultFileList = await dcm2niix.input(inputFileList).z('y').run() console.log(resultFileList); const t1 = performance.now(); diff --git a/js/package-lock.json b/js/package-lock.json index 42fd6f0a..1524ca6f 100644 --- a/js/package-lock.json +++ b/js/package-lock.json @@ -1,12 +1,12 @@ { "name": "@niivue/dcm2niix", - "version": "0.1.1", + "version": "1.0.0", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@niivue/dcm2niix", - "version": "0.1.1", + "version": "1.0.0", "license": "BSD-2-Clause", "devDependencies": { "esbuild": "^0.23.1" diff --git a/js/package.json b/js/package.json index 0f560159..fdf19a14 100644 --- a/js/package.json +++ b/js/package.json @@ -1,6 +1,6 @@ { "name": "@niivue/dcm2niix", - "version": "0.1.1-dev.2", + "version": "1.0.0", "main": "dist/index.js", "module": "dist/index.js", "exports": {