Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Replace jpeg_decoder with zune-jpeg #1877

Closed
wants to merge 19 commits into from
Closed

Replace jpeg_decoder with zune-jpeg #1877

Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
b61504d
Replace jpeg_decoder with zune-jpeg
Shnatsel Mar 10, 2023
f40a507
Switch to released versions of zune-*
Shnatsel Mar 13, 2023
a837e95
Update comment
Shnatsel Mar 13, 2023
25ba278
Decode directly into the provided buffer, without a memcpy()
Shnatsel Mar 13, 2023
30798e8
cargo fmt
Shnatsel Mar 13, 2023
e924ccd
Remove jpeg-decoder from Cargo.toml
Shnatsel Mar 13, 2023
270b416
Don't panic when scale() is called
Shnatsel Mar 13, 2023
b3446b8
Update comment
Shnatsel Mar 13, 2023
986a5a1
Merge branch 'image-rs:master' into zune-jpeg-sneaky
Shnatsel Mar 14, 2023
3297538
bump zune-jpeg dependency
Shnatsel Mar 14, 2023
ef0e2c9
Add ICC extraction support
Shnatsel Mar 14, 2023
52bc19e
Extract the ICC profile lazily
Shnatsel Mar 14, 2023
2c6e792
commit review suggestion
Shnatsel Mar 14, 2023
f133513
Disable JPEG reference image comparison via a hash; lossy decoders ar…
Shnatsel Mar 14, 2023
625b493
Sync Cargo.toml.public-private-dependencies with Cargo.toml
Shnatsel Mar 14, 2023
fbf67e7
Drop jpeg_rayon from default features, it doesn't do anything anymore
Shnatsel Mar 14, 2023
dbb0a6b
Add dimensions limits to the struct and pass them to the decoder; sti…
Shnatsel Mar 14, 2023
6f4b8ea
Implement setting dimension limits
Shnatsel Mar 14, 2023
1f6e8d8
Correctly set unbounded limits
Shnatsel Mar 15, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 5 additions & 7 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@ byteorder = "1.3.2"
num-rational = { version = "0.4", default-features = false }
num-traits = "0.2.0"
gif = { version = "0.12", optional = true }
jpeg = { package = "jpeg-decoder", version = "0.3.0", default-features = false, optional = true }
png = { version = "0.17.6", optional = true }
tiff = { version = "0.8.0", optional = true }
ravif = { version = "0.11.0", optional = true }
Expand All @@ -47,22 +46,22 @@ color_quant = "1.1"
exr = { version = "1.5.0", optional = true }
qoi = { version = "0.4", optional = true }
libwebp = { package = "webp", version = "0.2.2", default-features = false, optional = true }
zune-core = { version = "0.2.1", default-features = false, optional = true }
zune-jpeg = { version = "0.3.13", optional = true }

[dev-dependencies]
crc32fast = "1.2.0"
num-complex = "0.4"
glob = "0.3"
quickcheck = "1"
criterion = "0.3"
# Keep this in sync with the jpeg dependency above. This is used to enable the platform_independent
# feature when testing, so `cargo test` works correctly.
jpeg = { package = "jpeg-decoder", version = "0.3.0", default-features = false, features = ["platform_independent"] }

[features]
# TODO: Add "avif" to this list while preparing for 0.24.0
default = ["gif", "jpeg", "ico", "png", "pnm", "tga", "tiff", "webp", "bmp", "hdr", "dxt", "dds", "farbfeld", "jpeg_rayon", "openexr", "qoi"]

ico = ["bmp", "png"]
jpeg = ["dep:zune-core", "dep:zune-jpeg"]
pnm = []
tga = []
bmp = []
Expand All @@ -78,9 +77,8 @@ webp = []
# Non-default, not included in `webp`. Requires native dependency libwebp.
webp-encoder = ["libwebp"]

# Enables multi-threading.
# Requires latest stable Rust.
jpeg_rayon = ["jpeg/rayon"]
# Dummy feature for backwards compatibility
jpeg_rayon = ["jpeg"]
# Non-default, enables avif support.
# Requires latest stable Rust.
avif = ["avif-encoder"]
Expand Down
Loading