From d661999297ae84c5e6f0cc6b5956eb319c171045 Mon Sep 17 00:00:00 2001
From: Rika <tjj.rikap@gmail.com>
Date: Wed, 30 Oct 2024 21:07:24 +0800
Subject: [PATCH] remove depencency of `image` crate; add patch file

---
 .changes/fix-1985.md                     | 5 +++++
 plugins/clipboard-manager/Cargo.toml     | 1 -
 plugins/clipboard-manager/src/desktop.rs | 6 +++++-
 plugins/clipboard-manager/src/error.rs   | 3 ---
 4 files changed, 10 insertions(+), 5 deletions(-)
 create mode 100644 .changes/fix-1985.md

diff --git a/.changes/fix-1985.md b/.changes/fix-1985.md
new file mode 100644
index 00000000..6f0c3999
--- /dev/null
+++ b/.changes/fix-1985.md
@@ -0,0 +1,5 @@
+---
+"clipboard-manager": patch
+---
+
+Fix that `read_image` wrongly set the image rgba data with binary PNG data.
diff --git a/plugins/clipboard-manager/Cargo.toml b/plugins/clipboard-manager/Cargo.toml
index 3c086574..799b6010 100644
--- a/plugins/clipboard-manager/Cargo.toml
+++ b/plugins/clipboard-manager/Cargo.toml
@@ -37,4 +37,3 @@ tauri = { workspace = true, features = ["wry"] }
 
 [target."cfg(any(target_os = \"macos\", windows, target_os = \"linux\", target_os = \"dragonfly\", target_os = \"freebsd\", target_os = \"openbsd\", target_os = \"netbsd\"))".dependencies]
 arboard = "3"
-image = "0.25"
diff --git a/plugins/clipboard-manager/src/desktop.rs b/plugins/clipboard-manager/src/desktop.rs
index 2398efed..5edd4934 100644
--- a/plugins/clipboard-manager/src/desktop.rs
+++ b/plugins/clipboard-manager/src/desktop.rs
@@ -84,7 +84,11 @@ impl<R: Runtime> Clipboard<R> {
         match &self.clipboard {
             Ok(clipboard) => {
                 let image = clipboard.lock().unwrap().get_image()?;
-                let image = Image::new_owned(image.bytes.to_vec(), image.width as u32, image.height as u32);
+                let image = Image::new_owned(
+                    image.bytes.to_vec(),
+                    image.width as u32,
+                    image.height as u32,
+                );
                 Ok(image)
             }
             Err(e) => Err(crate::Error::Clipboard(e.to_string())),
diff --git a/plugins/clipboard-manager/src/error.rs b/plugins/clipboard-manager/src/error.rs
index 7e36a11b..1b8cf482 100644
--- a/plugins/clipboard-manager/src/error.rs
+++ b/plugins/clipboard-manager/src/error.rs
@@ -15,9 +15,6 @@ pub enum Error {
     Clipboard(String),
     #[error(transparent)]
     Tauri(#[from] tauri::Error),
-    #[cfg(desktop)]
-    #[error("invalid image: {0}")]
-    Image(#[from] image::ImageError),
 }
 
 impl Serialize for Error {