mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

fix copy_to conditional

Browse source
This commit is contained in:
Shelley Vohr 2018-04-16 12:14:35 -04:00
parent 90a7b5ebce
commit a19ddfc578
No known key found for this signature in database
GPG key ID: F13993A75599653C
1 changed files with 3 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

7
atom/common/api/atom_api_clipboard.cc
View file

@ -172,10 +172,9 @@ void Clipboard::WriteImage(const gfx::Image& image, mate::Arguments* args) {
SkBitmap orig = image.AsBitmap(); SkBitmap orig = image.AsBitmap();
SkBitmap bmp; SkBitmap bmp;
if (bmp.tryAllocPixels(orig.info())) { if (bmp.tryAllocPixels(orig.info()) &&
orig.readPixels(bmp.info(), bmp.getPixels(), bmp.rowBytes(), 0, 0); orig.readPixels(bmp.info(), bmp.getPixels(), bmp.rowBytes(), 0, 0)) {
} else { writer.WriteImage(bmp);
writer.WriteImage(orig);
} }
} }