Merge pull request #22 from alexwlchan/bump-palette

Bump the version of kmeans-colors and palette

Author: alexwlchan

CHANGELOG.md

@@ -1,8 +1,14 @@
 # Changelog
 
+## v1.1.8 - 2022-10-24
+
+More internal refactoring to use newer versions of kmeans-colors and palette.
+
+This has no feature changes.
+
 ## v1.1.7 - 2022-10-24
 
-Some internal refactoring to use newer versions of libraries.
+Some internal refactoring to use a newer versions of clap.
 
 This has no feature changes.
 

Cargo.lock

@@ -1,14 +1,14 @@
 [package]
 name = "dominant_colours"
-version = "1.1.7"
+version = "1.1.8"
 edition = "2018"
 
 [dependencies]
 assert_cmd = "2.0.5"
 clap = "4.0.18"
 
 [dependencies.kmeans_colors]
-version = "0.4.0"
+version = "0.5.0"
 features = ["palette_color"]
 default-features = false
 
@@ -18,6 +18,6 @@ features = ["jpeg", "png", "gif", "tiff"]
 default-features = false
 
 [dependencies.palette]
-version = "0.5"
+version = "0.6"
 default-features = false
 features = ["std"]

Cargo.toml

@@ -4,7 +4,7 @@
 extern crate clap;
 
 use kmeans_colors::get_kmeans_hamerly;
-use palette::{Lab, Pixel, Srgb, Srgba};
+use palette::{FromColor, IntoColor, Lab, Pixel, Srgb, Srgba};
 
 mod cli;
 mod get_bytes;
@@ -30,10 +30,10 @@ 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/9960c55dbc572e08d564dc341d6fd7e66fa79b5e/src/bin/kmeans_colors/app.rs
+    // 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)
         .iter()
-        .map(|x| x.into_format().into())
+        .map(|x| x.into_format::<_, f32>().into_color())
         .collect();
 
     let max_iterations = 20;
@@ -46,7 +46,7 @@ fn main() {
     let rgb = &result
         .centroids
         .iter()
-        .map(|x| Srgb::from(*x).into_format())
+        .map(|x| Srgb::from_color(*x).into_format())
         .collect::<Vec<Srgb<u8>>>();
 
     // This uses ANSI escape sequences and Unicode block elements to print