piotr/edgetx-gx12
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

Fix for drawMask() when x < 0

Browse Source
This commit is contained in:
Bertrand Songis
2019-10-22 17:35:15 +02:00
parent 72f8420f9c
commit 5590c60174
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
radio/src/thirdparty/libopenui/src/bitmapbuffer.cpp
Vendored
+9 -3
View File
@@ -326,18 +326,24 @@ void BitmapBuffer::drawMask(coord_t x, coord_t y, const BitmapBuffer * mask, Lcd
width = xmax - x;
}
if (x < 0) {
width += x;
offset -= x;
x = 0;
}
if (y >= ymax || x >= xmax || width <= 0 || x + width < xmin || y + height < ymin) {
return;
}
pixel_t color = lcdColorTable[COLOR_IDX(flags)];
for (coord_t row=0; row<height; row++) {
for (coord_t row = 0; row < height; row++) {
if (y + row < ymin || y + row >= ymax)
continue;
pixel_t * p = getPixelPtr(x, y+row);
pixel_t * p = getPixelPtr(x, y + row);
const pixel_t * q = mask->getPixelPtr(offset, row);
for (coord_t col=0; col<width; col++) {
for (coord_t col = 0; col < width; col++) {
drawAlphaPixel(p, *((uint8_t *)q), color);
MOVE_TO_NEXT_RIGHT_PIXEL(p);
MOVE_TO_NEXT_RIGHT_PIXEL(q);