Skip to content

Commit 56d30e6

Browse files
thewtexthewtex
authored
Merge pull request #1485 from InsightSoftwareConsortium/274d-investigate-crea
fix(image-io): resolve IWI CBOR round-trip corruption for uint8 images
2 parents 59456a6 + d110dda commit 56d30e6

66 files changed

Lines changed: 936 additions & 109 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/workflows/examples.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
name: node-js
1414
runs-on: ubuntu-24.04
1515

16-
16+
1717
steps:
1818
- uses: actions/checkout@v6.0.2
1919

‎.github/workflows/playwright.yml‎

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -90,9 +90,11 @@ jobs:
9090
large-packages: false
9191
tool-cache: true
9292

93-
- name: Pull latest Docker images
94-
run: |
95-
./src/docker/pull.sh --no-debug
93+
- uses: nick-fields/retry@v3
94+
with:
95+
max_attempts: 5
96+
timeout_minutes: 10
97+
command: ./src/docker/pull.sh --no-debug
9698

9799
- name: Install
98100
uses: pnpm/action-setup@v5
@@ -227,10 +229,13 @@ jobs:
227229
- name: Free Disk Space (Ubuntu)
228230
uses: jlumbroso/free-disk-space@main
229231

230-
- name: Pull latest Docker images
232+
- uses: nick-fields/retry@v3
231233
working-directory: ./
232-
run: |
233-
./src/docker/pull.sh --no-debug
234+
name: Pull latest Docker images
235+
with:
236+
max_attempts: 5
237+
timeout_minutes: 10
238+
command: ./src/docker/pull.sh --no-debug
234239

235240
- uses: actions/setup-node@v6
236241
with:

‎examples/debugging/package.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@
66
"build": "npm run native-build && npm run emscripten-build-release && npm run emscripten-build-debug && npm run wasi-build-release && npm run wasi-build-debug",
77
"native-build": "cmake -Bbuild -S. -DCMAKE_BUILD_TYPE=Debug && cmake --build build/ --config Debug",
88
"native-debug-linux": "gdb --args ./build/DebugMe",
9-
"emscripten-build-release": "itk-wasm -i quay.io/itkwasm/emscripten:latest --build-dir emscripten-build-release build",
9+
"emscripten-build-release": "itk-wasm -i docker.io/itkwasm/emscripten:latest --build-dir emscripten-build-release build",
1010
"run-node-release": "node ./runEmscriptenNode.js ./emscripten-build-release/DebugMe",
11-
"emscripten-build-debug": "itk-wasm -i quay.io/itkwasm/emscripten:latest-debug --build-dir emscripten-build-debug build -- -DCMAKE_BUILD_TYPE=Debug",
11+
"emscripten-build-debug": "itk-wasm -i docker.io/itkwasm/emscripten:latest-debug --build-dir emscripten-build-debug build -- -DCMAKE_BUILD_TYPE=Debug",
1212
"run-node-debug": "node ./runEmscriptenNode.js ./emscripten-build-debug/DebugMe",
13-
"wasi-build-release": "itk-wasm -i quay.io/itkwasm/wasi:latest --build-dir wasi-build-release build",
13+
"wasi-build-release": "itk-wasm -i docker.io/itkwasm/wasi:latest --build-dir wasi-build-release build",
1414
"node-inspect": "node --inspect-brk ./runEmscriptenNode.js ./emscripten-build-debug/DebugMe",
15-
"wasi-build-debug": "itk-wasm -i quay.io/itkwasm/wasi:latest-debug --build-dir wasi-build-debug build -- -DCMAKE_BUILD_TYPE=Debug",
15+
"wasi-build-debug": "itk-wasm -i docker.io/itkwasm/wasi:latest-debug --build-dir wasi-build-debug build -- -DCMAKE_BUILD_TYPE=Debug",
1616
"run-wasi-debug": "itk-wasm --build-dir wasi-build-debug run DebugMe.wasi.wasm",
1717
"start": "http-server -o"
1818
},

