aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/image/SkImage.cpp
diff options
context:
space:
mode:
authorGravatar Mike Klein <mtklein@chromium.org>2018-01-10 14:35:35 -0500
committerGravatar Skia Commit-Bot <skia-commit-bot@chromium.org>2018-01-11 19:17:31 +0000
commit7c4ca043361f6adb3d17a9d3db2397d86bac5a2d (patch)
treee58f4495f746932fa25c5dec396cb7e32bc2d04d /src/image/SkImage.cpp
parentdeb7998834245983ae89b776256d47c2eeb39192 (diff)
fix legacy makeRasterImage()
Passing the color space down into SkImage_Lazy ends up triggering a SkTransferFunctionBehavior::kRespect decode (tf(r*a)), where we want ignore (tf(r)*a) to have any hope of working with the legacy backend. This fix in turn needs another little extension of another old hack in SkImage_Gpu for makeNonTextureImage() to keep working there. Bug: skia:7479 Change-Id: If48ca68e95d9eee597f6b10434498049981314ba Reviewed-on: https://skia-review.googlesource.com/93380 Commit-Queue: Mike Klein <mtklein@chromium.org> Reviewed-by: Brian Osman <brianosman@google.com>
Diffstat (limited to 'src/image/SkImage.cpp')
-rw-r--r--src/image/SkImage.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/image/SkImage.cpp b/src/image/SkImage.cpp
index e618f7f454..b5d68bf865 100644
--- a/src/image/SkImage.cpp
+++ b/src/image/SkImage.cpp
@@ -334,7 +334,7 @@ sk_sp<SkImage> SkImage::makeRasterImage() const {
}
sk_sp<SkData> data = SkData::MakeUninitialized(size);
- pm = { info, data->writable_data(), info.minRowBytes() };
+ pm = { info.makeColorSpace(nullptr), data->writable_data(), info.minRowBytes() };
if (!this->readPixels(pm, 0, 0)) {
return nullptr;
}