| commit | 9d22fd6e7bd1e93bb192f4de649b6b170c9d261a | [log] [tgz] |
|---|---|---|
| author | bsalomon <bsalomon@google.com> | Mon Jan 11 11:14:17 2016 -0800 |
| committer | Commit bot <commit-bot@chromium.org> | Mon Jan 11 11:14:17 2016 -0800 |
| tree | 09feb3fe2b3dde0ecc6d876f8f73bab3d6939728 | |
| parent | b4b42ed67137b71df3ea6ccd60b4bf9f0f6e58f3 [diff] [blame] |
Make SkBitmap::CopyTo respect requested dst color type when bitmap is texture backed. BUG=chromium:550559 GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1576983002 Review URL: https://codereview.chromium.org/1576983002
diff --git a/src/core/SkBitmap.cpp b/src/core/SkBitmap.cpp index c66a5b2..bdf1daa 100644 --- a/src/core/SkBitmap.cpp +++ b/src/core/SkBitmap.cpp
@@ -828,7 +828,7 @@ SkIRect subset; subset.setXYWH(fPixelRefOrigin.fX, fPixelRefOrigin.fY, fInfo.width(), fInfo.height()); - if (fPixelRef->readPixels(&tmpSrc, &subset)) { + if (fPixelRef->readPixels(&tmpSrc, dstColorType, &subset)) { if (fPixelRef->info().alphaType() == kUnpremul_SkAlphaType) { // FIXME: The only meaningful implementation of readPixels // (GrPixelRef) assumes premultiplied pixels.