AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Missing resources crash SampleFilterQuality.

Browse Source 
The FilterQuality slide segfaults if resources cannot be loaded.
This is particularly noticeable with an Android build, as by
default resources are not available.

Review URL: https://codereview.chromium.org/1422763004
This commit is contained in:
bungeman 2015-11-10 13:29:43 -08:00 committed by Commit bot
parent d472792a72
commit fbd87d611a
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
samplecode/SampleFilterQuality.cpp
View File

@ -41,9 +41,10 @@ static SkShader* make_shader(const SkRect& bounds) {
colors, nullptr, SK_ARRAY_COUNT(colors),
SkShader::kClamp_TileMode);
#else
SkString resourcePath = GetResourcePath("mandrill_128.png");
SkAutoTUnref<SkData> data(SkData::NewFromFileName(resourcePath.c_str()));
SkAutoTUnref<SkImage> image(SkImage::NewFromEncoded(data));
SkAutoTUnref<SkImage> image(GetResourceAsImage("mandrill_128.png"));
if (nullptr == image) {
return nullptr;
}
return image->newShader(SkShader::kClamp_TileMode, SkShader::kClamp_TileMode);
#endif
}
@ -66,7 +67,7 @@ static SkImage* make_image() {
path.moveTo(0, 0); path.lineTo(N, 0); path.lineTo(0, N); path.close();
SkPaint paint;
paint.setShader(make_shader(SkRect::MakeWH(N, N)))->unref();
SkSafeUnref(paint.setShader(make_shader(SkRect::MakeWH(N, N))));
canvas->drawPath(path, paint);
return surface->newImageSnapshot();