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

chore: update CreateSkBitmapFromHICON usage for new API (no pointer)

Browse source 
refs: 1234372
This commit is contained in:
Samuel Attard 2018-10-28 11:11:20 +11:00 • committed by deepak1556
parent c1b9ca14e7
commit 9d72bd4de4
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -195,11 +195,11 @@ base::win::ScopedHICON ReadICOFromPath(int size, const base::FilePath& path) {
bool ReadImageSkiaFromICO(gfx::ImageSkia* image, HICON icon) { bool ReadImageSkiaFromICO(gfx::ImageSkia* image, HICON icon) {
// Convert the icon from the Windows specific HICON to gfx::ImageSkia. // Convert the icon from the Windows specific HICON to gfx::ImageSkia.
std::unique_ptr<SkBitmap> bitmap(IconUtil::CreateSkBitmapFromHICON(icon)); SkBitmap bitmap = IconUtil::CreateSkBitmapFromHICON(icon);
if (!bitmap) if (bitmap.isNull())
return false; return false;
image->AddRepresentation(gfx::ImageSkiaRep(*bitmap, 1.0f)); image->AddRepresentation(gfx::ImageSkiaRep(bitmap, 1.0f));
return true; return true;
} }
#endif #endif