diff options
| author |  reed <reed@google.com> | 2015-03-19 08:31:14 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2015-03-19 08:31:14 -0700 |
| commit | 3ef71e343bf075888fb50892350390b4dd47de24 (patch) | |
| tree | d4765ef144928600322cf21bdb41b37f05a55697 /src/lazy | |
| parent | 647211f1243f2dc925588e75038be49cad7b5431 (diff) | |
guarded change to SkImageGenerator to make getInfo() const
BUG=skia:
Review URL: https://codereview.chromium.org/1017293002
Diffstat (limited to 'src/lazy')
| -rw-r--r-- | src/lazy/SkCachingPixelRef.cpp | 9 | ||||
| -rw-r--r-- | src/lazy/SkDiscardablePixelRef.cpp | 10 |
2 files changed, 10 insertions, 9 deletions
diff --git a/src/lazy/SkCachingPixelRef.cpp b/src/lazy/SkCachingPixelRef.cpp index dc53a5d6c7..5fc0d2a87f 100644 --- a/src/lazy/SkCachingPixelRef.cpp +++ b/src/lazy/SkCachingPixelRef.cpp @@ -11,11 +11,12 @@ bool SkCachingPixelRef::Install(SkImageGenerator* generator, SkBitmap* dst) { - SkImageInfo info; SkASSERT(dst != NULL); - if ((NULL == generator) - || !(generator->getInfo(&info)) - || !dst->setInfo(info)) { + if (NULL == generator) { + return false; + } + const SkImageInfo info = generator->getInfo(); + if (!dst->setInfo(info)) { SkDELETE(generator); return false; } diff --git a/src/lazy/SkDiscardablePixelRef.cpp b/src/lazy/SkDiscardablePixelRef.cpp index b810c2b183..1e42042fb6 100644 --- a/src/lazy/SkDiscardablePixelRef.cpp +++ b/src/lazy/SkDiscardablePixelRef.cpp @@ -109,12 +109,12 @@ void SkDiscardablePixelRef::onUnlockPixels() { bool SkInstallDiscardablePixelRef(SkImageGenerator* generator, SkBitmap* dst, SkDiscardableMemory::Factory* factory) { - SkImageInfo info; SkAutoTDelete<SkImageGenerator> autoGenerator(generator); - if ((NULL == autoGenerator.get()) - || (!autoGenerator->getInfo(&info)) - || info.isEmpty() - || (!dst->setInfo(info))) { + if (NULL == autoGenerator.get()) { + return false; + } + SkImageInfo info = autoGenerator->getInfo(); + if (info.isEmpty() || !dst->setInfo(info)) { return false; } // Since dst->setInfo() may have changed/fixed-up info, we copy it back from that bitmap |