diff options
| author | Mathias Agopian <mathias@google.com> | 2013-03-22 04:51:13 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-03-22 04:51:13 +0000 |
| commit | 1aa089cef2e2ecb4fb85cd39240a0db05f7fb554 (patch) | |
| tree | c277c51f1ff3b7c896b589924447578b3eb08227 /cmds | |
| parent | f81dc2a676de816e3a1bc0d682de5652334d5a7d (diff) | |
| parent | 3f6c9bae6302983d37b3a00523b8c8066fd3caa9 (diff) | |
| download | frameworks_base-1aa089cef2e2ecb4fb85cd39240a0db05f7fb554.zip frameworks_base-1aa089cef2e2ecb4fb85cd39240a0db05f7fb554.tar.gz frameworks_base-1aa089cef2e2ecb4fb85cd39240a0db05f7fb554.tar.bz2 | |
am 3f6c9bae: am 921113d5: Merge "use the bitmap stride when encoding a screenshot as PNG" into jb-mr2-dev
* commit '3f6c9bae6302983d37b3a00523b8c8066fd3caa9':
use the bitmap stride when encoding a screenshot as PNG
Diffstat (limited to 'cmds')
| -rw-r--r-- | cmds/screencap/screencap.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cmds/screencap/screencap.cpp b/cmds/screencap/screencap.cpp index e1270af..be32355 100644 --- a/cmds/screencap/screencap.cpp +++ b/cmds/screencap/screencap.cpp @@ -179,7 +179,7 @@ int main(int argc, char** argv) if (base) { if (png) { SkBitmap b; - b.setConfig(flinger2skia(f), w, h); + b.setConfig(flinger2skia(f), w, h, s*bytesPerPixel(f)); b.setPixels((void*)base); SkDynamicMemoryWStream stream; SkImageEncoder::EncodeStream(&stream, b, |