From 979dd8673089fe76a8f16082a5c4003918b82f2c Mon Sep 17 00:00:00 2001
From: Christian Baars <baars@klinikum-brandenburg.de>
Date: Sun, 2 Jun 2024 09:48:07 +0200
Subject: [PATCH] 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
---
 lib/libesp32_lvgl/lvgl/src/libs/tjpgd/tjpgd.c | 3 +++
 lib/libesp32_lvgl/lvgl/src/libs/tjpgd/tjpgd.h | 2 ++
 2 files changed, 5 insertions(+)

diff --git a/lib/libesp32_lvgl/lvgl/src/libs/tjpgd/tjpgd.c b/lib/libesp32_lvgl/lvgl/src/libs/tjpgd/tjpgd.c
index 22dfd5632..63f4915d5 100644
--- 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
index f1b578820..7c0b91a00 100644
--- 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