diff options
| author |  Mike Reed <reed@google.com> | 2017-09-26 17:46:02 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-09-27 14:36:07 +0000 |
| commit | 88757dacd4f532a0f647c02ae0ee596d31ab5c68 (patch) | |
| tree | a07e9df0a581f84287d1a1c08f3f32cde0a3d9a0 /src/image/SkSurface_Raster.cpp | |
| parent | fa7ee2447e6227e7f441d32e570489130c0932bb (diff) | |
guard old apis for querying byte-size of a bitmap/imageinfo/pixmap
Now with legacy behavior for allocpixels
This was reverted, so the current CL is a "fix" on top of ...
https://skia-review.googlesource.com/c/skia/+/50980
Related update to Chrome (in preparation for this change)
https://chromium-review.googlesource.com/c/chromium/src/+/685719
Bug: skia:
Change-Id: I4b370ee7e95083ab27421f008132219c9c7b86e9
Reviewed-on: https://skia-review.googlesource.com/51341
Reviewed-by: Florin Malita <fmalita@chromium.org>
Commit-Queue: Mike Reed <reed@google.com>
Diffstat (limited to 'src/image/SkSurface_Raster.cpp')
| -rw-r--r-- | src/image/SkSurface_Raster.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/image/SkSurface_Raster.cpp b/src/image/SkSurface_Raster.cpp index 38694876c3..e9d14fea7d 100644 --- a/src/image/SkSurface_Raster.cpp +++ b/src/image/SkSurface_Raster.cpp @@ -162,7 +162,7 @@ void SkSurface_Raster::onCopyOnWrite(ContentChangeMode mode) { fBitmap.allocPixels(); SkASSERT(prev.info() == fBitmap.info()); SkASSERT(prev.rowBytes() == fBitmap.rowBytes()); - memcpy(fBitmap.getPixels(), prev.getPixels(), fBitmap.getSafeSize()); + memcpy(fBitmap.getPixels(), prev.getPixels(), fBitmap.computeByteSize()); } SkASSERT(fBitmap.rowBytes() == fRowBytes); // be sure we always use the same value |