Skip to content

Return a conversion failure error when CGImageCreate fails #205

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
complexspaces merged 1 commit into from
Sep 12, 2025
Merged

Return a conversion failure error when CGImageCreate fails #205

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
15 changes: 11 additions & 4 deletions src/platform/osx.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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,
Expand All @@ -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 {
Expand Down Expand Up @@ -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();

Expand Down
Loading