Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3b2fb10f authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Allow zero stride" am: 136a4fc8 am: 878963be 

Change-Id: Ia91d71e779efe51dd0ef07fa5d75cb3062ace9e7
parents fdca31f4 878963be

libs/hwui/hwui/Bitmap.cpp

+1 −1
Original line number Diff line number Diff line
@@ -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)