Merge pull request #318 from o2sh/dependabot/cargo/image-0.23.12

Author: dependabot[bot]

Cargo.lock

@@ -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"

Cargo.toml

@@ -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");

src/onefetch/image_backends/kitty.rs

@@ -14,12 +14,12 @@ pub trait ImageBackend {
 
 #[cfg(not(windows))]
 pub fn get_best_backend() -> Option<Box<dyn ImageBackend>> {
-    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
     }

src/onefetch/image_backends/mod.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