From e657c74aca61542095b8b399684f28476c408786 Mon Sep 17 00:00:00 2001
From: Gabor Kiss-Vamosi <kisvegabor@gmail.com>
Date: Mon, 18 Sep 2023 21:29:22 +0200
Subject: [PATCH] chore: fix build errors

---
 examples/libs/jpg/img_lvgl_logo.jpg             | Bin 0 -> 1947 bytes
 examples/libs/{sjpg => jpg}/index.rst           |   0
 .../lv_example_sjpg.h => jpg/lv_example_jpg.h}  |  10 +++++-----
 .../lv_example_jpg_1.c}                         |  11 ++++-------
 .../lv_example_jpg_1.py}                        |   2 +-
 examples/libs/lv_example_libs.h                 |   2 +-
 examples/libs/sjpg/small_image.sjpg             | Bin 17962 -> 0 bytes
 lv_conf_template.h                              |   2 +-
 src/libs/jpg/lv_jpg.c                           |   6 +++---
 src/libs/jpg/lv_jpg.h                           |   6 +++---
 src/lv_conf_internal.h                          |   8 ++++----
 src/lv_init.c                                   |   4 ++--
 tests/src/lv_test_conf_full.h                   |   2 +-
 13 files changed, 25 insertions(+), 28 deletions(-)
 create mode 100644 examples/libs/jpg/img_lvgl_logo.jpg
 rename examples/libs/{sjpg => jpg}/index.rst (100%)
 rename examples/libs/{sjpg/lv_example_sjpg.h => jpg/lv_example_jpg.h} (75%)
 rename examples/libs/{sjpg/lv_example_sjpg_1.c => jpg/lv_example_jpg_1.c} (53%)
 rename examples/libs/{sjpg/lv_example_sjpg_1.py => jpg/lv_example_jpg_1.py} (87%)
 delete mode 100644 examples/libs/sjpg/small_image.sjpg

