jeans/Tasmota
jeans/Tasmota
1
0
Fork 0
mirror of https://github.com/arendst/Tasmota.git synced 2025-07-23 10:46:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Bugfix: crash when using tjpegd and LVGL (#21544)

Browse Source 
* prevent crashes when using tjpegd in other places in Tasmota

* do not use external tjpegd in Tasmota
This commit is contained in:
Christian Baars 2024-06-02 09:48:07 +02:00 committed by GitHub
parent e13c0a7114
commit 979dd86730
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/libesp32_lvgl/lvgl/src/libs/tjpgd/tjpgd.c
View File

@ -24,6 +24,7 @@
/ Some performance improvement. / Some performance improvement.
/----------------------------------------------------------------------------*/ /----------------------------------------------------------------------------*/
#ifndef TASMOTA // has tjpegd in ROM
#include "tjpgd.h" #include "tjpgd.h"
@ -1135,3 +1136,5 @@ JRESULT jd_decomp(
return rc; return rc;
} }
#endif // TASMOTA

2
lib/libesp32_lvgl/lvgl/src/libs/tjpgd/tjpgd.h
View File

@ -1,6 +1,7 @@
/*----------------------------------------------------------------------------/ /*----------------------------------------------------------------------------/
/ TJpgDec - Tiny JPEG Decompressor R0.03 include file (C)ChaN, 2021 / TJpgDec - Tiny JPEG Decompressor R0.03 include file (C)ChaN, 2021
/----------------------------------------------------------------------------*/ /----------------------------------------------------------------------------*/
#ifndef TASMOTA // has tjpegd in ROM
#ifndef DEF_TJPGDEC #ifndef DEF_TJPGDEC
#define DEF_TJPGDEC #define DEF_TJPGDEC
@ -101,3 +102,4 @@ JRESULT jd_restart(JDEC * jd, uint16_t rstn);
#endif #endif
#endif /* _TJPGDEC */ #endif /* _TJPGDEC */
#endif // TASMOTA