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
This commit is contained in:
Mathias Agopian
2013-03-22 04:51:13 +00:00
committed by Android Git Automerger

View File

@@ -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,