diff options
| author | 2020-01-10 19:40:01 +0000 | |
|---|---|---|
| committer | 2020-01-10 19:40:01 +0000 | |
| commit | 136a4fc875e7fa8defe66d33fca0d770b9c2b6d1 (patch) | |
| tree | 46f7e0d5dd87b3e315f9659f71ee39338ab489e6 | |
| parent | 3095c56b3ad33b5fcbb4cb24b6a805d93de19712 (diff) | |
| parent | d2ba4f36c7100aae7695dbd06ec22f7431e8ec1a (diff) | |
Merge "Allow zero stride"
| -rw-r--r-- | libs/hwui/hwui/Bitmap.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libs/hwui/hwui/Bitmap.cpp b/libs/hwui/hwui/Bitmap.cpp index 219d04055eae..c21bdca3db77 100644 --- a/libs/hwui/hwui/Bitmap.cpp +++ b/libs/hwui/hwui/Bitmap.cpp @@ -219,7 +219,7 @@ Bitmap::Bitmap(void* address, int fd, size_t mappedSize, const SkImageInfo& info Bitmap::Bitmap(GraphicBuffer* buffer, const SkImageInfo& info, BitmapPalette palette) : SkPixelRef(info.width(), info.height(), nullptr, - bytesPerPixel(buffer->getPixelFormat()) * buffer->getStride()) + bytesPerPixel(buffer->getPixelFormat()) * (buffer->getStride() > 0 ? buffer->getStride() : buffer->getWidth())) , mInfo(validateAlpha(info)) , mPixelStorageType(PixelStorageType::Hardware) , mPalette(palette) |