aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/image/SkSurface_Raster.cpp
diff options
context:
space:
mode:
authorGravatar Stan Iliev <stani@google.com>2017-07-25 11:59:12 -0400
committerGravatar Skia Commit-Bot <skia-commit-bot@chromium.org>2017-07-25 18:34:01 +0000
commit4ed9ae4b230425df7735bc4a3778da00f63178de (patch)
tree44244b8ee7dcdf70926501fdec4f20034f62dffc /src/image/SkSurface_Raster.cpp
parentc47f223d14d562ad9899f64073d8134287982926 (diff)
Improve GrGLNonlinearColorSpaceXformEffect to support scRGB
Improve GrGLNonlinearColorSpaceXformEffect to correctly implement scRGB transfer function and allow for negative colors. Relax SkSurface_Gpu::Valid to allow kRGBA_half_GrPixelConfig render target without a color space needed for legacy blending on Android. Bug: b/62347704 Change-Id: Ibc6144e69c26cdbdcbf29348c4f612fb6b639e01 Reviewed-on: https://skia-review.googlesource.com/26143 Commit-Queue: Stan Iliev <stani@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
Diffstat (limited to 'src/image/SkSurface_Raster.cpp')
-rw-r--r--src/image/SkSurface_Raster.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/image/SkSurface_Raster.cpp b/src/image/SkSurface_Raster.cpp
index 51b9487d88..38694876c3 100644
--- a/src/image/SkSurface_Raster.cpp
+++ b/src/image/SkSurface_Raster.cpp
@@ -63,7 +63,7 @@ bool SkSurfaceValidateRasterInfo(const SkImageInfo& info, size_t rowBytes) {
shift = 2;
break;
case kRGBA_F16_SkColorType:
- if (!info.colorSpace() || !info.colorSpace()->gammaIsLinear()) {
+ if (info.colorSpace() && (!info.colorSpace()->gammaIsLinear())) {
return false;
}
shift = 3;