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

Make NativeImage work with asar archive

Browse source
This commit is contained in:
Cheng Zhao 2015-02-12 19:34:21 +08:00
parent 98a7f08be2
commit 3678f13dfb
3 changed files with 28 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -7,11 +7,11 @@
#include <string>
#include <vector>
#include "atom/common/asar/asar_util.h"
#include "atom/common/native_mate_converters/file_path_converter.h"
#include "atom/common/native_mate_converters/gfx_converter.h"
#include "atom/common/native_mate_converters/gurl_converter.h"
#include "base/base64.h"
#include "base/files/file_util.h"
#include "base/strings/string_util.h"
#include "native_mate/dictionary.h"
#include "native_mate/object_template_builder.h"
@ -86,7 +86,7 @@ bool AddImageSkiaRep(gfx::ImageSkia* image,
const base::FilePath& path,
double scale_factor) {
std::string file_contents;
if (!base::ReadFileToString(path, &file_contents))
if (!asar::ReadFileToString(path, &file_contents))
return false;
const unsigned char* data =