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

Fixes for new Stb version

Browse Source 
As it seems, RGB888 bitmap are now declared as ARGB8888, as load_stb() requests 4 bytes / pixel.
Now, real grayscale is used instead of just using "red" as alpha, as was previously done.
This commit is contained in:
Raphael Coeffic
2021-05-07 23:58:20 +02:00
parent 7b63477300
commit c25d599393
1 changed files with 18 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
radio/src/thirdparty/libopenui/src/bitmapbuffer.cpp
Vendored
+18 -5
View File
@@ -974,9 +974,22 @@ BitmapBuffer * BitmapBuffer::loadMask(const char * filename)
BitmapBuffer * bitmap = BitmapBuffer::loadBitmap(filename);
if (bitmap) {
pixel_t * p = bitmap->getPixelPtrAbs(0, 0);
for (int i = bitmap->width() * bitmap->height(); i > 0; i--) {
*((uint8_t *)p) = OPACITY_MAX - ((*p) >> 12);
MOVE_TO_NEXT_RIGHT_PIXEL(p);
if (bitmap->getFormat() == BMP_ARGB4444) {
for (int i = bitmap->width() * bitmap->height(); i > 0; i--) {
// invert red and use as alpha
ARGB_SPLIT(*p, a, r, g, b);
*((uint8_t *)p) = OPACITY_MAX - (r + g + b) / 3;
MOVE_TO_NEXT_RIGHT_PIXEL(p);
}
} else { // BMP_RGB565
for (int i = bitmap->width() * bitmap->height(); i > 0; i--) {
// invert msb 4 bits red and use as alpha
*((uint8_t *)p) =
OPACITY_MAX -
((GET_RED(*p) >> 1) + (GET_GREEN(*p) >> 2) + (GET_BLUE(*p) >> 1)) /
3;
MOVE_TO_NEXT_RIGHT_PIXEL(p);
}
}
}
return bitmap;
@@ -1341,7 +1354,7 @@ BitmapBuffer * BitmapBuffer::load_stb(const char * filename)
return nullptr;
}
#if 0
#if 0 // use Stb's "stbi__vertically_flip_on_load" instead of this?
DMABitmapConvert(bmp->data, img, w, h, n == 4 ? DMA2D_ARGB4444 : DMA2D_RGB565);
#else
pixel_t * dest = bmp->getPixelPtrAbs(0, 0);
@@ -1355,7 +1368,7 @@ BitmapBuffer * BitmapBuffer::load_stb(const char * filename)
}
}
}
else {
else { // assume 3 bytes, packed in groups of 4, I guess
for (int row = 0; row < h; ++row) {
for (int col = 0; col < w; ++col) {
*dest = RGB(p[0], p[1], p[2]);