diff options
author | Mike Reed <reed@google.com> | 2017-09-29 15:22:56 -0400 |
---|---|---|
committer | Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-10-02 12:55:37 +0000 |
commit | cd284c532376d16fcc4ed75baf3da65c3e4a2e95 (patch) | |
tree | 5c7e34122e72cef44f279b1aa32638d765d3c639 /include/core/SkPixmap.h | |
parent | 3c83668862521b3bbbd628a522c05688348d6e7f (diff) |
Revert "Revert "guard old apis for querying byte-size of a bitmap/imageinfo/pixmap""
This reverts commit 809cbedd4b252be221b2ac3b4269d312fd8f53a0.
Bug: skia:
Change-Id: I680d8daeeeeb15526b44c1305d8fb0c6bfa38e1d
Reviewed-on: https://skia-review.googlesource.com/52665
Commit-Queue: Mike Reed <reed@google.com>
Reviewed-by: Florin Malita <fmalita@chromium.org>
Diffstat (limited to 'include/core/SkPixmap.h')
-rw-r--r-- | include/core/SkPixmap.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/core/SkPixmap.h b/include/core/SkPixmap.h index 8115756b91..f304bde933 100644 --- a/include/core/SkPixmap.h +++ b/include/core/SkPixmap.h @@ -206,6 +206,7 @@ public: */ int shiftPerPixel() const { return fInfo.shiftPerPixel(); } +#ifdef SK_SUPPORT_LEGACY_SAFESIZE64 /** Returns conservative memory required for pixel storage. Includes unused memory on last row when rowBytesAsPixels() exceeds width(). @@ -228,6 +229,7 @@ public: @return exact pixel storage size if size fits in signed 32 bits */ size_t getSafeSize() const { return fInfo.getSafeSize(fRowBytes); } +#endif /** * Returns the size (in bytes) of the pixmap's image buffer. |