aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/core/SkBitmap.cpp
diff options
context:
space:
mode:
authorGravatar reed <reed@google.com>2015-06-22 12:48:26 -0700
committerGravatar Commit bot <commit-bot@chromium.org>2015-06-22 12:48:26 -0700
commit871872f3f247f6b699617f6d9ef50ef5da6fbe74 (patch)
tree50358d6f699dd433607d9bc3c29da63e44c5d00f /src/core/SkBitmap.cpp
parentc1f56b518218d1caa65d6b7101bebf0d28c02a92 (diff)
change old picture serialization to really handle images
Diffstat (limited to 'src/core/SkBitmap.cpp')
-rw-r--r--src/core/SkBitmap.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/core/SkBitmap.cpp b/src/core/SkBitmap.cpp
index 49e2c04bfb..8f799125e4 100644
--- a/src/core/SkBitmap.cpp
+++ b/src/core/SkBitmap.cpp
@@ -1270,7 +1270,9 @@ bool SkBitmap::requestLock(SkAutoPixmapUnlock* result) const {
return false;
}
- SkPixelRef::LockRequest req = { fInfo.dimensions(), kNone_SkFilterQuality };
+ // We have to lock the whole thing (using the pixelref's dimensions) until the api supports
+ // a partial lock (with offset/origin). Hence we can't use our fInfo.
+ SkPixelRef::LockRequest req = { pr->info().dimensions(), kNone_SkFilterQuality };
SkPixelRef::LockResult res;
if (pr->requestLock(req, &res)) {
SkASSERT(res.fPixels);