mirrors/arboard
1
0
Fork 0
mirror of https://github.com/1Password/arboard.git synced 2025-12-23 06:01:09 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Return a conversion failure error when CGImageCreate fails
Some checks failed
Test / rustfmt (push) Failing after 3s
Details
Test / test (windows-latest) (push) Has been skipped
Details
Test / miri (windows-latest) (push) Has been skipped
Details
Test / test (macos-latest) (push) Has been skipped
Details
Test / clippy (macos-latest, 1.71.0) (push) Has been skipped
Details
Test / clippy (macos-latest, stable) (push) Has been skipped
Details
Test / clippy (ubuntu-latest, 1.71.0) (push) Has been skipped
Details
Test / clippy (ubuntu-latest, stable) (push) Has been skipped
Details
Test / clippy (windows-latest, 1.71.0) (push) Has been skipped
Details
Test / clippy (windows-latest, stable) (push) Has been skipped
Details
Test / semver (push) Has been cancelled
Details

Browse source
This commit is contained in:
ComplexSpaces 2025-09-12 02:18:09 -05:00
parent a3750c79a5
commit 223f4efc7a
1 changed files with 11 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/platform/osx.rs
View file

@ -34,7 +34,7 @@ fn image_from_pixels(
pixels: Vec<u8>,
width: usize,
height: usize,
) -> Retained<objc2_app_kit::NSImage> {
) -> Result<Retained<objc2_app_kit::NSImage>, Error> {
use objc2::AllocAnyThread;
use objc2_app_kit::NSImage;
use objc2_core_foundation::CGFloat;
@ -70,6 +70,13 @@ fn image_from_pixels(
let colorspace = unsafe { CGColorSpaceCreateDeviceRGB() }.unwrap();
// XXX: If this returns an error, try running your application from the command line or
// use `Console.app`. For the later, make sure that before you start streaming log messages
// that Action -> `Include Info Messages` and Action -> `Include Debug Messages` are both
// enabled in the menubar. CoreGraphics will write debugging/error information to these places.
//
// - https://redsweater.com/blog/129/coregraphics-log-jam
// - https://github.com/1Password/arboard/issues/204
let cg_image = unsafe {
CGImageCreate(
width,
@ -85,10 +92,10 @@ fn image_from_pixels(
CGColorRenderingIntent::RenderingIntentDefault,
)
}
.unwrap();
.ok_or(Error::ConversionFailure)?;
let size = NSSize { width: width as CGFloat, height: height as CGFloat };
unsafe { NSImage::initWithCGImage_size(NSImage::alloc(), &cg_image, size) }
Ok(unsafe { NSImage::initWithCGImage_size(NSImage::alloc(), &cg_image, size) })
}
pub(crate) struct Clipboard {
@ -335,7 +342,7 @@ impl<'clipboard> Set<'clipboard> {
#[cfg(feature = "image-data")]
pub(crate) fn image(self, data: ImageData) -> Result<(), Error> {
let pixels = data.bytes.into();
let image = image_from_pixels(pixels, data.width, data.height);
let image = image_from_pixels(pixels, data.width, data.height)?;
self.clipboard.clear();