From c87cfb674bcaf27062dd11f88f1337af70173a11 Mon Sep 17 00:00:00 2001 From: Brian Osman Date: Wed, 11 Jul 2018 09:08:46 -0400 Subject: Remove old lazy image decoding heuristic logic This led to removing a lot of transfer function behavior code. There is more that could be done, and we need to add in decoding to dst color space, but this CL is almost entirely mechanical. Change-Id: I91b2169f95aadcfaacdd2b9821bb1a01ce53f9a6 Reviewed-on: https://skia-review.googlesource.com/140349 Reviewed-by: Mike Klein Commit-Queue: Brian Osman --- dm/DMSrcSink.cpp | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'dm') diff --git a/dm/DMSrcSink.cpp b/dm/DMSrcSink.cpp index 22c34aadd0..fb67c52cdc 100644 --- a/dm/DMSrcSink.cpp +++ b/dm/DMSrcSink.cpp @@ -979,14 +979,10 @@ Error ImageGenSrc::draw(SkCanvas* canvas) const { // Test various color and alpha types on CPU SkImageInfo decodeInfo = gen->getInfo().makeAlphaType(fDstAlphaType); - SkImageGenerator::Options options; - options.fBehavior = canvas->imageInfo().colorSpace() ? - SkTransferFunctionBehavior::kRespect : SkTransferFunctionBehavior::kIgnore; - int bpp = decodeInfo.bytesPerPixel(); size_t rowBytes = decodeInfo.width() * bpp; SkAutoMalloc pixels(decodeInfo.height() * rowBytes); - if (!gen->getPixels(decodeInfo, pixels.get(), rowBytes, &options)) { + if (!gen->getPixels(decodeInfo, pixels.get(), rowBytes)) { SkString err = SkStringPrintf("Image generator could not getPixels() for %s\n", fPath.c_str()); -- cgit v1.2.3