From e31b6a156e07d7b8220b1012103531400dcc8499 Mon Sep 17 00:00:00 2001
From: Gabor Kiss-Vamosi <kisvegabor@gmail.com>
Date: Wed, 15 May 2019 05:22:03 +0200
Subject: [PATCH] move lv_img_decoder to lv_draw

---
 src/lv_core/lv_obj.c                      | 1 -
 src/lv_draw/lv_draw.h                     | 2 +-
 src/lv_draw/lv_draw_img.h                 | 3 +--
 src/{lv_misc => lv_draw}/lv_img_decoder.c | 6 +++---
 src/{lv_misc => lv_draw}/lv_img_decoder.h | 6 +++---
 src/lv_objx/lv_img.c                      | 2 +-
 6 files changed, 9 insertions(+), 11 deletions(-)
 rename src/{lv_misc => lv_draw}/lv_img_decoder.c (99%)
 rename src/{lv_misc => lv_draw}/lv_img_decoder.h (98%)

diff --git a/src/lv_core/lv_obj.c b/src/lv_core/lv_obj.c
index 9ebd4964e..c49224c72 100644
--- a/src/lv_core/lv_obj.c
+++ b/src/lv_core/lv_obj.c
@@ -16,7 +16,6 @@
 #include "../lv_misc/lv_anim.h"
 #include "../lv_misc/lv_task.h"
 #include "../lv_misc/lv_fs.h"
-#include "../lv_misc/lv_img_decoder.h"
 #include "../lv_hal/lv_hal.h"
 #include <stdint.h>
 #include <string.h>
diff --git a/src/lv_draw/lv_draw.h b/src/lv_draw/lv_draw.h
index 1828e32c2..8d3d281a7 100644
--- a/src/lv_draw/lv_draw.h
+++ b/src/lv_draw/lv_draw.h
@@ -21,7 +21,7 @@ extern "C" {
 
 #include "../lv_core/lv_style.h"
 #include "../lv_misc/lv_txt.h"
-#include "../lv_misc/lv_img_decoder.h"
+#include "lv_img_decoder.h"
 
 /*********************
  *      DEFINES
diff --git a/src/lv_draw/lv_draw_img.h b/src/lv_draw/lv_draw_img.h
index 446b2c302..d8e927176 100644
--- a/src/lv_draw/lv_draw_img.h
+++ b/src/lv_draw/lv_draw_img.h
@@ -14,8 +14,7 @@ extern "C" {
  *      INCLUDES
  *********************/
 #include "lv_draw.h"
-#include "../lv_core/lv_obj.h"
-#include "../lv_misc/lv_img_decoder.h"
+#include "lv_img_decoder.h"
 
 /*********************
  *      DEFINES
diff --git a/src/lv_misc/lv_img_decoder.c b/src/lv_draw/lv_img_decoder.c
similarity index 99%
rename from src/lv_misc/lv_img_decoder.c
rename to src/lv_draw/lv_img_decoder.c
index a18a9a28b..b52cd7de2 100644
--- a/src/lv_misc/lv_img_decoder.c
+++ b/src/lv_draw/lv_img_decoder.c
@@ -8,9 +8,9 @@
  *********************/
 #include "lv_img_decoder.h"
 #include "../lv_draw/lv_draw_img.h"
-#include "lv_ll.h"
-#include "lv_color.h"
-#include "lv_gc.h"
+#include "../lv_misc/lv_ll.h"
+#include "../lv_misc/lv_color.h"
+#include "../lv_misc/lv_gc.h"
 
 #if defined(LV_GC_INCLUDE)
 #include LV_GC_INCLUDE
diff --git a/src/lv_misc/lv_img_decoder.h b/src/lv_draw/lv_img_decoder.h
similarity index 98%
rename from src/lv_misc/lv_img_decoder.h
rename to src/lv_draw/lv_img_decoder.h
index e431f227a..058360323 100644
--- a/src/lv_misc/lv_img_decoder.h
+++ b/src/lv_draw/lv_img_decoder.h
@@ -20,9 +20,9 @@ extern "C" {
 #endif
 
 #include <stdint.h>
-#include "lv_fs.h"
-#include "lv_types.h"
-#include "lv_area.h"
+#include "../lv_misc/lv_fs.h"
+#include "../lv_misc/lv_types.h"
+#include "../lv_misc/lv_area.h"
 #include "../lv_core/lv_style.h"
 
 /*********************
diff --git a/src/lv_objx/lv_img.c b/src/lv_objx/lv_img.c
index 15a3299d8..f9eca884d 100644
--- a/src/lv_objx/lv_img.c
+++ b/src/lv_objx/lv_img.c
@@ -15,7 +15,7 @@
 #endif
 
 #include "../lv_themes/lv_theme.h"
-#include "../lv_misc/lv_img_decoder.h"
+#include "../lv_draw/lv_img_decoder.h"
 #include "../lv_misc/lv_fs.h"
 #include "../lv_misc/lv_txt.h"
 #include "../lv_misc/lv_log.h"