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

fix: nativeImage.crop().toBitmap() returning garbage (#25757)

Browse source
This commit is contained in:
Jeremy Rose 2020-10-04 18:15:16 -07:00 committed by GitHub
parent a189dc779e
commit 485adae94c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 20 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
shell/common/api/electron_api_native_image.cc
View file

@ -183,14 +183,21 @@ v8::Local<v8::Value> NativeImage::ToBitmap(gin::Arguments* args) {
const SkBitmap bitmap = const SkBitmap bitmap =
image_.AsImageSkia().GetRepresentation(scale_factor).GetBitmap(); image_.AsImageSkia().GetRepresentation(scale_factor).GetBitmap();
SkPixelRef* ref = bitmap.pixelRef();
if (!ref) SkImageInfo info =
return node::Buffer::New(args->isolate(), 0).ToLocalChecked(); SkImageInfo::MakeN32Premul(bitmap.width(), bitmap.height());
return node::Buffer::Copy(args->isolate(),
reinterpret_cast<const char*>(ref->pixels()), auto array_buffer =
bitmap.computeByteSize()) v8::ArrayBuffer::New(args->isolate(), info.computeMinByteSize());
auto backing_store = array_buffer->GetBackingStore();
if (bitmap.readPixels(info, backing_store->Data(), info.minRowBytes(), 0,
0)) {
return node::Buffer::New(args->isolate(), array_buffer, 0,
info.computeMinByteSize())
.ToLocalChecked(); .ToLocalChecked();
} }
return node::Buffer::New(args->isolate(), 0).ToLocalChecked();
}
v8::Local<v8::Value> NativeImage::ToJPEG(v8::Isolate* isolate, int quality) { v8::Local<v8::Value> NativeImage::ToJPEG(v8::Isolate* isolate, int quality) {
std::vector<unsigned char> output; std::vector<unsigned char> output;

6
spec/api-native-image-spec.js
View file

@ -468,6 +468,12 @@ describe('nativeImage module', () => {
expect(cropB.getSize()).to.deep.equal({ width: 25, height: 64 }); expect(cropB.getSize()).to.deep.equal({ width: 25, height: 64 });
expect(cropA.toPNG().equals(cropB.toPNG())).to.be.false(); expect(cropA.toPNG().equals(cropB.toPNG())).to.be.false();
}); });
it('toBitmap() returns a buffer of the right size', () => {
const image = nativeImage.createFromPath(path.join(__dirname, 'fixtures', 'assets', 'logo.png'));
const crop = image.crop({ width: 25, height: 64, x: 0, y: 0 });
expect(crop.toBitmap().length).to.equal(25 * 64 * 4);
});
}); });
describe('getAspectRatio()', () => { describe('getAspectRatio()', () => {