diff options
Diffstat (limited to 'include')
-rw-r--r-- | include/core/SkBitmap.h | 6 | ||||
-rw-r--r-- | include/core/SkImageInfo.h | 6 | ||||
-rw-r--r-- | include/core/SkPixmap.h | 2 |
3 files changed, 6 insertions, 8 deletions
diff --git a/include/core/SkBitmap.h b/include/core/SkBitmap.h index cea50b8886..5b4e1a6863 100644 --- a/include/core/SkBitmap.h +++ b/include/core/SkBitmap.h @@ -147,7 +147,10 @@ public: */ size_t computeByteSize() const { return fInfo.computeByteSize(fRowBytes); } -#ifdef SK_SUPPORT_LEGACY_SAFESIZE64 + /** Return the byte size of the pixels, based on the height and rowBytes. + Note this truncates the result to 32bits. Call getSize64() to detect + if the real size exceeds 32bits. + */ size_t getSize() const { return fInfo.height() * fRowBytes; } /** Return the number of bytes from the pointer returned by getPixels() @@ -171,7 +174,6 @@ public: int64_t computeSafeSize64() const { return fInfo.getSafeSize64(fRowBytes); } -#endif /** Returns true if this bitmap is marked as immutable, meaning that the contents of its pixels will not change for the lifetime of the bitmap. diff --git a/include/core/SkImageInfo.h b/include/core/SkImageInfo.h index 50d068a09c..c47dbb28b1 100644 --- a/include/core/SkImageInfo.h +++ b/include/core/SkImageInfo.h @@ -300,7 +300,6 @@ public: void unflatten(SkReadBuffer&); void flatten(SkWriteBuffer&) const; -#ifdef SK_SUPPORT_LEGACY_SAFESIZE64 int64_t getSafeSize64(size_t rowBytes) const { if (0 == fHeight) { return 0; @@ -315,7 +314,6 @@ public: } return sk_64_asS32(size); } -#endif /** * Returns the size (in bytes) of the image buffer that this info needs, given the specified @@ -333,8 +331,8 @@ public: } bool validRowBytes(size_t rowBytes) const { - uint64_t minRB = sk_64_mul(fWidth, this->bytesPerPixel()); - return rowBytes >= minRB; + uint64_t rb = sk_64_mul(fWidth, this->bytesPerPixel()); + return rowBytes >= rb; } void reset() { diff --git a/include/core/SkPixmap.h b/include/core/SkPixmap.h index f304bde933..8115756b91 100644 --- a/include/core/SkPixmap.h +++ b/include/core/SkPixmap.h @@ -206,7 +206,6 @@ 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(). @@ -229,7 +228,6 @@ 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. |