From 466f5f3e44e703ca58b43ac1c4ac3bfa0e1ff024 Mon Sep 17 00:00:00 2001 From: "commit-bot@chromium.org" Date: Tue, 27 May 2014 21:30:37 +0000 Subject: remove SkBitmap::asImageInfo BUG=skia: R=scroggo@google.com, halcanary@google.com Author: reed@google.com Review URL: https://codereview.chromium.org/305483005 git-svn-id: http://skia.googlecode.com/svn/trunk@14909 2bbb7eff-a529-9590-31e7-b0007b416f81 --- src/image/SkImage_Raster.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/image/SkImage_Raster.cpp') diff --git a/src/image/SkImage_Raster.cpp b/src/image/SkImage_Raster.cpp index abf6dc8af0..7a8091c8af 100644 --- a/src/image/SkImage_Raster.cpp +++ b/src/image/SkImage_Raster.cpp @@ -133,8 +133,8 @@ bool SkImage_Raster::onReadPixels(SkBitmap* dst, const SkIRect& subset) const { const void* SkImage_Raster::onPeekPixels(SkImageInfo* infoPtr, size_t* rowBytesPtr) const { - SkImageInfo info; - if (!fBitmap.asImageInfo(&info) || !fBitmap.getPixels()) { + const SkImageInfo info = fBitmap.info(); + if ((kUnknown_SkColorType == info.colorType()) || !fBitmap.getPixels()) { return NULL; } *infoPtr = info; -- cgit v1.2.3