diff options
| author |  Mike Reed <reed@google.com> | 2017-07-18 10:53:11 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-07-18 15:50:43 +0000 |
| commit | 086a427b0cee3862f25c492fc5082ff24105dc53 (patch) | |
| tree | 79d4311c12309e5bc34950a0131771d3cb8f6171 /src/core/SkAutoPixmapStorage.h | |
| parent | 918ad9d5f19efdbd57486b8f931f7af197896010 (diff) | |
guard references to SkColorTable
Bug: skia:6828
Change-Id: I0c8c78e70b118f51cb59dc45675e4ddcd4776108
Reviewed-on: https://skia-review.googlesource.com/24260
Commit-Queue: Mike Reed <reed@google.com>
Reviewed-by: Leon Scroggins <scroggo@google.com>
Diffstat (limited to 'src/core/SkAutoPixmapStorage.h')
| -rw-r--r-- | src/core/SkAutoPixmapStorage.h | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/src/core/SkAutoPixmapStorage.h b/src/core/SkAutoPixmapStorage.h index 6342a41deb..0aece1b9ea 100644 --- a/src/core/SkAutoPixmapStorage.h +++ b/src/core/SkAutoPixmapStorage.h @@ -57,9 +57,9 @@ public: this->freeStorage(); this->INHERITED::reset(); } - void reset(const SkImageInfo& info, const void* addr, size_t rb, SkColorTable* ctable = NULL) { + void reset(const SkImageInfo& info, const void* addr, size_t rb) { this->freeStorage(); - this->INHERITED::reset(info, addr, rb, ctable); + this->INHERITED::reset(info, addr, rb); } void reset(const SkImageInfo& info) { this->freeStorage(); @@ -70,6 +70,12 @@ public: return this->INHERITED::reset(mask); } +#ifdef SK_SUPPORT_LEGACY_COLORTABLE + void reset(const SkImageInfo& info, const void* addr, size_t rb, SkColorTable*) { + this->freeStorage(); + this->INHERITED::reset(info, addr, rb); + } +#endif private: void* fStorage; |