Index: dm/DMSrcSink.cpp |
diff --git a/dm/DMSrcSink.cpp b/dm/DMSrcSink.cpp |
index 3f4667931bdbe503e8c05e771c995fe4ea4b6d89..6fd46c80ed99a3b299ad139b0b6bfe5192a5e0fa 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()); |