diff options
| author |  Mike Reed <reed@google.com> | 2017-04-17 10:53:29 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-04-17 15:22:42 +0000 |
| commit | 12e946b4bfdf598bffb276776ea6e25439e25265 (patch) | |
| tree | 3431130a5008af573c497da13243da360d147918 /src | |
| parent | 81340c65e0e507ca544e32c0fa0c6880f371eaff (diff) | |
deprecate odd variants of SkCanvas::readPixels
Bug: skia:6513
Change-Id: I51179a85f0912d3f899c368c30a943d346dd1d05
Reviewed-on: https://skia-review.googlesource.com/13589
Reviewed-by: Florin Malita <fmalita@chromium.org>
Reviewed-by: Matt Sarett <msarett@google.com>
Commit-Queue: Mike Reed <reed@google.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/core/SkCanvas.cpp | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/src/core/SkCanvas.cpp b/src/core/SkCanvas.cpp index f8e427cd81..1b96f4934e 100644 --- a/src/core/SkCanvas.cpp +++ b/src/core/SkCanvas.cpp @@ -831,6 +831,7 @@ SkBaseDevice* SkCanvas::getTopDevice() const { return fMCRec->fTopLayer->fDevice; } +#ifdef SK_SUPPORT_LEGACY_CANVAS_READPIXELS bool SkCanvas::readPixels(SkBitmap* bitmap, int x, int y) { bool weAllocated = false; if (nullptr == bitmap->pixelRef()) { @@ -872,6 +873,7 @@ bool SkCanvas::readPixels(const SkIRect& srcRect, SkBitmap* bitmap) { } return true; } +#endif bool SkCanvas::readPixels(const SkImageInfo& dstInfo, void* dstP, size_t rowBytes, int x, int y) { SkBaseDevice* device = this->getDevice(); @@ -882,6 +884,15 @@ bool SkCanvas::readPixels(const SkImageInfo& dstInfo, void* dstP, size_t rowByte return device->readPixels(dstInfo, dstP, rowBytes, x, y); } +bool SkCanvas::readPixels(const SkPixmap& pm, int x, int y) { + return pm.addr() && this->readPixels(pm.info(), pm.writable_addr(), pm.rowBytes(), x, y); +} + +bool SkCanvas::readPixels(const SkBitmap& bm, int x, int y) { + SkPixmap pm; + return bm.peekPixels(&pm) && this->readPixels(pm, x, y); +} + bool SkCanvas::writePixels(const SkBitmap& bitmap, int x, int y) { SkAutoPixmapUnlock unlocker; if (bitmap.requestLock(&unlocker)) { |