aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/core/SkImageGenerator.cpp
diff options
context:
space:
mode:
authorGravatar Matt Sarett <msarett@google.com>2017-03-24 16:31:19 -0400
committerGravatar Skia Commit-Bot <skia-commit-bot@chromium.org>2017-04-03 18:32:42 +0000
commitd531ca038fac8acb3320a78c393c002ca59768fe (patch)
tree2d9891fae706bf8aa7972dda94b01cb6a56cf45c /src/core/SkImageGenerator.cpp
parent8576014d8a8b799b30dbee4b9d86571fc4781807 (diff)
Use SkTransferFunctionBehavior in SkImageGenerator
This fixes SkColorSpaceXformCanvas gms that expect non-linear premuls from the codec. BUG=skia: Change-Id: I5dc236d0cd760c23605a26e9c33ddb18955f9231 Reviewed-on: https://skia-review.googlesource.com/10164 Reviewed-by: Mike Klein <mtklein@chromium.org> Commit-Queue: Matt Sarett <msarett@google.com>
Diffstat (limited to 'src/core/SkImageGenerator.cpp')
-rw-r--r--src/core/SkImageGenerator.cpp9
1 files changed, 9 insertions, 0 deletions
diff --git a/src/core/SkImageGenerator.cpp b/src/core/SkImageGenerator.cpp
index 18a6ce2669..2f209ca99c 100644
--- a/src/core/SkImageGenerator.cpp
+++ b/src/core/SkImageGenerator.cpp
@@ -45,6 +45,15 @@ bool SkImageGenerator::getPixels(const SkImageInfo& info, void* pixels, size_t r
return success;
}
+bool SkImageGenerator::getPixels(const SkImageInfo& info, void* pixels, size_t rowBytes,
+ const Options* opts) {
+ Options defaultOpts;
+ if (!opts) {
+ opts = &defaultOpts;
+ }
+ return this->onGetPixels(info, pixels, rowBytes, *opts);
+}
+
bool SkImageGenerator::getPixels(const SkImageInfo& info, void* pixels, size_t rowBytes) {
SkASSERT(kIndex_8_SkColorType != info.colorType());
if (kIndex_8_SkColorType == info.colorType()) {