From d9032677ace728dac69a7a402c0d07432703b081 Mon Sep 17 00:00:00 2001
From: tangyuxin <462747508@qq.com>
Date: Mon, 6 Nov 2017 16:59:44 +0800
Subject: [PATCH] =?UTF-8?q?[gui]=E6=9B=B4=E6=94=B9"JPEG"=E5=92=8C"PNG"?=
 =?UTF-8?q?=E9=80=89=E9=A1=B9=E4=B8=BA=E5=A4=9A=E9=80=89=E4=B8=80=E6=A8=A1?=
 =?UTF-8?q?=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/gui/Kconfig | 36 ++++++++++++++++++++++++------------
 1 file changed, 24 insertions(+), 12 deletions(-)

diff --git a/components/gui/Kconfig b/components/gui/Kconfig
index 5d97211a5b..e180420c7e 100644
--- a/components/gui/Kconfig
+++ b/components/gui/Kconfig
@@ -36,21 +36,33 @@ config RTGUI_IMAGE_XPM
     bool "Support XPM image format"
     default n
 
-config RTGUI_IMAGE_JPEG
-    bool "Support JPEG image format"
-    default n
+choice
+    prompt "JPEG image format"
+    default RTGUI_IMAGE_JPEG_NONE
 
-config RTGUI_IMAGE_TJPGD
-    bool "Use TJPGD for JPEG image"
-    default n
+    config RTGUI_IMAGE_JPEG_NONE
+        bool "No PNG image format"
 
-config RTGUI_IMAGE_PNG
-    bool "Support PNG image format"
-    default n
+    config RTGUI_IMAGE_JPEG
+        bool "Use libjpeg"
 
-config RTGUI_IMAGE_LODEPNG
-    bool "Use lodepng for PNG image"
-    default n
+    config RTGUI_IMAGE_TJPGD
+        bool "Use TJPGD"
+endchoice
+
+choice
+    prompt "PNG image format"
+    default RTGUI_IMAGE_PNG_NONE
+
+    config RTGUI_IMAGE_PNG_NONE
+        bool "No PNG image format"
+
+    config RTGUI_IMAGE_PNG
+        bool "Use libpng"
+
+    config RTGUI_IMAGE_LODEPNG
+        bool "Use lodepng"
+endchoice
 
 config RTGUI_IMAGE_BMP
     bool "Support BMP image format"
-- 
GitLab