From d470578e2531093a051fad3513044e3b6608a2f1 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 19 Nov 2020 06:21:46 +0000 Subject: [PATCH 1/3] Bump image from 0.23.11 to 0.23.12 Bumps [image](https://github.com/image-rs/image) from 0.23.11 to 0.23.12. - [Release notes](https://github.com/image-rs/image/releases) - [Changelog](https://github.com/image-rs/image/blob/master/CHANGES.md) - [Commits](https://github.com/image-rs/image/compare/v0.23.11...v0.23.12) Signed-off-by: dependabot[bot] --- Cargo.lock | 4 ++-- Cargo.toml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index b10554c11..51b81615f 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -692,9 +692,9 @@ dependencies = [ [[package]] name = "image" -version = "0.23.11" +version = "0.23.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4f0a8345b33b082aedec2f4d7d4a926b845cee184cbe78b703413066564431b" +checksum = "7ce04077ead78e39ae8610ad26216aed811996b043d47beed5090db674f9e9b5" dependencies = [ "bytemuck", "byteorder", diff --git a/Cargo.toml b/Cargo.toml index 27ba0f284..0b48bc7ac 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -28,7 +28,7 @@ askalono = "0.4.3" bytecount = "0.6.0" clap = "2.33.3" strum = { version = "0.19.5", features = ["derive"] } -image = "0.23.11" +image = "0.23.12" regex = "1" error-chain = "0.12" toml = "0.5.7" From 0428be2d4961b294f589fee235c8d6757f58bbf9 Mon Sep 17 00:00:00 2001 From: o2sh Date: Thu, 19 Nov 2020 19:13:32 +0100 Subject: [PATCH 2/3] fix deprecated call to_rgba --> to_rgba8 --- src/onefetch/image_backends/kitty.rs | 2 +- src/onefetch/image_backends/mod.rs | 6 +++--- src/onefetch/image_backends/sixel.rs | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/onefetch/image_backends/kitty.rs b/src/onefetch/image_backends/kitty.rs index 9a24cfbcc..775e2131f 100644 --- a/src/onefetch/image_backends/kitty.rs +++ b/src/onefetch/image_backends/kitty.rs @@ -98,7 +98,7 @@ impl super::ImageBackend for KittyBackend { let image_rows = height_ratio * f64::from(image.height()); // convert the image to rgba samples - let rgba_image = image.to_rgba(); + let rgba_image = image.to_rgba8(); let flat_samples = rgba_image.as_flat_samples(); let raw_image = flat_samples.image_slice().expect("Conversion from image to rgba samples failed"); diff --git a/src/onefetch/image_backends/mod.rs b/src/onefetch/image_backends/mod.rs index ef0fed95d..e7459f43a 100644 --- a/src/onefetch/image_backends/mod.rs +++ b/src/onefetch/image_backends/mod.rs @@ -14,12 +14,12 @@ pub trait ImageBackend { #[cfg(not(windows))] pub fn get_best_backend() -> Option> { - if kitty::KittyBackend::supported() { + if sixel::SixelBackend::supported() { + Some(Box::new(sixel::SixelBackend::new())) + }else if kitty::KittyBackend::supported() { Some(Box::new(kitty::KittyBackend::new())) } else if iterm::ITermBackend::supported() { Some(Box::new(iterm::ITermBackend::new())) - } else if sixel::SixelBackend::supported() { - Some(Box::new(sixel::SixelBackend::new())) } else { None } diff --git a/src/onefetch/image_backends/sixel.rs b/src/onefetch/image_backends/sixel.rs index 592ffff5d..a9f05e074 100644 --- a/src/onefetch/image_backends/sixel.rs +++ b/src/onefetch/image_backends/sixel.rs @@ -91,7 +91,7 @@ impl super::ImageBackend for SixelBackend { let image_columns = width_ratio * image.width() as f64; let image_rows = height_ratio * image.height() as f64; - let rgba_image = image.to_rgba(); // convert the image to rgba samples + let rgba_image = image.to_rgba8(); // convert the image to rgba samples let flat_samples = rgba_image.as_flat_samples(); let mut rgba_image = rgba_image.clone(); // reduce the amount of colors using dithering From 8b3cd82502d8f973dc0114c24ec3d194aa5b8b81 Mon Sep 17 00:00:00 2001 From: o2sh Date: Thu, 19 Nov 2020 19:20:42 +0100 Subject: [PATCH 3/3] cargo fmt --- src/onefetch/image_backends/mod.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/onefetch/image_backends/mod.rs b/src/onefetch/image_backends/mod.rs index e7459f43a..fcc6a9a8c 100644 --- a/src/onefetch/image_backends/mod.rs +++ b/src/onefetch/image_backends/mod.rs @@ -16,7 +16,7 @@ pub trait ImageBackend { pub fn get_best_backend() -> Option> { if sixel::SixelBackend::supported() { Some(Box::new(sixel::SixelBackend::new())) - }else if kitty::KittyBackend::supported() { + } else if kitty::KittyBackend::supported() { Some(Box::new(kitty::KittyBackend::new())) } else if iterm::ITermBackend::supported() { Some(Box::new(iterm::ITermBackend::new()))