Skip to content
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

Jump to bottom

Bugfix: crash when using tjpegd and LVGL #21544

Merged
merged 2 commits into from
Jun 2, 2024
Merged

Bugfix: crash when using tjpegd and LVGL #21544

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
53f7b02
prevent crashes when using tjpegd in other places in Tasmota
Staars Jun 2, 2024
b372212
do not use external tjpegd in Tasmota
Staars Jun 2, 2024
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
3 changes: 3 additions & 0 deletions lib/libesp32_lvgl/lvgl/src/libs/tjpgd/tjpgd.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
/ Some performance improvement.
/----------------------------------------------------------------------------*/

#ifndef TASMOTA // has tjpegd in ROM
#include "tjpgd.h"


Expand Down Expand Up @@ -1135,3 +1136,5 @@ JRESULT jd_decomp(

return rc;
}
#endif // TASMOTA

2 changes: 2 additions & 0 deletions lib/libesp32_lvgl/lvgl/src/libs/tjpgd/tjpgd.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
/*----------------------------------------------------------------------------/
/ TJpgDec - Tiny JPEG Decompressor R0.03 include file (C)ChaN, 2021
/----------------------------------------------------------------------------*/
#ifndef TASMOTA // has tjpegd in ROM
#ifndef DEF_TJPGDEC
#define DEF_TJPGDEC

Expand Down Expand Up @@ -101,3 +102,4 @@ JRESULT jd_restart(JDEC * jd, uint16_t rstn);
#endif

#endif /* _TJPGDEC */
#endif // TASMOTA