Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(136)

Unified Diff: src/core/SkBitmapDevice.cpp

Issue 305483005: remove SkBitmap::asImageInfo (Closed) Base URL: https://skia.googlecode.com/svn/trunk
Patch Set: Created 6 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « src/core/SkBitmap.cpp ('k') | src/core/SkImageFilter.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/core/SkBitmapDevice.cpp
diff --git a/src/core/SkBitmapDevice.cpp b/src/core/SkBitmapDevice.cpp
index 311e72f576820b18966549d9d372ca62a733ae90..76553ef1416c9813fefc6799ff19f52ea1e6b112 100644
--- a/src/core/SkBitmapDevice.cpp
+++ b/src/core/SkBitmapDevice.cpp
@@ -440,7 +440,11 @@ SkSurface* SkBitmapDevice::newSurface(const SkImageInfo& info) {
}
const void* SkBitmapDevice::peekPixels(SkImageInfo* info, size_t* rowBytes) {
- if (fBitmap.getPixels() && fBitmap.asImageInfo(info)) {
+ const SkImageInfo bmInfo = fBitmap.info();
+ if (fBitmap.getPixels() && (kUnknown_SkColorType != bmInfo.colorType())) {
+ if (info) {
+ *info = bmInfo;
+ }
if (rowBytes) {
*rowBytes = fBitmap.rowBytes();
}
« no previous file with comments | « src/core/SkBitmap.cpp ('k') | src/core/SkImageFilter.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698