From 88822cc33d4089652081981fcdfef696bc90027c Mon Sep 17 00:00:00 2001 From: owenthewizard Date: Tue, 26 Nov 2024 17:55:09 -0600 Subject: [PATCH] update dependencies --- Cargo.lock | 81 ++++++++++++++++++++++++++--------------------- Cargo.toml | 2 +- src/brightness.rs | 8 ++--- src/overlay.rs | 8 ++--- 4 files changed, 54 insertions(+), 45 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index c0004d6..10ca5af 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -42,15 +42,18 @@ checksum = "0d8c1fef690941d3e7788d328517591fecc684c084084702d6ff1641e993699a" [[package]] name = "bytemuck" -version = "1.15.0" +version = "1.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d6d68c57235a3a081186990eca2867354726650f42f7516ca50c28d6281fd15" +checksum = "8b37c88a63ffd85d15b406896cc343916d7cf57838a847b3a6f2ca5d39a5695a" [[package]] name = "cc" -version = "1.0.90" +version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8cd6604a82acf3039f1144f54b8eb34e91ffba622051189e71b781822d5ee1f5" +checksum = "fd9de9f2205d5ef3fd67e685b0df337994ddd4495e2a28d185500d0e1edfea47" +dependencies = [ + "shlex", +] [[package]] name = "cfg-if" @@ -93,15 +96,15 @@ dependencies = [ [[package]] name = "crossbeam-utils" -version = "0.8.19" +version = "0.8.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "248e3bacc7dc6baa3b21e405ee045c3047101a49145e7e9eca583ab4c2ca5345" +checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80" [[package]] name = "either" -version = "1.10.0" +version = "1.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11157ac094ffbdde99aa67b23417ebdd801842852b500e395a45a9c0aac03e4a" +checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0" [[package]] name = "flate2" @@ -166,9 +169,9 @@ dependencies = [ [[package]] name = "imgref" -version = "1.10.1" +version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44feda355f4159a7c757171a77de25daf6411e217b4cabd03bd6650690468126" +checksum = "d0263a3d970d5c054ed9312c0057b4f3bde9c0b33836d3637361d4a9e6e7a408" [[package]] name = "imgref-iter" @@ -181,30 +184,30 @@ dependencies = [ [[package]] name = "itertools" -version = "0.12.1" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569" +checksum = "413ee7dfc52ee1a4949ceeb7dbc8a33f2d6c088194d9f922fb8318faf1f01186" dependencies = [ "either", ] [[package]] name = "lazy_static" -version = "1.4.0" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" +checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" [[package]] name = "libc" -version = "0.2.153" +version = "0.2.166" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd" +checksum = "c2ccc108bbc0b1331bd061864e7cd823c0cab660bbe6970e66e2c0614decde36" [[package]] name = "memchr" -version = "2.7.1" +version = "2.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "523dc4f511e55ab87b694dc30d0f820d60906ef06413f93d4d7a1385599cc149" +checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" [[package]] name = "miniz-sys" @@ -252,9 +255,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.79" +version = "1.0.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e835ff2298f5721608eb1a980ecaee1aef2c132bf95ecc026a11b7bf3c01c02e" +checksum = "37d3544b3f2748c54e147655edb5025752e2303145b5aefb3c3ea2c78b973bb0" dependencies = [ "unicode-ident", ] @@ -270,18 +273,18 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.35" +version = "1.0.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef" +checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af" dependencies = [ "proc-macro2", ] [[package]] name = "rayon" -version = "1.9.0" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4963ed1bc86e4f3ee217022bd855b297cef07fb9eac5dfa1f788b220b49b3bd" +checksum = "b418a60154510ca1a002a752ca9714984e21e4241e804d32555251faf8b78ffa" dependencies = [ "either", "rayon-core", @@ -299,9 +302,9 @@ dependencies = [ [[package]] name = "rgb" -version = "0.8.37" +version = "0.8.50" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05aaa8004b64fd573fc9d002f4e632d51ad4f026c2b5ba95fcb6c2f32c2c47d8" +checksum = "57397d16646700483b67d2dd6511d79318f9d057fdbd21a4066aeac8b41d310a" dependencies = [ "bytemuck", ] @@ -317,6 +320,12 @@ dependencies = [ "winapi", ] +[[package]] +name = "shlex" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" + [[package]] name = "stackblur-iter" version = "0.2.0" @@ -382,21 +391,21 @@ dependencies = [ [[package]] name = "unicode-ident" -version = "1.0.12" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" +checksum = "adb9e6ca4f869e1180728b7950e35922a7fc6397f7b641499e8f3ef06e50dc83" [[package]] name = "unicode-segmentation" -version = "1.11.0" +version = "1.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202" +checksum = "f6ccf251212114b54433ec949fd6a7841275f9ada20dddd2f29e9ceea4501493" [[package]] name = "unicode-width" -version = "0.1.11" +version = "0.1.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85" +checksum = "7dd6e30e90baa6f72411720665d41d89b9a3d039dc45b8faea1ddd07f617f6af" [[package]] name = "unique" @@ -406,9 +415,9 @@ checksum = "d360722e1f3884f5b14d332185f02ff111f771f0c76a313268fe6af1409aba96" [[package]] name = "version_check" -version = "0.9.4" +version = "0.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" +checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a" [[package]] name = "winapi" @@ -434,9 +443,9 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" [[package]] name = "xcb" -version = "1.3.0" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d27b37e69b8c05bfadcd968eb1a4fe27c9c52565b727f88512f43b89567e262" +checksum = "f1e2f212bb1a92cd8caac8051b829a6582ede155ccb60b5d5908b81b100952be" dependencies = [ "bitflags", "libc", diff --git a/Cargo.toml b/Cargo.toml index 7878176..dc7ffcb 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -21,7 +21,7 @@ maintenance = { status = "actively-developed" } blend-srgb = { version = "0.1", optional = true } imagefmt = { version = "4", default-features = false, optional = true } imgref = "1" -itertools = { version = "0.12", optional = true } +itertools = { version = "0.13", optional = true } libc = "0.2" # should be same as xcb num_cpus = "1" rayon = { version = "1", optional = true } diff --git a/src/brightness.rs b/src/brightness.rs index 591e0c0..253c0b5 100644 --- a/src/brightness.rs +++ b/src/brightness.rs @@ -17,13 +17,13 @@ impl BrightnessAdj for ImgRefMut<'_, BGRA8> { fn brighten(&mut self, amt: NonZeroU8) { #[cfg(not(feature = "threads"))] for pixel in self.pixels_mut() { - *pixel = pixel.map_c(|c| c.saturating_add(amt.get())); + *pixel = pixel.map_colors(|c| c.saturating_add(amt.get())); } #[cfg(feature = "threads")] self.rows_mut().par_bridge().for_each(|row| { for pixel in row.iter_mut() { - *pixel = pixel.map_c(|c| c.saturating_add(amt.get())); + *pixel = pixel.map_colors(|c| c.saturating_add(amt.get())); } }); } @@ -31,13 +31,13 @@ impl BrightnessAdj for ImgRefMut<'_, BGRA8> { fn darken(&mut self, amt: NonZeroU8) { #[cfg(not(feature = "threads"))] for pixel in self.pixels_mut() { - *pixel = pixel.map_c(|c| c.saturating_sub(amt.get())); + *pixel = pixel.map_colors(|c| c.saturating_sub(amt.get())); } #[cfg(feature = "threads")] self.rows_mut().par_bridge().for_each(|row| { for pixel in row.iter_mut() { - *pixel = pixel.map_c(|c| c.saturating_sub(amt.get())); + *pixel = pixel.map_colors(|c| c.saturating_sub(amt.get())); } }); } diff --git a/src/overlay.rs b/src/overlay.rs index adbbf3b..eaa4780 100644 --- a/src/overlay.rs +++ b/src/overlay.rs @@ -74,7 +74,7 @@ impl Compose for ImgRefMut<'_, BGRA8> { .zip(m.pixels()) .filter(|(_, mask_px)| mask_px.a > MASK_THRESHOLD) { - *view_px = view_px.map_c(|c| !c); + *view_px = view_px.map_colors(|c| !c); } #[cfg(feature = "threads")] @@ -86,19 +86,19 @@ impl Compose for ImgRefMut<'_, BGRA8> { .zip(mask_row.iter().copied()) .filter(|(_, mask_px)| mask_px.a > MASK_THRESHOLD) { - *view_px = view_px.map_c(|c| !c); + *view_px = view_px.map_colors(|c| !c); } }); } else { #[cfg(not(feature = "threads"))] for pixel in self.pixels_mut() { - *pixel = pixel.map_c(|c| !c); + *pixel = pixel.map_colors(|c| !c); } #[cfg(feature = "threads")] self.rows_mut().par_bridge().for_each(|r| { for pixel in r.iter_mut() { - *pixel = pixel.map_c(|c| !c); + *pixel = pixel.map_colors(|c| !c); } }); }