Skip to content

fix(clipboard-manager): read_image wrongly set the image rgba data with binary PNG data. #1986

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Oct 30, 2024
Merged

fix(clipboard-manager): read_image wrongly set the image rgba data with binary PNG data. #1986

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d13444b
fix(clipboard-manager): `read_image` wrongly set the image rgba data …
RikaKagurasaka Oct 30, 2024
d661999
remove depencency of `image` crate; add patch file
RikaKagurasaka Oct 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 1 addition & 11 deletions plugins/clipboard-manager/src/desktop.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
// SPDX-License-Identifier: MIT

use arboard::ImageData;
use image::ImageEncoder;
use serde::de::DeserializeOwned;
use tauri::{image::Image, plugin::PluginApi, AppHandle, Runtime};

Expand Down Expand Up @@ -85,16 +84,7 @@ impl<R: Runtime> Clipboard<R> {
match &self.clipboard {
Ok(clipboard) => {
let image = clipboard.lock().unwrap().get_image()?;

let mut buffer: Vec<u8> = Vec::new();
image::codecs::png::PngEncoder::new(&mut buffer).write_image(
&image.bytes,
image.width as u32,
image.height as u32,
image::ExtendedColorType::Rgba8,
)?;

let image = Image::new_owned(buffer, 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())),
Expand Down
Loading