From f6db495d2d3d1d535c51048a06091706e74f48f4 Mon Sep 17 00:00:00 2001 From: Brian Osman Date: Mon, 16 Jul 2018 13:06:02 -0400 Subject: Remove SkTransferFunctionBehavior Bug: skia: Change-Id: Iccbe609b2a8d4c9098ef36aa6530dbc3771e0c11 Reviewed-on: https://skia-review.googlesource.com/141055 Reviewed-by: Leon Scroggins Commit-Queue: Brian Osman --- src/core/SkBitmap.cpp | 6 +++--- src/core/SkPixmap.cpp | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'src/core') diff --git a/src/core/SkBitmap.cpp b/src/core/SkBitmap.cpp index 6d936f9436..3c88b50d03 100644 --- a/src/core/SkBitmap.cpp +++ b/src/core/SkBitmap.cpp @@ -482,19 +482,19 @@ bool SkBitmap::extractSubset(SkBitmap* result, const SkIRect& subset) const { /////////////////////////////////////////////////////////////////////////////// bool SkBitmap::readPixels(const SkImageInfo& requestedDstInfo, void* dstPixels, size_t dstRB, - int x, int y, SkTransferFunctionBehavior behavior) const { + int x, int y) const { SkPixmap src; if (!this->peekPixels(&src)) { return false; } - return src.readPixels(requestedDstInfo, dstPixels, dstRB, x, y, behavior); + return src.readPixels(requestedDstInfo, dstPixels, dstRB, x, y); } bool SkBitmap::readPixels(const SkPixmap& dst, int srcX, int srcY) const { return this->readPixels(dst.info(), dst.writable_addr(), dst.rowBytes(), srcX, srcY); } -bool SkBitmap::writePixels(const SkPixmap& src, int dstX, int dstY, SkTransferFunctionBehavior) { +bool SkBitmap::writePixels(const SkPixmap& src, int dstX, int dstY) { if (!SkImageInfoValidConversion(this->info(), src.info())) { return false; } diff --git a/src/core/SkPixmap.cpp b/src/core/SkPixmap.cpp index d91b3cc9c1..bfbb7a4e54 100644 --- a/src/core/SkPixmap.cpp +++ b/src/core/SkPixmap.cpp @@ -80,8 +80,8 @@ bool SkPixmap::extractSubset(SkPixmap* result, const SkIRect& subset) const { return true; } -bool SkPixmap::readPixels(const SkImageInfo& dstInfo, void* dstPixels, size_t dstRB, int x, int y, - SkTransferFunctionBehavior) const { +bool SkPixmap::readPixels(const SkImageInfo& dstInfo, void* dstPixels, size_t dstRB, + int x, int y) const { if (!SkImageInfoValidConversion(dstInfo, fInfo)) { return false; } -- cgit v1.2.3