summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Mathias Agopian <mathias@google.com> 2013-03-22 04:46:04 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2013-03-22 04:46:05 +0000
commit921113d501b0c7136a0cbc6950f9e90ca1543277 (patch)
treeb9e0da567775fdcafb7ab84b6173b494c4928ec7
parent75ebb37fafcaea7692d46b5abdbcd1465d88eea2 (diff)
parenta79fd4ca31cca590d81b8663b3649127477bd24a (diff)
Merge "use the bitmap stride when encoding a screenshot as PNG" into jb-mr2-dev
-rw-r--r--cmds/screencap/screencap.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/cmds/screencap/screencap.cpp b/cmds/screencap/screencap.cpp
index e1270afa50c0..be32355cb965 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,