‎examples/different-input-types/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"type": "module",
66
"scripts": {
77
"build": "pnpm run build:wasi",
8-
"build:wasi": "itk-wasm -b wasi-build -i quay.io/itkwasm/wasi:latest build",
8+
"build:wasi": "itk-wasm -b wasi-build -i docker.io/itkwasm/wasi:latest build",
99
"test": "pnpm run test:wasi",
1010
"test:wasi": "itk-wasm -b wasi-build run different-input-types.wasi.wasm -- ./Gourds.png label.png overlay.png",
1111
"test:wasi:help": "itk-wasm -b wasi-build run different-input-types.wasi.wasm -- --help"

‎examples/hello-world/package.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,16 +6,16 @@
66
"type": "module",
77
"scripts": {
88
"build": "pnpm run build:wasi && pnpm run build:emscripten",
9-
"build:wasi": "itk-wasm -i quay.io/itkwasm/wasi:latest build",
10-
"build:emscripten": "itk-wasm build",
9+
"build:wasi": "itk-wasm -i docker.io/itkwasm/wasi:latest build",
10+
"build:emscripten": "itk-wasm -i docker.io/itkwasm/emscripten:latest build",
1111
"test": "pnpm run test:wasi && pnpm run test:node && pnpm run test:browser",
1212
"test:wasi": "pnpx itk-wasm run wasi-build/hello.wasi.wasm",
1313
"test:node": "node ./index.mjs",
1414
"start": "http-server --cors -p 8083",
1515
"test:browser": "playwright test",
1616
"test:browser:debug": "playwright test --debug"
1717
},
18-
"author": "Matt McCormick <matt@mmmccormick.com>",
18+
"author": "Matt McCormick <matt@fideus.io>",
1919
"license": "Apache-2.0",
2020
"dependencies": {
2121
"fs-extra": "^11.1.0",

‎examples/inputs-outputs/package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
"https://github.com/InsightSoftwareConsortium/ITK-Wasm/releases/download/itk-wasm-v1.0.0-b.179/sample-data.tar.gz",
1111
"https://bafybeidxatrsrrphfmntdyze6ec3jbiak527wj3kalwjptv4bimpcnzxdq.ipfs.w3s.link/ipfs/bafybeidxatrsrrphfmntdyze6ec3jbiak527wj3kalwjptv4bimpcnzxdq/sample-data.tar.gz"
1212
],
13-
"emscripten-docker-image": "quay.io/itkwasm/emscripten:latest",
14-
"wasi-docker-image": "quay.io/itkwasm/wasi:latest",
13+
"emscripten-docker-image": "docker.io/itkwasm/emscripten:latest",
14+
"wasi-docker-image": "docker.io/itkwasm/wasi:latest",
1515
"typescript-package-name": "@itk-wasm/inputs-outputs-example",
1616
"python-package-name": "itkwasm-inputs-outputs-example",
1717
"package-description": "An example that has non-trivial inputs and outputs.",

‎examples/mean-squares-versor-registration/package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
"https://github.com/InsightSoftwareConsortium/ITK-Wasm/releases/download/itk-wasm-v1.0.0-b.179/sample-data.tar.gz",
1111
"https://bafybeidxatrsrrphfmntdyze6ec3jbiak527wj3kalwjptv4bimpcnzxdq.ipfs.w3s.link/ipfs/bafybeidxatrsrrphfmntdyze6ec3jbiak527wj3kalwjptv4bimpcnzxdq/sample-data.tar.gz"
1212
],
13-
"emscripten-docker-image": "quay.io/itkwasm/emscripten:latest",
14-
"wasi-docker-image": "quay.io/itkwasm/wasi:latest",
13+
"emscripten-docker-image": "docker.io/itkwasm/emscripten:latest",
14+
"wasi-docker-image": "docker.io/itkwasm/wasi:latest",
1515
"typescript-package-name": "@itk-wasm/mean-squares-versor-registration-example",
1616
"python-package-name": "itkwasm-mean-squares-versor-registration-example",
1717
"package-description": "Example 3D versor transform registration with a mean-squares similarity metric",

‎include/itkComponentTypesJSON.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ template <>
4141
struct glz::meta<itk::JSONComponentTypesEnum>
4242
{
4343
using enum itk::JSONComponentTypesEnum;
44-
static constexpr auto value = glz::enumerate(int8, uint8, int16, uint16, int32, uint32, int64, float32, float64);
44+
static constexpr auto value = glz::enumerate(int8, uint8, int16, uint16, int32, uint32, int64, uint64, float32, float64);
4545
};
4646

4747
#endif // itkComponentTypesJSON_h

‎packages/compare-images/package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
"description": "@itk-wasm/compare-stringify build configuration",
66
"type": "module",
77
"itk-wasm": {
8-
"emscripten-docker-image": "quay.io/itkwasm/emscripten:latest",
9-
"wasi-docker-image": "quay.io/itkwasm/wasi:latest",
8+
"emscripten-docker-image": "docker.io/itkwasm/emscripten:latest",
9+
"wasi-docker-image": "docker.io/itkwasm/wasi:latest",
1010
"test-data-hash": "bafybeiafli6egtmkcgany65po64w67hpqnmgwr5utqo6ycbbz7k5l33llu",
1111
"test-data-urls": [
1212
"https://github.com/InsightSoftwareConsortium/ITK-Wasm/releases/download/itk-wasm-v1.0.0-b.171/compare-images-test-data.tar.gz"

‎packages/compare-images/python/itkwasm-compare-images-emscripten/itkwasm_compare_images_emscripten/js_package.py‎

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)