diff options
| author |  Greg Daniel <egdaniel@google.com> | 2018-02-21 13:02:32 -0500 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-02-21 18:22:47 +0000 |
| commit | 0a7aa14bf36cbb444b84902a37591d7a9c84fbd0 (patch) | |
| tree | aa2769ad071df6f5250a00be9a67ef0c6baf4d44 /src/effects/SkTableColorFilter.cpp | |
| parent | 32f72e25bd802d15ce43a3dd7ef4a3fcfd646727 (diff) | |
Add checks for failed SkImageInfo2GrPixelConfig calls
Bug: skia:7645
Change-Id: I32b9326fb43490ef6a7a99527243b68d89184ae1
Reviewed-on: https://skia-review.googlesource.com/109083
Commit-Queue: Greg Daniel <egdaniel@google.com>
Reviewed-by: Brian Salomon <bsalomon@google.com>
Diffstat (limited to 'src/effects/SkTableColorFilter.cpp')
| -rw-r--r-- | src/effects/SkTableColorFilter.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/effects/SkTableColorFilter.cpp b/src/effects/SkTableColorFilter.cpp index 124e98f8ae..46bfba99ca 100644 --- a/src/effects/SkTableColorFilter.cpp +++ b/src/effects/SkTableColorFilter.cpp @@ -448,6 +448,10 @@ std::unique_ptr<GrFragmentProcessor> ColorTableEffect::Make(GrContext* context, desc.fContext = context; desc.fConfig = SkImageInfo2GrPixelConfig(bitmap.info(), *context->caps()); + if (kUnknown_GrPixelConfig == desc.fConfig) { + return nullptr; + } + GrTextureStripAtlas* atlas = GrTextureStripAtlas::GetAtlas(desc); int row = atlas->lockRow(bitmap); sk_sp<GrTextureProxy> proxy; |