From 3ef71e343bf075888fb50892350390b4dd47de24 Mon Sep 17 00:00:00 2001 From: reed Date: Thu, 19 Mar 2015 08:31:14 -0700 Subject: guarded change to SkImageGenerator to make getInfo() const BUG=skia: Review URL: https://codereview.chromium.org/1017293002 --- src/lazy/SkCachingPixelRef.cpp | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'src/lazy/SkCachingPixelRef.cpp') 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; } -- cgit v1.2.3