diff options
author | Brian Osman <brianosman@google.com> | 2018-07-12 14:44:27 -0400 |
---|---|---|
committer | Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-07-12 20:54:14 +0000 |
commit | b62f50cf763279fa0d0aa2f80624de02c7a1c2fb (patch) | |
tree | a4aba5466ff7e3136bd97c35718a678354b430ea /include/core | |
parent | 5bc4fc8f3f26e9e14cccee4d200309e4b500b8d3 (diff) |
Replace nearly all kRespect with kIgnore
- Encoders and decoders always assume kIgnore.
- They are less opinionated about F16 and color space,
we just trust the color space that's passed in, and
put that directly in the image (no sRGB encoding).
- SkBitmap and SkPixmap read/write pixels functions were
defaulting to kResepct, those are now always kIgnore.
- Many other bits of plumbing are simplified, and I
added a default of kIgnore to SkImage::makeColorSpace,
so we can phase out that argument entirely.
- Still need to add defaults to other public APIs that
take SkTransferFunctionBehavior.
- This makes gold think that we've dramatically changed
the contents of all F16 images, but that's because
it doesn't understand the (now linear) color space
that's embedded. Once we triage them all once, they
will work fine (and they'll look perfect in the browser).
Bug: skia:
Change-Id: I62fa090f96cae1b67d181ce14bd91f34ff2ed747
Reviewed-on: https://skia-review.googlesource.com/140570
Commit-Queue: Brian Osman <brianosman@google.com>
Reviewed-by: Mike Klein <mtklein@google.com>
Diffstat (limited to 'include/core')
-rw-r--r-- | include/core/SkBitmap.h | 4 | ||||
-rw-r--r-- | include/core/SkImage.h | 5 | ||||
-rw-r--r-- | include/core/SkPixmap.h | 2 |
3 files changed, 6 insertions, 5 deletions
diff --git a/include/core/SkBitmap.h b/include/core/SkBitmap.h index 758881aae3..bc29151a24 100644 --- a/include/core/SkBitmap.h +++ b/include/core/SkBitmap.h @@ -992,7 +992,7 @@ public: bool readPixels(const SkImageInfo& dstInfo, void* dstPixels, size_t dstRowBytes, int srcX, int srcY) const { return this->readPixels(dstInfo, dstPixels, dstRowBytes, srcX, srcY, - SkTransferFunctionBehavior::kRespect); + SkTransferFunctionBehavior::kIgnore); } /** Copies a SkRect of pixels from SkBitmap to dst. Copy starts at (srcX, srcY), and @@ -1074,7 +1074,7 @@ public: @return true if src pixels are copied to SkBitmap */ bool writePixels(const SkPixmap& src, int dstX, int dstY) { - return this->writePixels(src, dstX, dstY, SkTransferFunctionBehavior::kRespect); + return this->writePixels(src, dstX, dstY, SkTransferFunctionBehavior::kIgnore); } /** Copies a SkRect of pixels from src. Copy starts at (0, 0), and does not exceed diff --git a/include/core/SkImage.h b/include/core/SkImage.h index 8957d11b61..f04dd45c78 100644 --- a/include/core/SkImage.h +++ b/include/core/SkImage.h @@ -877,8 +877,9 @@ public: SkTransferFunctionBehavior::kIgnore @return created SkImage in target SkColorSpace */ - sk_sp<SkImage> makeColorSpace(sk_sp<SkColorSpace> target, - SkTransferFunctionBehavior premulBehavior) const; + sk_sp<SkImage> makeColorSpace( + sk_sp<SkColorSpace> target, + SkTransferFunctionBehavior premulBehavior = SkTransferFunctionBehavior::kIgnore) const; private: SkImage(int width, int height, uint32_t uniqueID); diff --git a/include/core/SkPixmap.h b/include/core/SkPixmap.h index 5e417af2ed..d3e0097e70 100644 --- a/include/core/SkPixmap.h +++ b/include/core/SkPixmap.h @@ -616,7 +616,7 @@ public: bool readPixels(const SkImageInfo& dstInfo, void* dstPixels, size_t dstRowBytes, int srcX, int srcY) const { return this->readPixels(dstInfo, dstPixels, dstRowBytes, srcX, srcY, - SkTransferFunctionBehavior::kRespect); + SkTransferFunctionBehavior::kIgnore); } /** Copies a SkRect of pixels to dst. Copy starts at (srcX, srcY), and does not |