From b109b8c5ec40a7dd85a0a2951a1f98fa63b805aa Mon Sep 17 00:00:00 2001 From: brianosman Date: Thu, 16 Jun 2016 13:03:24 -0700 Subject: Lots of progress on switching to SkColorSpace rather than SkColorProfileType Fixed a bunch of code in Ganesh, as well as usage of SkColorProfileType in most of our tools (DM, SampleApp, Viewer, nanobench, skiaserve, HelloWorld). BUG=skia: GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2069173002 Committed: https://skia.googlesource.com/skia/+/6a61a875467646f8dbc37cfecf49e12d1f475170 Review-Url: https://codereview.chromium.org/2069173002 --- example/HelloWorld.cpp | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) (limited to 'example') diff --git a/example/HelloWorld.cpp b/example/HelloWorld.cpp index c2dd7d89f1..32bee5dccd 100644 --- a/example/HelloWorld.cpp +++ b/example/HelloWorld.cpp @@ -155,13 +155,9 @@ void HelloWorldWindow::draw(SkCanvas* canvas) { if (snap->peekPixels(&pmap)) { const SkImageInfo& info = pmap.info(); fRenderTarget->writePixels(0, 0, snap->width(), snap->height(), - SkImageInfo2GrPixelConfig(info.colorType(), - info.alphaType(), - info.profileType(), - *fContext->caps()), - pmap.addr(), - pmap.rowBytes(), - GrContext::kFlushWrites_PixelOp); + SkImageInfo2GrPixelConfig(info, *fContext->caps()), + pmap.addr(), pmap.rowBytes(), + GrContext::kFlushWrites_PixelOp); } } INHERITED::present(); -- cgit v1.2.3