diff --git a/.github/workflows/fuzz_deflate.yml b/.github/workflows/fuzz_deflate.yml index ea00211b..354a90a8 100644 --- a/.github/workflows/fuzz_deflate.yml +++ b/.github/workflows/fuzz_deflate.yml @@ -30,8 +30,8 @@ jobs: - name: Install run: cargo install cargo-fuzz - name: Fuzz deflate - run: cargo +nightly fuzz run --fuzz-dir zune-inflate/fuzz roundtrip fuzz-corpus/inflate -j2 -- -timeout=10s -max_total_time=120 + run: cargo +nightly fuzz run --fuzz-dir crates/zune-inflate/fuzz roundtrip fuzz-corpus/inflate -j2 -- -timeout=10s -max_total_time=120 - name: Fuzz zlib - run: cargo +nightly fuzz run --fuzz-dir zune-inflate/fuzz roundtrip_zlib fuzz-corpus/inflate -j2 -- -timeout=10s -max_total_time=120 + run: cargo +nightly fuzz run --fuzz-dir crates/zune-inflate/fuzz roundtrip_zlib fuzz-corpus/inflate -j2 -- -timeout=10s -max_total_time=120 - name: Normal Fuzz testing. - run: cargo +nightly fuzz run --fuzz-dir zune-inflate/fuzz decode_buffer fuzz-corpus/inflate -j2 -- -timeout=10s -max_total_time=120 + run: cargo +nightly fuzz run --fuzz-dir crates/zune-inflate/fuzz decode_buffer fuzz-corpus/inflate -j2 -- -timeout=10s -max_total_time=120 diff --git a/.github/workflows/fuzz_hdr.yml b/.github/workflows/fuzz_hdr.yml index e41bd5d9..b560f4dd 100644 --- a/.github/workflows/fuzz_hdr.yml +++ b/.github/workflows/fuzz_hdr.yml @@ -32,5 +32,5 @@ jobs: run: cargo install cargo-fuzz - name: Normal Fuzz testing. - run: cargo +nightly fuzz run --fuzz-dir zune-hdr/fuzz decode_buffer -j2 -- -timeout=10s test-images/hdr -max_total_time=120 + run: cargo +nightly fuzz run --fuzz-dir crates/zune-hdr/fuzz decode_buffer -j2 -- -timeout=10s test-images/hdr -max_total_time=120 diff --git a/.github/workflows/fuzz_png.yml b/.github/workflows/fuzz_png.yml index b794ac63..d4bb6c18 100644 --- a/.github/workflows/fuzz_png.yml +++ b/.github/workflows/fuzz_png.yml @@ -32,4 +32,4 @@ jobs: run: cargo install cargo-fuzz - name: Normal Fuzz testing. - run: cargo +nightly fuzz run --fuzz-dir zune-png/fuzz decode_buffer fuzz-corpus/png -j2 -- -timeout=10s -max_total_time=120 + run: cargo +nightly fuzz run --fuzz-dir crates/zune-png/fuzz decode_buffer fuzz-corpus/png -j2 -- -timeout=10s -max_total_time=120 diff --git a/.github/workflows/fuzz_ppm.yml b/.github/workflows/fuzz_ppm.yml index 45b25e20..e4eb6c03 100644 --- a/.github/workflows/fuzz_ppm.yml +++ b/.github/workflows/fuzz_ppm.yml @@ -32,4 +32,4 @@ jobs: run: cargo install cargo-fuzz - name: Normal Fuzz testing. - run: cargo +nightly fuzz run --fuzz-dir zune-ppm/fuzz decode_buffer -j2 -- -timeout=10s -max_total_time=60 + run: cargo +nightly fuzz run --fuzz-dir crates/zune-ppm/fuzz decode_buffer -j2 -- -timeout=10s -max_total_time=60 diff --git a/.github/workflows/fuzz_psd.yml b/.github/workflows/fuzz_psd.yml index 969871ff..c0597635 100644 --- a/.github/workflows/fuzz_psd.yml +++ b/.github/workflows/fuzz_psd.yml @@ -32,4 +32,4 @@ jobs: run: cargo install cargo-fuzz - name: Normal Fuzz testing. - run: cargo +nightly fuzz run --fuzz-dir zune-psd/fuzz decode_buffer test-images/psd -j2 -- -timeout=10s -max_total_time=60 + run: cargo +nightly fuzz run --fuzz-dir crates/zune-psd/fuzz decode_buffer test-images/psd -j2 -- -timeout=10s -max_total_time=60 diff --git a/.github/workflows/fuzz_qoi.yml b/.github/workflows/fuzz_qoi.yml index a59e6846..1a979af1 100644 --- a/.github/workflows/fuzz_qoi.yml +++ b/.github/workflows/fuzz_qoi.yml @@ -32,4 +32,4 @@ jobs: run: cargo install cargo-fuzz - name: QOI Fuzz testing. - run: cargo +nightly fuzz run --fuzz-dir zune-qoi/fuzz decode_buffer test-images/qoi/ -j2 -- -timeout=10s -max_total_time=60 + run: cargo +nightly fuzz run --fuzz-dir crates/zune-qoi/fuzz decode_buffer test-images/qoi/ -j2 -- -timeout=10s -max_total_time=60 diff --git a/Cargo.lock b/Cargo.lock index d80c3d72..4fc4244c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -579,9 +579,9 @@ checksum = "f665ee40bc4a3c5590afb1e9677db74a508659dfd71e126420da8274909a0167" [[package]] name = "memmap2" -version = "0.5.10" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83faa42c0a078c393f6b29d5db232d8be22776a891f8f56e5284faee4a20b327" +checksum = "deaba38d7abf1d4cca21cc89e932e542ba2b9258664d2a9ef0e61512039c9375" dependencies = [ "libc", ] @@ -1442,14 +1442,14 @@ dependencies = [ [[package]] name = "zune-bmp" -version = "0.1.0" +version = "0.4.0" dependencies = [ "zune-core", ] [[package]] name = "zune-core" -version = "0.2.14" +version = "0.4.0" dependencies = [ "log", "serde", @@ -1457,21 +1457,21 @@ dependencies = [ [[package]] name = "zune-farbfeld" -version = "0.2.0" +version = "0.4.0" dependencies = [ "zune-core", ] [[package]] name = "zune-hdr" -version = "0.1.0" +version = "0.4.0" dependencies = [ "zune-core", ] [[package]] name = "zune-image" -version = "0.1.0" +version = "0.4.0" dependencies = [ "bytemuck", "jpeg-encoder", @@ -1493,7 +1493,7 @@ dependencies = [ [[package]] name = "zune-imageprocs" -version = "0.1.0" +version = "0.4.0" dependencies = [ "nanorand", "zune-core", @@ -1501,14 +1501,14 @@ dependencies = [ [[package]] name = "zune-inflate" -version = "0.2.54" +version = "0.2.0" dependencies = [ "simd-adler32", ] [[package]] name = "zune-jpeg" -version = "0.3.17" +version = "0.4.0" dependencies = [ "zune-core", "zune-ppm", @@ -1516,7 +1516,7 @@ dependencies = [ [[package]] name = "zune-jpegxl" -version = "0.1.0" +version = "0.4.0" dependencies = [ "zune-core", "zune-ppm", @@ -1524,7 +1524,7 @@ dependencies = [ [[package]] name = "zune-png" -version = "0.2.1" +version = "0.4.0" dependencies = [ "nanorand", "png", @@ -1535,7 +1535,7 @@ dependencies = [ [[package]] name = "zune-ppm" -version = "0.1.0" +version = "0.4.0" dependencies = [ "log", "zune-core", @@ -1543,14 +1543,14 @@ dependencies = [ [[package]] name = "zune-psd" -version = "0.1.0" +version = "0.4.0" dependencies = [ "zune-core", ] [[package]] name = "zune-python" -version = "0.1.0" +version = "0.4.0" dependencies = [ "numpy", "pyo3", @@ -1562,7 +1562,7 @@ dependencies = [ [[package]] name = "zune-qoi" -version = "0.1.0" +version = "0.4.0" dependencies = [ "zune-core", ] @@ -1584,7 +1584,7 @@ dependencies = [ [[package]] name = "zune-wasm" -version = "0.1.0" +version = "0.4.0" dependencies = [ "console_error_panic_hook", "wasm-bindgen", diff --git a/benchmarks/Cargo.toml b/benchmarks/Cargo.toml index 406160eb..bddde1d7 100644 --- a/benchmarks/Cargo.toml +++ b/benchmarks/Cargo.toml @@ -7,13 +7,13 @@ edition = "2021" [dev-dependencies] # QOI benchmarks -zune-qoi = { version = "0.1.0", path = "../crates/zune-qoi" } +zune-qoi = { path = "../crates/zune-qoi" } rapid-qoi = "0.6.1" # deflate benchmarks flate2 = { version = "1.0.25", default-features = false, features = ["zlib-ng-compat"] } libdeflater = "1.19.0" -zune-inflate = { version = "0.2.51", path = "../crates/zune-inflate" } +zune-inflate = { path = "../crates/zune-inflate" } # png benchmarks png = { version = "0.17.8-rc" } @@ -24,7 +24,7 @@ zune-png = { path = "../crates/zune-png" } # JPEG benchmarks mozjpeg = "0.10.5" jpeg-decoder = "0.3.0" -zune-jpeg = { version = "0.3.12", path = "../crates/zune-jpeg" } +zune-jpeg = { path = "../crates/zune-jpeg" } #other format zune-image = { path = "../crates/zune-image", features = ["all"] } diff --git a/crates/zune-bin/Cargo.toml b/crates/zune-bin/Cargo.toml index 39a05f7f..3329b862 100644 --- a/crates/zune-bin/Cargo.toml +++ b/crates/zune-bin/Cargo.toml @@ -8,9 +8,9 @@ edition = "2021" [dependencies] log = "0.4.17" -zune-image = { version = "0.1.0", path = "../zune-image", features = ["all"] } -zune-core = { path = "../zune-core", version = "0.2.1" } -memmap2 = "0.5.7" +zune-image = { version = "0.4.0", path = "../zune-image", features = ["all"] } +zune-core = { path = "../zune-core", version = "0.4" } +memmap2 = "0.9.0" serde_json = "1.0.93" serde = "1.0.152" diff --git a/crates/zune-bmp/Cargo.toml b/crates/zune-bmp/Cargo.toml index 897fc43b..1ab1d149 100644 --- a/crates/zune-bmp/Cargo.toml +++ b/crates/zune-bmp/Cargo.toml @@ -9,4 +9,4 @@ edition = "2021" log = ["zune-core/log"] [dependencies] -zune-core = { version = "0.2", path = "../zune-core" } +zune-core = { version = "0.4", path = "../zune-core" } diff --git a/crates/zune-farbfeld/Cargo.toml b/crates/zune-farbfeld/Cargo.toml index a74ea7f2..99eac510 100644 --- a/crates/zune-farbfeld/Cargo.toml +++ b/crates/zune-farbfeld/Cargo.toml @@ -14,4 +14,4 @@ license = "MIT OR Apache-2.0 OR Zlib" log = ["zune-core/log"] [dependencies] -zune-core = { path = "../zune-core", version = "0.2" } +zune-core = { path = "../zune-core", version = "0.4" } diff --git a/crates/zune-hdr/Cargo.toml b/crates/zune-hdr/Cargo.toml index 40e339fa..03efac6d 100644 --- a/crates/zune-hdr/Cargo.toml +++ b/crates/zune-hdr/Cargo.toml @@ -9,4 +9,4 @@ edition = "2021" log = ["zune-core/log"] [dependencies] -zune-core = { version = "0.2.13", path = "../zune-core", default-features = false } \ No newline at end of file +zune-core = { version = "0.4.0", path = "../zune-core", default-features = false } \ No newline at end of file diff --git a/crates/zune-hdr/fuzz/Cargo.lock b/crates/zune-hdr/fuzz/Cargo.lock index df8fc6ca..0a6a9bfd 100644 --- a/crates/zune-hdr/fuzz/Cargo.lock +++ b/crates/zune-hdr/fuzz/Cargo.lock @@ -8,34 +8,22 @@ version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e2d098ff73c1ca148721f37baad5ea6a465a13f9573aba8641fbbbae8164a54e" -[[package]] -name = "bitflags" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c70beb79cbb5ce9c4f8e20849978f34225931f665bb49efa6982875a4d5facb3" - [[package]] name = "cc" version = "1.0.79" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f" dependencies = [ - "jobserver", + "jobserver", ] -[[package]] -name = "cfg-if" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" - [[package]] name = "jobserver" version = "0.1.26" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "936cfd212a0155903bcbc060e316fb6cc7cbf2e1907329391ebadc1fe0ce77c2" dependencies = [ - "libc", + "libc", ] [[package]] @@ -50,18 +38,9 @@ version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "beb09950ae85a0a94b27676cccf37da5ff13f27076aa1adbc6545dd0d0e1bd4e" dependencies = [ - "arbitrary", - "cc", - "once_cell", -] - -[[package]] -name = "log" -version = "0.4.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e" -dependencies = [ - "cfg-if", + "arbitrary", + "cc", + "once_cell", ] [[package]] @@ -70,32 +49,21 @@ version = "1.17.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b7e5500299e16ebb147ae15a00a942af264cf3688f47923b8fc2cd5858f23ad3" -[[package]] -name = "serde" -version = "1.0.160" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb2f3770c8bce3bcda7e149193a069a0f4365bda1fa5cd88e03bca26afc1216c" - [[package]] name = "zune-core" -version = "0.2.13" -dependencies = [ - "bitflags", - "serde", -] +version = "0.4.0" [[package]] name = "zune-hdr" -version = "0.1.0" +version = "0.4.0" dependencies = [ - "log", - "zune-core", + "zune-core", ] [[package]] name = "zune-hdr-fuzz" version = "0.0.0" dependencies = [ - "libfuzzer-sys", - "zune-hdr", + "libfuzzer-sys", + "zune-hdr", ] diff --git a/crates/zune-image/Cargo.toml b/crates/zune-image/Cargo.toml index d7c19b49..43e687f6 100644 --- a/crates/zune-image/Cargo.toml +++ b/crates/zune-image/Cargo.toml @@ -36,7 +36,7 @@ all = ["image_formats", "serde-support", "metadata", "threads", "filters", "simd [dependencies] zune-imageprocs = { path = "../zune-imageprocs", optional = true } # Core primitives -zune-core = { path = "../zune-core", version = "0.2" } +zune-core = { path = "../zune-core", version = "0.4" } # Images zune-png = { path = "../zune-png", optional = true } zune-jpeg = { path = "../zune-jpeg", optional = true } diff --git a/crates/zune-imageprocs/Cargo.toml b/crates/zune-imageprocs/Cargo.toml index 9815fd97..775dfcd1 100644 --- a/crates/zune-imageprocs/Cargo.toml +++ b/crates/zune-imageprocs/Cargo.toml @@ -6,7 +6,7 @@ edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -zune-core = { path = "../zune-core", version = "0.2" } +zune-core = { path = "../zune-core", version = "0.4" } [features] diff --git a/crates/zune-inflate/Cargo.toml b/crates/zune-inflate/Cargo.toml index 041ca05e..ce500e5a 100644 --- a/crates/zune-inflate/Cargo.toml +++ b/crates/zune-inflate/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "zune-inflate" -version = "0.4.0" +version = "0.2.0" edition = "2021" description = "A heavily optimized deflate decompressor in Pure Rust" exclude = ["tests/"] diff --git a/crates/zune-jpeg/Cargo.toml b/crates/zune-jpeg/Cargo.toml index 62227bf7..da670a10 100644 --- a/crates/zune-jpeg/Cargo.toml +++ b/crates/zune-jpeg/Cargo.toml @@ -21,7 +21,7 @@ log = ["zune-core/log"] default = ["x86", "neon", "std"] [dependencies] -zune-core = { path = "../zune-core", version = "0.2" } +zune-core = { path = "../zune-core", version = "0.4" } [dev-dependencies] diff --git a/crates/zune-jpegxl/Cargo.toml b/crates/zune-jpegxl/Cargo.toml index 19ca1274..4160058a 100644 --- a/crates/zune-jpegxl/Cargo.toml +++ b/crates/zune-jpegxl/Cargo.toml @@ -6,7 +6,7 @@ edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -zune-core = { version = "0.2.1", path = "../zune-core" } +zune-core = { version = "0.4", path = "../zune-core" } [features] threads = [] diff --git a/crates/zune-png/Cargo.toml b/crates/zune-png/Cargo.toml index cd6a2314..8183bd99 100644 --- a/crates/zune-png/Cargo.toml +++ b/crates/zune-png/Cargo.toml @@ -20,7 +20,7 @@ log = ["zune-core/log"] default = ["sse", "std"] [dependencies] -zune-core = { path = "../zune-core", version = "0.2" } +zune-core = { path = "../zune-core", version = "0.4" } zune-inflate = { path = "../zune-inflate", version = "0.2", default-features = false, features = ["zlib"] } [dev-dependencies] diff --git a/crates/zune-ppm/Cargo.toml b/crates/zune-ppm/Cargo.toml index e05928ca..bf0bac4b 100644 --- a/crates/zune-ppm/Cargo.toml +++ b/crates/zune-ppm/Cargo.toml @@ -9,5 +9,5 @@ edition = "2021" log = ["zune-core/log"] [dependencies] -zune-core = { path = "../zune-core", version = "0.2.1" } +zune-core = { path = "../zune-core", version = "0.4" } log = "0.4.17" \ No newline at end of file diff --git a/crates/zune-ppm/fuzz/Cargo.lock b/crates/zune-ppm/fuzz/Cargo.lock new file mode 100644 index 00000000..0228704c --- /dev/null +++ b/crates/zune-ppm/fuzz/Cargo.lock @@ -0,0 +1,77 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +version = 3 + +[[package]] +name = "arbitrary" +version = "1.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a2e1373abdaa212b704512ec2bd8b26bd0b7d5c3f70117411a5d9a451383c859" + +[[package]] +name = "cc" +version = "1.0.83" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0" +dependencies = [ + "jobserver", + "libc", +] + +[[package]] +name = "jobserver" +version = "0.1.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8c37f63953c4c63420ed5fd3d6d398c719489b9f872b9fa683262f8edd363c7d" +dependencies = [ + "libc", +] + +[[package]] +name = "libc" +version = "0.2.149" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a08173bc88b7955d1b3145aa561539096c421ac8debde8cbc3612ec635fee29b" + +[[package]] +name = "libfuzzer-sys" +version = "0.4.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a96cfd5557eb82f2b83fed4955246c988d331975a002961b07c81584d107e7f7" +dependencies = [ + "arbitrary", + "cc", + "once_cell", +] + +[[package]] +name = "log" +version = "0.4.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" + +[[package]] +name = "once_cell" +version = "1.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" + +[[package]] +name = "zune-core" +version = "0.4.0" + +[[package]] +name = "zune-ppm" +version = "0.4.0" +dependencies = [ + "log", + "zune-core", +] + +[[package]] +name = "zune-ppm-fuzz" +version = "0.0.0" +dependencies = [ + "libfuzzer-sys", + "zune-ppm", +] diff --git a/crates/zune-psd/Cargo.toml b/crates/zune-psd/Cargo.toml index e9497c06..244a986f 100644 --- a/crates/zune-psd/Cargo.toml +++ b/crates/zune-psd/Cargo.toml @@ -9,4 +9,4 @@ edition = "2021" log = ["zune-core/log"] [dependencies] -zune-core = { path = "../zune-core", version = "0.2.1" } +zune-core = { path = "../zune-core", version = "0.4" } diff --git a/crates/zune-qoi/Cargo.toml b/crates/zune-qoi/Cargo.toml index 536b1156..da6ae969 100644 --- a/crates/zune-qoi/Cargo.toml +++ b/crates/zune-qoi/Cargo.toml @@ -9,4 +9,4 @@ edition = "2021" log = ["zune-core/log"] [dependencies] -zune-core = { path = "../zune-core", version = "0.2.1" } +zune-core = { path = "../zune-core", version = "0.4" } diff --git a/crates/zune-wasm/Cargo.toml b/crates/zune-wasm/Cargo.toml index ecefda1a..9eb7376d 100644 --- a/crates/zune-wasm/Cargo.toml +++ b/crates/zune-wasm/Cargo.toml @@ -14,7 +14,7 @@ default = ["console_error_panic_hook"] [dependencies] wasm-bindgen = "0.2.63" zune-image = { path = "../zune-image", features = ["image_formats"] } -zune-core = { path = "../zune-core", version = "0.2.1" } +zune-core = { path = "../zune-core", version = "0.4" } # The `console_error_panic_hook` crate provides better debugging of panics by # logging them with `console.error`. This is great for development, but requires # all the `std::fmt` and `std::panicking` infrastructure, so isn't great for diff --git a/tests/Cargo.toml b/tests/Cargo.toml index e1a50467..44d527f4 100644 --- a/tests/Cargo.toml +++ b/tests/Cargo.toml @@ -9,9 +9,9 @@ edition = "2021" xxhash-rust = { version = "0.8.6", default-features = false, features = ["xxh3"] } serde = { version = "1.0.147", features = ["derive"] } serde_json = "1.0.94" -zune-core = { version = "0.2.1", path = "../crates/zune-core" } -zune-jpeg = { version = "0.3.12", path = "../crates/zune-jpeg" } -zune-psd = { version = "0.1.0", path = "../crates/zune-psd" } -zune-png = { version = "0.2.0", path = "../crates/zune-png" } -zune-inflate = { version = "0.2.51", path = "../crates/zune-inflate" } -zune-bmp = { version = "0.1.0", path = "../crates/zune-bmp" } +zune-core = { path = "../crates/zune-core" } +zune-jpeg = { path = "../crates/zune-jpeg" } +zune-psd = { path = "../crates/zune-psd" } +zune-png = { path = "../crates/zune-png" } +zune-inflate = { path = "../crates/zune-inflate" } +zune-bmp = { path = "../crates/zune-bmp" }