Skip to content

fix displaytext draw picture #24179

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Jason2866 merged 1 commit into from
Dec 7, 2025
+14 −9
Merged

fix displaytext draw picture #24179

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 14 additions & 9 deletions tasmota/tasmota_xdrv_driver/xdrv_13_display.ino
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2432,13 +2432,15 @@ void Draw_RGB_Bitmap(char *file, uint16_t xp, uint16_t yp, uint8_t scale, bool i
estr[cnt] = tolower(ending[cnt]);
}

uint16_t xsize;
uint16_t ysize;

if (!strcmp(estr,"rgb")) {
// special rgb format
fp = ufsp->open(file, FS_FILE_READ);
if (!fp) return;
uint16_t xsize;

fp.read((uint8_t*)&xsize, 2);
uint16_t ysize;
fp.read((uint8_t*)&ysize, 2);
uint16_t xoffs;
uint16_t yoffs;
Expand All @@ -2451,12 +2453,13 @@ void Draw_RGB_Bitmap(char *file, uint16_t xp, uint16_t yp, uint8_t scale, bool i
}

#ifndef SLOW_RGB16
renderer->setAddrWindow(xp, yp, xp + xsize, yp + ysize);
//renderer->setAddrWindow(xp, yp, xp + xsize, yp + ysize);
uint16_t *rgb = (uint16_t *)special_malloc(xsize * 2);
if (rgb) {
//uint16_t rgb[xsize];
for (int16_t j = 0; j < ysize; j++) {
fp.read((uint8_t*)rgb, xsize * 2);
renderer->setAddrWindow(xp, yp + j, xp + xsize, yp + j + 1);
renderer->pushColors(rgb, xsize, true);
OsWatchLoop();
}
Expand All @@ -2476,6 +2479,9 @@ void Draw_RGB_Bitmap(char *file, uint16_t xp, uint16_t yp, uint8_t scale, bool i
yp++;
}
#endif
if (scale) {
if (renderer) renderer->drawRect(xp, yp, xsize, ysize, GetColorFromIndex(scale));
}
fp.close();
} else if (!strcmp(estr,"jpg") || !strcmp(estr,"jpeg")) {
// jpeg files on ESP32 with more memory
Expand All @@ -2492,8 +2498,6 @@ void Draw_RGB_Bitmap(char *file, uint16_t xp, uint16_t yp, uint8_t scale, bool i
if (mem) {
uint8_t res = fp.read(mem, size);
if (res) {
uint16_t xsize;
uint16_t ysize;
uint16_t xoffs;
uint16_t yoffs;
if (mem[0] == 0xff && mem[1] == 0xd8) {
Expand All @@ -2513,14 +2517,15 @@ void Draw_RGB_Bitmap(char *file, uint16_t xp, uint16_t yp, uint8_t scale, bool i
if (pixb) {
uint8_t *ob = out_buf;
if (jpg2rgb888(mem, size, out_buf, (jpg_scale_t)JPG_SCALE_NONE)) {
renderer->setAddrWindow(xp, yp, xp + xsize, yp + ysize);
//renderer->setAddrWindow(xp, yp, xp + xsize, yp + ysize);
for (int32_t j = 0; j < ysize; j++) {
if (inverted == false) {
rgb888_to_565(ob, pixb, xsize);
} else {
rgb888_to_565i(ob, pixb, xsize);
}
ob += xsize * 3;
renderer->setAddrWindow(xp, yp + j, xp + xsize, yp + j + 1);
renderer->pushColors(pixb, xsize, true);
OsWatchLoop();
}
Expand All @@ -2533,12 +2538,12 @@ void Draw_RGB_Bitmap(char *file, uint16_t xp, uint16_t yp, uint8_t scale, bool i
}
}
}
if (scale) {
if (renderer) renderer->drawRect(xp, yp, xsize, ysize, GetColorFromIndex(scale));
}
}
free(mem);
}
if (scale) {
if (renderer) renderer->drawRect(xp, yp, xsize, ysize, GetColorFromIndex(scale));
}
fp.close();
}
#endif // JPEG_PICTS
Expand Down