From 433f9ae5e4c499b77a2875bedbf74b6b9df1786d Mon Sep 17 00:00:00 2001
From: "freddy.li" <freddy.li@quectel.com>
Date: Wed, 8 Dec 2021 13:31:51 +0800
Subject: [PATCH] update Zbar

---
 ZBar.mk       |  9 ++-------
 iconv/iconv.c |  2 +-
 zbar/config.h | 14 +++++++-------
 3 files changed, 10 insertions(+), 15 deletions(-)

diff --git a/ZBar.mk b/ZBar.mk
index 2accc00..2cc278e 100644
--- a/ZBar.mk
+++ b/ZBar.mk
@@ -11,13 +11,7 @@ $(NAME)_SRCS += \
 	zbar/scanner.c    	\
 	zbar/symbol.c     	\
 	zbar/decoder/code39.c			\
-	zbar/decoder/code93.c			\
-	zbar/decoder/databar.c			\
 	zbar/decoder/code128.c			\
-	zbar/decoder/ean.c			\
-	zbar/decoder/codabar.c			\
-	zbar/decoder/i25.c			\
-	zbar/decoder/pdf417.c			\
 	zbar/decoder/qr_finder.c			\
 	zbar/qrcode/bch15_5.c			\
 	zbar/qrcode/binarize.c			\
@@ -55,7 +49,8 @@ $(NAME)_CFLAGS = \
 	-Wno-error=implicit-fallthrough= \
 	-Wno-error=pointer-sign \
 	-Wno-error=int-conversion \
-	-Wno-error=unused-const-variable=
+	-Wno-error=unused-const-variable= \
+	-Wno-error=unused-but-set-variable
 	
 
 
diff --git a/iconv/iconv.c b/iconv/iconv.c
index fc25fed..2205ddb 100644
--- a/iconv/iconv.c
+++ b/iconv/iconv.c
@@ -445,6 +445,6 @@ toobig:
 starved:
 	err = EINVAL;
 end:
-	errno = err;
+//	errno = err;
 	return x;
 }
\ No newline at end of file
diff --git a/zbar/config.h b/zbar/config.h
index 6f942f6..05bf930 100644
--- a/zbar/config.h
+++ b/zbar/config.h
@@ -5,26 +5,26 @@
 /* whether to build support for Code 128 symbology */
 #define ENABLE_CODE128 1
 
-/* whether to build support for Code 93 symbology */
-#define ENABLE_CODE93 1
+/* whether to build support for Code 93 symbology */	//TODO Macro control
+//#define ENABLE_CODE93 1
 
 /* whether to build support for Code 39 symbology */
 #define ENABLE_CODE39 1
 
 /* whether to build support for Codabar symbology */
-#define ENABLE_CODABAR 1
+//#define ENABLE_CODABAR 1
 
 /* whether to build support for DataBar symbology */
-#define ENABLE_DATABAR 0
+//#define ENABLE_DATABAR 0
 
 /* whether to build support for EAN symbologies */
-#define ENABLE_EAN 1
+//#define ENABLE_EAN 1
 
 /* whether to build support for Interleaved 2 of 5 symbology */
-#define ENABLE_I25 1
+//#define ENABLE_I25 1
 
 /* whether to build support for PDF417 symbology */
-#define ENABLE_PDF417 1
+//#define ENABLE_PDF417 1
 
 /* whether to build support for QR Code */
 #define ENABLE_QRCODE 1
-- 
Gitee