diff options
author | Matt Sarett <msarett@google.com> | 2017-06-12 13:46:11 -0400 |
---|---|---|
committer | Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-06-12 18:09:03 +0000 |
commit | b6759dd16e130cf844c799c96a20f4845a81e072 (patch) | |
tree | 98ff5426154643edd24d9de49b8526d3e5ae3661 /src/image/SkSurface_Raster.cpp | |
parent | 5e819cac114b7286c50c9c3040fca259cd4b06fb (diff) |
Revert "Revert "Disable F16-nullptr sources""
This relands the original change with a modification. We should
not check for non-null pixels because this breaks the Android
hw bitmap use case.
Bug: b/62482405
Change-Id: I081412bb46754d33b69e02e5754f04a082e081ae
Reviewed-on: https://skia-review.googlesource.com/19494
Commit-Queue: Matt Sarett <msarett@google.com>
Reviewed-by: Matt Sarett <msarett@google.com>
Diffstat (limited to 'src/image/SkSurface_Raster.cpp')
-rw-r--r-- | src/image/SkSurface_Raster.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/image/SkSurface_Raster.cpp b/src/image/SkSurface_Raster.cpp index 1ee3d7ea61..688e23411f 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; |