diff options
| author |  mtklein <mtklein@chromium.org> | 2016-03-22 11:46:53 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-03-22 11:46:53 -0700 |
| commit | 343a63d082bda969d7e8a4e09ba850e931185269 (patch) | |
| tree | aa2a1e863307c6dd6d4499a7a09fb40115b189d8 /dm/DMSrcSink.cpp | |
| parent | d33fe1f1f91a44458ee1a35a83788df74df16c07 (diff) | |
SkRecord: infer return type for visit() and mutate().
Review URL: https://codereview.chromium.org/1824983003
Diffstat (limited to 'dm/DMSrcSink.cpp')
| -rw-r--r-- | dm/DMSrcSink.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/dm/DMSrcSink.cpp b/dm/DMSrcSink.cpp index 3f4667931b..6fd46c80ed 100644 --- a/dm/DMSrcSink.cpp +++ b/dm/DMSrcSink.cpp @@ -842,15 +842,15 @@ Error ImageGenSrc::draw(SkCanvas* canvas) const { canvas->drawImage(image, 0, 0); return ""; } - + // Test various color and alpha types on CPU SkImageInfo decodeInfo = gen->getInfo().makeAlphaType(fDstAlphaType); - + if (kGray_8_SkColorType == decodeInfo.colorType() && kOpaque_SkAlphaType != decodeInfo.alphaType()) { return Error::Nonfatal("Avoid requesting non-opaque kGray8 decodes."); } - + SkAutoTUnref<SkColorTable> colorTable(nullptr); SkPMColor* colorPtr = nullptr; int* colorCountPtr = nullptr; @@ -867,7 +867,7 @@ Error ImageGenSrc::draw(SkCanvas* canvas) const { return SkStringPrintf("Image(%s) is too large (%d x %d)", fPath.c_str(), decodeInfo.width(), decodeInfo.height()); } - + if (!gen->getPixels(decodeInfo, bitmap.getPixels(), bitmap.rowBytes(), colorPtr, colorCountPtr)) { @@ -1508,7 +1508,7 @@ Error ViaSingletonPictures::draw( drawables ? *drawables : empty, }; for (int i = 0; i < skr.count(); i++) { - skr.visit<void>(i, drawsAsSingletonPictures); + skr.visit(i, drawsAsSingletonPictures); } sk_sp<SkPicture> macroPic(macroRec.finishRecordingAsPicture()); |