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

Return empty buffers when image is empty

Browse source
This commit is contained in:
Kevin Sawicki 2017-01-25 13:22:44 -08:00
parent 2ad46f1842
commit e1281342f6
1 changed files with 6 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
atom/common/api/atom_api_native_image.cc
View file

@ -238,6 +238,8 @@ v8::Local<v8::Value> NativeImage::ToPNG(v8::Isolate* isolate) {
}
v8::Local<v8::Value> NativeImage::ToBitmap(v8::Isolate* isolate) {
if (IsEmpty()) return node::Buffer::New(isolate, 0).ToLocalChecked();
const SkBitmap* bitmap = image_.ToSkBitmap();
SkPixelRef* ref = bitmap->pixelRef();
return node::Buffer::Copy(isolate,
@ -264,6 +266,8 @@ std::string NativeImage::ToDataURL() {
}
v8::Local<v8::Value> NativeImage::GetBitmap(v8::Isolate* isolate) {
if (IsEmpty()) return node::Buffer::New(isolate, 0).ToLocalChecked();
const SkBitmap* bitmap = image_.ToSkBitmap();
SkPixelRef* ref = bitmap->pixelRef();
return node::Buffer::New(isolate,
@ -276,6 +280,8 @@ v8::Local<v8::Value> NativeImage::GetBitmap(v8::Isolate* isolate) {
v8::Local<v8::Value> NativeImage::GetNativeHandle(v8::Isolate* isolate,
mate::Arguments* args) {
#if defined(OS_MACOSX)
if (IsEmpty()) return node::Buffer::New(isolate, 0).ToLocalChecked();
NSImage* ptr = image_.AsNSImage();
return node::Buffer::Copy(
isolate,