aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/image/SkImage_Raster.cpp
diff options
context:
space:
mode:
authorGravatar commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81>2014-05-27 21:30:37 +0000
committerGravatar commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81>2014-05-27 21:30:37 +0000
commit466f5f3e44e703ca58b43ac1c4ac3bfa0e1ff024 (patch)
treea949f7be24c6d07ce5ebdcec046fc9ef3600680c /src/image/SkImage_Raster.cpp
parent300c4293f52785adbaab9e5cb73301f802a2b0d6 (diff)
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
Diffstat (limited to 'src/image/SkImage_Raster.cpp')
-rw-r--r--src/image/SkImage_Raster.cpp4
1 files changed, 2 insertions, 2 deletions
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;