Merge pull request #29 from alexwlchan/dependabot/cargo/kmeans_colors-0.6.0
- ID
21ee744- date
2024-05-12 09:17:14+00:00- author
Alex Chan <alex@alexwlchan.net>- parents
f37024b,88eaf60- message
Merge pull request #29 from alexwlchan/dependabot/cargo/kmeans_colors-0.6.0 Bump kmeans_colors from 0.5.0 to 0.6.0- changed files
3 files, 31 additions, 35 deletions
Changed files
Cargo.lock (13692) → Cargo.lock (13655)
diff --git a/Cargo.lock b/Cargo.lock
index a865157..e128919 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -73,6 +73,12 @@ dependencies = [
]
[[package]]
+name = "by_address"
+version = "1.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "64fa3c856b712db6612c019f14756e64e4bcea13337a6b33b696333a9eaa2d06"
+
+[[package]]
name = "bytemuck"
version = "1.12.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -151,13 +157,10 @@ dependencies = [
]
[[package]]
-name = "find-crate"
-version = "0.6.3"
+name = "fast-srgb8"
+version = "1.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "59a98bbaacea1c0eb6a0876280051b892eb73594fd90cf3b20e9c817029c57d2"
-dependencies = [
- "toml",
-]
+checksum = "dd2e7510819d6fbf51a5545c8f922716ecfb14df168a3242f7d33e0239efe6a1"
[[package]]
name = "flate2"
@@ -224,10 +227,11 @@ checksum = "9478aa10f73e7528198d75109c8be5cd7d15fb530238040148d5f9a22d4c5b3b"
[[package]]
name = "kmeans_colors"
-version = "0.5.0"
+version = "0.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1d9f1da1000eb32cea537203e5ea121eb06e66c5e5f3420a1e9f11a57676f55b"
+checksum = "e9a15ffb2811dc35dd7efefc227cf208a68eb8abc76be325d6319eba37747894"
dependencies = [
+ "num-traits",
"palette",
"rand",
"rand_chacha",
@@ -277,9 +281,9 @@ dependencies = [
[[package]]
name = "num-traits"
-version = "0.2.15"
+version = "0.2.19"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd"
+checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841"
dependencies = [
"autocfg",
]
@@ -292,22 +296,22 @@ checksum = "9ff7415e9ae3fff1225851df9e0d9e4e5479f947619774677a63572e55e80eff"
[[package]]
name = "palette"
-version = "0.6.1"
+version = "0.7.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f9cd68f7112581033f157e56c77ac4a5538ec5836a2e39284e65bd7d7275e49"
+checksum = "4cbf71184cc5ecc2e4e1baccdb21026c20e5fc3dcf63028a086131b3ab00b6e6"
dependencies = [
"approx",
- "num-traits",
+ "fast-srgb8",
"palette_derive",
]
[[package]]
name = "palette_derive"
-version = "0.6.1"
+version = "0.7.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "05eedf46a8e7c27f74af0c9cfcdb004ceca158cb1b918c6f68f8d7a549b3e427"
+checksum = "f5030daf005bface118c096f510ffb781fc28f9ab6a32ab224d8631be6851d30"
dependencies = [
- "find-crate",
+ "by_address",
"proc-macro2",
"quote",
"syn",
@@ -360,18 +364,18 @@ dependencies = [
[[package]]
name = "proc-macro2"
-version = "1.0.47"
+version = "1.0.82"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5ea3d908b0e36316caf9e9e2c4625cdde190a7e6f440d794667ed17a1855e725"
+checksum = "8ad3d49ab951a01fbaafe34f2ec74122942fe18a3f9814c3268f1bb72042131b"
dependencies = [
"unicode-ident",
]
[[package]]
name = "quote"
-version = "1.0.21"
+version = "1.0.36"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bbe448f377a7d6961e30f5955f9b8d106c3f5e449d493ee1b125c1d43c2b5179"
+checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7"
dependencies = [
"proc-macro2",
]
@@ -426,9 +430,9 @@ checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623"
[[package]]
name = "syn"
-version = "1.0.102"
+version = "2.0.63"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3fcd952facd492f9be3ef0d0b7032a6e442ee9b361d4acc2b1d0c4aaa5f613a1"
+checksum = "bf5be731623ca1a1fb7d8be6f261a3be6d3e2337b8a1f97be944d020c8fcb704"
dependencies = [
"proc-macro2",
"quote",
@@ -462,15 +466,6 @@ dependencies = [
]
[[package]]
-name = "toml"
-version = "0.5.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8d82e1a7758622a465f8cee077614c73484dac5b836c02ff6a40d5d1010324d7"
-dependencies = [
- "serde",
-]
-
-[[package]]
name = "unicode-ident"
version = "1.0.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
Cargo.toml (417) → Cargo.toml (417)
diff --git a/Cargo.toml b/Cargo.toml
index 41b3ffb..3534433 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -8,7 +8,7 @@ assert_cmd = "2.0.14"
clap = "4.0.18"
[dependencies.kmeans_colors]
-version = "0.5.0"
+version = "0.6.0"
features = ["palette_color"]
default-features = false
@@ -18,6 +18,6 @@ features = ["jpeg", "png", "gif", "tiff"]
default-features = false
[dependencies.palette]
-version = "0.6"
+version = "0.7"
default-features = false
features = ["std"]
src/main.rs (8395) → src/main.rs (8441)
diff --git a/src/main.rs b/src/main.rs
index 867c999..62b8d32 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -4,7 +4,8 @@
extern crate clap;
use kmeans_colors::get_kmeans_hamerly;
-use palette::{FromColor, IntoColor, Lab, Pixel, Srgb, Srgba};
+use palette::cast::from_component_slice;
+use palette::{FromColor, IntoColor, Lab, Srgb, Srgba};
mod cli;
mod get_bytes;
@@ -31,7 +32,7 @@ fn main() {
// This is based on code from the kmeans-colors binary, but with a bunch of
// the options stripped out.
// See https://github.com/okaneco/kmeans-colors/blob/0.5.0/src/bin/kmeans_colors/app.rs
- let lab: Vec<Lab> = Srgba::from_raw_slice(&img_bytes)
+ let lab: Vec<Lab> = from_component_slice::<Srgba<u8>>(&img_bytes)
.iter()
.map(|x| x.into_format::<_, f32>().into_color())
.collect();