Merge "Allow zero stride"

This commit is contained in:
Treehugger Robot
2020-01-10 19:40:01 +00:00
committed by Gerrit Code Review

View File

@@ -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) Bitmap::Bitmap(GraphicBuffer* buffer, const SkImageInfo& info, BitmapPalette palette)
: SkPixelRef(info.width(), info.height(), nullptr, : SkPixelRef(info.width(), info.height(), nullptr,
bytesPerPixel(buffer->getPixelFormat()) * buffer->getStride()) bytesPerPixel(buffer->getPixelFormat()) * (buffer->getStride() > 0 ? buffer->getStride() : buffer->getWidth()))
, mInfo(validateAlpha(info)) , mInfo(validateAlpha(info))
, mPixelStorageType(PixelStorageType::Hardware) , mPixelStorageType(PixelStorageType::Hardware)
, mPalette(palette) , mPalette(palette)