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

* prevent crashes when using tjpegd in other places in Tasmota * do not use external tjpegd in Tasmota
arendst · Jun 2, 2024 · 979dd86 · 979dd86
1 parent e13c0a7
commit 979dd86
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 0 deletions.
diff --git a/lib/libesp32_lvgl/lvgl/src/libs/tjpgd/tjpgd.c b/lib/libesp32_lvgl/lvgl/src/libs/tjpgd/tjpgd.c
@@ -24,6 +24,7 @@
 /                     Some performance improvement.
 /----------------------------------------------------------------------------*/
 
+#ifndef TASMOTA // has tjpegd in ROM
 #include "tjpgd.h"
 
 
@@ -1135,3 +1136,5 @@ JRESULT jd_decomp(
 
     return rc;
 }
+#endif // TASMOTA
+
diff --git a/lib/libesp32_lvgl/lvgl/src/libs/tjpgd/tjpgd.h b/lib/libesp32_lvgl/lvgl/src/libs/tjpgd/tjpgd.h
@@ -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
 
@@ -101,3 +102,4 @@ JRESULT jd_restart(JDEC * jd, uint16_t rstn);
 #endif
 
 #endif /* _TJPGDEC */
+#endif // TASMOTA