diff options
| author | commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2014-02-13 17:14:46 +0000 |
|---|---|---|
| committer | commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2014-02-13 17:14:46 +0000 |
| commit | c3bd8af6d5722e854feca70c40d92f4954c5b67b (patch) | |
| tree | d66f5fa5e139469c523882685cd1dfb4c8f83529 /samplecode/SampleApp.cpp | |
| parent | e1df56579f815fe1f788380e9342abe5284bab51 (diff) | |
add peekPixels to SkCanvas and SkSurface
fix reference to SkBaseDevice, which was only a problem in no-gpu build
This reverts commit 4fa44a6bf73891b21917fb90d02beef9143bffa3.
R=reed@google.com
Author: reed@chromium.org
Review URL: https://codereview.chromium.org/163603003
git-svn-id: http://skia.googlecode.com/svn/trunk@13432 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'samplecode/SampleApp.cpp')
| -rw-r--r-- | samplecode/SampleApp.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/samplecode/SampleApp.cpp b/samplecode/SampleApp.cpp index 53e15a5fdf..15e56a3bb6 100644 --- a/samplecode/SampleApp.cpp +++ b/samplecode/SampleApp.cpp @@ -1128,8 +1128,9 @@ void SampleWindow::listTitles() { static SkBitmap capture_bitmap(SkCanvas* canvas) { SkBitmap bm; - const SkBitmap& src = canvas->getDevice()->accessBitmap(false); - src.copyTo(&bm, src.config()); + if (bm.allocPixels(canvas->imageInfo())) { + canvas->readPixels(&bm, 0, 0); + } return bm; } |