diff --git a/examples/libs/jpg/img_lvgl_logo.jpg b/examples/libs/jpg/img_lvgl_logo.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..0bfa5e65e9eabd8be1a9a82af427f6829ec5c3ad
GIT binary patch
literal 1947
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
Y(c%3>9?OUeQ4r#P<m{g(HPQ6H01&WG>Hq)$

literal 0
HcmV?d00001

diff --git a/examples/libs/sjpg/index.rst b/examples/libs/jpg/index.rst
similarity index 100%
rename from examples/libs/sjpg/index.rst
rename to examples/libs/jpg/index.rst
diff --git a/examples/libs/sjpg/lv_example_sjpg.h b/examples/libs/jpg/lv_example_jpg.h
similarity index 75%
rename from examples/libs/sjpg/lv_example_sjpg.h
rename to examples/libs/jpg/lv_example_jpg.h
index 113557c44..09cf60e7e 100644
--- a/examples/libs/sjpg/lv_example_sjpg.h
+++ b/examples/libs/jpg/lv_example_jpg.h
@@ -1,10 +1,10 @@
 /**
- * @file lv_example_sjpg.h
+ * @file lv_example_jpg.h
  *
  */
 
-#ifndef LV_EXAMPLE_SJPG_H
-#define LV_EXAMPLE_SJPG_H
+#ifndef LV_EXAMPLE_JPG_H
+#define LV_EXAMPLE_JPG_H
 
 #ifdef __cplusplus
 extern "C" {
@@ -25,7 +25,7 @@ extern "C" {
 /**********************
  * GLOBAL PROTOTYPES
  **********************/
-void lv_example_sjpg_1(void);
+void lv_example_jpg_1(void);
 
 /**********************
  *      MACROS
@@ -35,4 +35,4 @@ void lv_example_sjpg_1(void);
 } /*extern "C"*/
 #endif
 
-#endif /*LV_EXAMPLE_SJPG_H*/
+#endif /*LV_EXAMPLE_JPG_H*/
diff --git a/examples/libs/sjpg/lv_example_sjpg_1.c b/examples/libs/jpg/lv_example_jpg_1.c
similarity index 53%
rename from examples/libs/sjpg/lv_example_sjpg_1.c
rename to examples/libs/jpg/lv_example_jpg_1.c
index 8c9cd3f69..3d4026d96 100644
--- a/examples/libs/sjpg/lv_example_sjpg_1.c
+++ b/examples/libs/jpg/lv_example_jpg_1.c
@@ -1,20 +1,17 @@
 #include "../../lv_examples.h"
-#if LV_USE_SJPG && LV_BUILD_EXAMPLES
+#if LV_USE_JPG && LV_BUILD_EXAMPLES
 
 /**
- * Load an SJPG image
+ * Load a JPG image
  */
-void lv_example_sjpg_1(void)
+void lv_example_jpg_1(void)
 {
     lv_obj_t * wp;
 
-    LV_IMAGE_DECLARE(codeblocks)
-
     wp = lv_image_create(lv_scr_act());
     /* Assuming a File system is attached to letter 'A'
      * E.g. set LV_USE_FS_STDIO 'A' in lv_conf.h */
-    lv_image_set_src(wp, "A:codeblocks.jpg");
-    //    lv_image_set_src(wp, &codeblocks);
+    lv_image_set_src(wp, "A:lvgl/examples/libs/jpg/img_lvgl_logo.jpg");
     lv_obj_center(wp);
 }
 
diff --git a/examples/libs/sjpg/lv_example_sjpg_1.py b/examples/libs/jpg/lv_example_jpg_1.py
similarity index 87%
rename from examples/libs/sjpg/lv_example_sjpg_1.py
rename to examples/libs/jpg/lv_example_jpg_1.py
index babc97edf..d16516931 100755
--- a/examples/libs/sjpg/lv_example_sjpg_1.py
+++ b/examples/libs/jpg/lv_example_jpg_1.py
@@ -9,5 +9,5 @@ fs_driver.fs_register(fs_drv, 'S')
 wp = lv.image(lv.scr_act())
 # The File system is attached to letter 'S'
 
-wp.set_src("S:small_image.sjpg")
+wp.set_src("S:img_lvgl_logo.jpg")
 wp.center()
diff --git a/examples/libs/lv_example_libs.h b/examples/libs/lv_example_libs.h
index 0324ab79f..d7da2110b 100644
--- a/examples/libs/lv_example_libs.h
+++ b/examples/libs/lv_example_libs.h
@@ -21,7 +21,7 @@ extern "C" {
 #include "png/lv_example_png.h"
 #include "qrcode/lv_example_qrcode.h"
 #include "rlottie/lv_example_rlottie.h"
-#include "sjpg/lv_example_sjpg.h"
+#include "jpg/lv_example_jpg.h"
 #include "tiny_ttf/lv_example_tiny_ttf.h"
 
 /*********************
diff --git a/examples/libs/sjpg/small_image.sjpg b/examples/libs/sjpg/small_image.sjpg
deleted file mode 100644
index cab12e6dbd430582a3d2ca1f5cbcd7b015001298..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 17962
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
WwEtTqIAU>TkgQp7RlWK}#D4%b#Q8=5

diff --git a/lv_conf_template.h b/lv_conf_template.h
index d6a84bc73..6207c396d 100644
--- a/lv_conf_template.h
+++ b/lv_conf_template.h
@@ -583,7 +583,7 @@
 
 /* JPG + split JPG decoder library.
  * Split JPG is a custom format optimized for embedded systems. */
-#define LV_USE_SJPG 0
+#define LV_USE_JPG 0
 
 /*GIF decoder library*/
 #define LV_USE_GIF 0
diff --git a/src/libs/jpg/lv_jpg.c b/src/libs/jpg/lv_jpg.c
index c78cab573..e6a73ec58 100644
--- a/src/libs/jpg/lv_jpg.c
+++ b/src/libs/jpg/lv_jpg.c
@@ -46,7 +46,7 @@
  *********************/
 
 #include "../../../lvgl.h"
-#if LV_USE_SJPG
+#if LV_USE_JPG
 
 #include "tjpgd.h"
 #include "lv_jpg.h"
@@ -85,7 +85,7 @@ static int is_jpg(const uint8_t * raw_data, size_t len);
  *   GLOBAL FUNCTIONS
  **********************/
 
-void lv_jpeg_init(void)
+void lv_jpg_init(void)
 {
     lv_image_decoder_t * dec = lv_image_decoder_create();
     lv_image_decoder_set_info_cb(dec, decoder_info);
@@ -288,4 +288,4 @@ static int is_jpg(const uint8_t * raw_data, size_t len)
     return memcmp(jpg_signature, raw_data, sizeof(jpg_signature)) == 0;
 }
 
-#endif /*LV_USE_SJPG*/
+#endif /*LV_USE_JPG*/
diff --git a/src/libs/jpg/lv_jpg.h b/src/libs/jpg/lv_jpg.h
index c301dca20..3158d80a9 100644
--- a/src/libs/jpg/lv_jpg.h
+++ b/src/libs/jpg/lv_jpg.h
@@ -14,7 +14,7 @@ extern "C" {
  *      INCLUDES
  *********************/
 
-#if LV_USE_SJPG
+#if LV_USE_JPG
 
 /*********************
  *      DEFINES
@@ -28,13 +28,13 @@ extern "C" {
  * GLOBAL PROTOTYPES
  **********************/
 
-void lv_jpeg_init(void);
+void lv_jpg_init(void);
 
 /**********************
  *      MACROS
  **********************/
 
-#endif /*LV_USE_SJPG*/
+#endif /*LV_USE_JPG*/
 
 #ifdef __cplusplus
 }
diff --git a/src/lv_conf_internal.h b/src/lv_conf_internal.h
index d5e93b789..615565998 100644
--- a/src/lv_conf_internal.h
+++ b/src/lv_conf_internal.h
@@ -1957,11 +1957,11 @@
 
 /* JPG + split JPG decoder library.
  * Split JPG is a custom format optimized for embedded systems. */
-#ifndef LV_USE_SJPG
-    #ifdef CONFIG_LV_USE_SJPG
-        #define LV_USE_SJPG CONFIG_LV_USE_SJPG
+#ifndef LV_USE_JPG
+    #ifdef CONFIG_LV_USE_JPG
+        #define LV_USE_JPG CONFIG_LV_USE_JPG
     #else
-        #define LV_USE_SJPG 0
+        #define LV_USE_JPG 0
     #endif
 #endif
 
diff --git a/src/lv_init.c b/src/lv_init.c
index 4adc35116..40eef1f14 100644
--- a/src/lv_init.c
+++ b/src/lv_init.c
@@ -219,8 +219,8 @@ void lv_init(void)
     lv_png_init();
 #endif
 
-#if LV_USE_SJPG
-    lv_jpeg_init();
+#if LV_USE_JPG
+    lv_jpg_init();
 #endif
 
 #if LV_USE_BMP
diff --git a/tests/src/lv_test_conf_full.h b/tests/src/lv_test_conf_full.h
index e6eec2138..791f75dc8 100644
--- a/tests/src/lv_test_conf_full.h
+++ b/tests/src/lv_test_conf_full.h
@@ -63,7 +63,7 @@
 
 #define LV_USE_PNG          1
 #define LV_USE_BMP          1
-#define LV_USE_SJPG         1
+#define LV_USE_JPG         1
 #define LV_USE_GIF          1
 #define LV_USE_QRCODE       1
 #define LV_USE_BARCODE      1