Skip to content

Commit

Permalink
Merge pull request #502 from Enet4/imp/ts-registry/openjp2-bump
Browse files Browse the repository at this point in the history
Bump jpeg2k dependency
  • Loading branch information
Enet4 authored Apr 20, 2024
2 parents 41687d7 + 0b84950 commit d0b3b20
Show file tree
Hide file tree
Showing 3 changed files with 19 additions and 49 deletions.
2 changes: 2 additions & 0 deletions .github/workflows/rust.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,8 @@ jobs:
cache: true
# test project with default + extra features
- run: cargo test --features image,ndarray,sop-class,rle,cli
# test dicom-pixeldata with openjp2
- run: cargo test -p dicom-pixeldata --features openjp2
# test dicom-pixeldata with openjpeg-sys
- run: cargo test -p dicom-pixeldata --features openjpeg-sys
# test dicom-pixeldata with gdcm-rs
Expand Down
62 changes: 15 additions & 47 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions transfer-syntax-registry/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ rayon = ["jpeg-decoder?/rayon"]
# enable SIMD operations for JPEG encoding
simd = ["jpeg-encoder?/simd"]

# JPEG 2000 support via the OpenJPEG Rust port,
# JPEG 2000 support via the OpenJPEG native bindings,
# conflicts with `openjp2`
openjpeg-sys = ["dep:jpeg2k", "jpeg2k/openjpeg-sys"]

Expand All @@ -47,7 +47,7 @@ byteordered = "0.6"
tracing = "0.1.34"

[dependencies.jpeg2k]
version = "0.6.6"
version = "0.6.8"
optional = true
default-features = false

Expand Down

0 comments on commit d0b3b20

Please sign in to comment.