Merge pull request #581 from thewtex/toolchain-bumps

toolchain bumps
InsightSoftwareConsortium · Jun 20, 2022 · 9b02b68 · 9b02b68
2 parents e0c97a3 + 97291e7
commit 9b02b68
Show file tree

Hide file tree

Showing 8 changed files with 44 additions and 45 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "itk-wasm",
-  "version": "1.0.0-b.14",
+  "version": "1.0.0-b.15",
   "description": "High-performance spatial analysis in a web browser, Node.js, and reproducible execution across programming languages and hardware architectures.",
   "main": "./dist/index.js",
   "browser": {

diff --git a/src/docker/itk-wasm-base/Dockerfile b/src/docker/itk-wasm-base/Dockerfile
@@ -1,5 +1,5 @@
 ARG BASE_IMAGE=dockcross/web-wasm
-FROM $BASE_IMAGE:20220308-9764a2e
+FROM $BASE_IMAGE:20220612-21326cc
 ARG BASE_IMAGE
 
 LABEL maintainer="Matt McCormick <matt.mccormick@kitware.com>"

diff --git a/src/itk-wasm-cli.js b/src/itk-wasm-cli.js
@@ -8,7 +8,7 @@ import { Command, Option } from 'commander/esm.mjs'
 
 const program = new Command()
 
-const defaultImageTag = '20220523-82587720'
+const defaultImageTag = '20220619-bedc594a'
 
 function processCommonOptions() {
   const options = program.opts()

diff --git a/src/itkConfig.ts b/src/itkConfig.ts
@@ -1,4 +1,4 @@
-const version = '1.0.0-b.14'
+const version = '1.0.0-b.15'
 
 const itkConfig = {
   webWorkersUrl: undefined,

diff --git a/src/web-workers/loadImageIOPipelineModule.ts b/src/web-workers/loadImageIOPipelineModule.ts
@@ -21,7 +21,7 @@ async function loadImageIOPipelineModule(input: IOInput, postfix: string): Promi
     const ioModule = await loadPipelineModule(io, input.config.imageIOUrl)
     return ioModule
   }
-  
+
   const extension = getFileExtension(input.fileName)
   if (extensionToIO.has(extension)) {
     const io = extensionToIO.get(extension) + postfix
@@ -32,9 +32,13 @@ async function loadImageIOPipelineModule(input: IOInput, postfix: string): Promi
   for (let idx = 0; idx < ImageIOIndex.length; ++idx) {
     let idx = 0
     for await (const pipelineModule of availableIOModules(input)) {
-      const { returnValue, outputs } = await runPipelineEmscripten(pipelineModule, input.args, input.outputs, input.inputs)
-      if (returnValue === 0) {
-        return pipelineModule
+      try {
+        const { returnValue, outputs } = await runPipelineEmscripten(pipelineModule, input.args, input.outputs, input.inputs)
+        if (returnValue === 0) {
+          return pipelineModule
+        }
+      } catch (error) {
+        // continue
       }
       idx++
     }

diff --git a/src/web-workers/loadMeshIOPipelineModule.ts b/src/web-workers/loadMeshIOPipelineModule.ts
@@ -21,7 +21,7 @@ async function loadMeshIOPipelineModule(input: IOInput, postfix: string): Promis
     const ioModule = await loadPipelineModule(io, input.config.meshIOUrl)
     return ioModule
   }
-  
+
   const extension = getFileExtension(input.fileName)
   if (extensionToIO.has(extension)) {
     const io = extensionToIO.get(extension) + postfix
@@ -32,9 +32,13 @@ async function loadMeshIOPipelineModule(input: IOInput, postfix: string): Promis
   for (let idx = 0; idx < MeshIOIndex.length; ++idx) {
     let idx = 0
     for await (const pipelineModule of availableIOModules(input)) {
-      const { returnValue, outputs } = await runPipelineEmscripten(pipelineModule, input.args, input.outputs, input.inputs)
-      if (returnValue === 0) {
-        return pipelineModule
+      try {
+        const { returnValue, outputs } = await runPipelineEmscripten(pipelineModule, input.args, input.outputs, input.inputs)
+        if (returnValue === 0) {
+          return pipelineModule
+        }
+      } catch (error) {
+        // continue
       }
       idx++
     }

diff --git a/test/browser/io/readImageTest.js b/test/browser/io/readImageTest.js
@@ -11,7 +11,6 @@ for (let ii = 0; ii < byteString.length; ++ii) {
   intArray[ii] = byteString.charCodeAt(ii)
 }
 const cthead1SmallBlob = new window.Blob([intArray], { type: mimeString })
-const cthead1SmallBlob1 = new window.Blob([intArray], { type: mimeString })
 const cthead1SmallFile = new window.File([cthead1SmallBlob], 'cthead1Small.png')
 
 const verifyImage = (t, image) => {
@@ -54,14 +53,6 @@ export default function () {
       })
   })
 
-  test('readImageBlob reads a Blob without a file extension', (t) => {
-    return readImageBlob(null, cthead1SmallBlob1, 'cthead1Small')
-      .then(function ({ image, webWorker }) {
-        webWorker.terminate()
-        verifyImage(t, image)
-      })
-  })
-
   test('readImageFile reads a File', (t) => {
     return readImageFile(null, cthead1SmallFile)
       .then(function ({ image, webWorker }) {