Index: src/images/SkImageRef.cpp |
diff --git a/src/images/SkImageRef.cpp b/src/images/SkImageRef.cpp |
index 1a8284bdd4a6e730da950ce244355867295cb0de..7b3f3d91215f07e5c92ef0a76dc7941427691147 100644 |
--- a/src/images/SkImageRef.cpp |
+++ b/src/images/SkImageRef.cpp |
@@ -143,15 +143,22 @@ bool SkImageRef::prepareBitmap(SkImageDecoder::Mode mode) { |
return false; |
} |
-void* SkImageRef::onLockPixels(SkColorTable** ct) { |
+bool SkImageRef::onGetInfo(SkImageInfo* info) { |
+ return fBitmap.asImageInfo(info); |
+} |
+ |
+bool SkImageRef::onNewLockPixels(LockRec* rec) { |
if (NULL == fBitmap.getPixels()) { |
(void)this->prepareBitmap(SkImageDecoder::kDecodePixels_Mode); |
} |
- if (ct) { |
- *ct = fBitmap.getColorTable(); |
+ if (NULL == fBitmap.getPixels()) { |
+ return false; |
} |
- return fBitmap.getPixels(); |
+ rec->fPixels = fBitmap.getPixels(); |
+ rec->fColorTable = NULL; |
+ rec->fRowBytes = fBitmap.rowBytes(); |
+ return true; |
} |
size_t SkImageRef::ramUsed() const { |