From d37d5d96493604c12cfaa2d64bcbd32c41b01f3b Mon Sep 17 00:00:00 2001 From: Mike Klein Date: Wed, 14 Dec 2016 13:38:24 +0000 Subject: Revert "Revert "clamp to premul when reading premul sRGB"" This reverts commit 2e018f548d76b0688f9873c683cffc681fec40ec. Reason for revert: doesn't appear to have been the roll problem. Original change's description: > Revert "clamp to premul when reading premul sRGB" > > This reverts commit 04e10da8362a0dcabd795a4ad53f617719ca0d20. > > Reason for revert: roll? > > Change-Id: Id0a8dcd62763bd6eddde120c513ca97e098a4268 > Reviewed-on: https://skia-review.googlesource.com/6022 > Commit-Queue: Mike Klein > Reviewed-by: Mike Klein > TBR=mtklein@chromium.org,reviews@skia.org,brianosman@google.com NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true Change-Id: I399ca5e728ce6766c6707682c4c6b685681ffdeb Reviewed-on: https://skia-review.googlesource.com/6025 Commit-Queue: Mike Klein Reviewed-by: Mike Klein --- bench/SkRasterPipelineBench.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'bench/SkRasterPipelineBench.cpp') diff --git a/bench/SkRasterPipelineBench.cpp b/bench/SkRasterPipelineBench.cpp index 64e59c8b54..16dea8aa66 100644 --- a/bench/SkRasterPipelineBench.cpp +++ b/bench/SkRasterPipelineBench.cpp @@ -38,13 +38,13 @@ public: SkRasterPipeline p; p.append(SkRasterPipeline::load_8888, &src_ctx); - p.append(SkRasterPipeline::from_srgb); + p.append_from_srgb(kUnpremul_SkAlphaType); p.append(SkRasterPipeline::scale_u8, &mask_ctx); if (kF16) { p.append(SkRasterPipeline::load_f16_d, &dst_ctx); } else { p.append(SkRasterPipeline::load_8888_d, &dst_ctx); - p.append(SkRasterPipeline::from_srgb_d); + p.append_from_srgb_d(kPremul_SkAlphaType); } p.append(SkRasterPipeline::srcover); if (kF16) { -- cgit v1.2.3