From cab4d907f18289255ddbd3e1433088dd5d327ecd Mon Sep 17 00:00:00 2001
From: luoliangyi <87842688@@qq.com>
Date: Tue, 20 Jun 2023 11:06:33 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84linux=E4=B8=80=E9=94=AE?=
 =?UTF-8?q?=E7=BC=96=E8=AF=91=E8=84=9A=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 build.sh                            | 122 ++++++++++++++++++++++++----
 modules/saneui/hg_settingdialog.cpp |   1 +
 2 files changed, 107 insertions(+), 16 deletions(-)

diff --git a/build.sh b/build.sh
index 5ac11951..846ddcb6 100755
--- a/build.sh
+++ b/build.sh
@@ -9,15 +9,15 @@ rm -rf ../temp
 
 rm -f Makefile
 rm -f HGBase/Makefile
-rm -f HGDemo/Makefile
 rm -f HGFWUpgrade/Makefile
 rm -f HGImgFmt/Makefile
 rm -f HGImgProc/Makefile
 rm -f HGSaneUI/Makefile
 rm -f HGSaneUser/Makefile
+rm -f HGOCR/Makefile
 rm -f HGScanner/Makefile
+rm -f HGScanner2/Makefile
 rm -f HGScannerLib/Makefile
-rm -f HGTwainUser/Makefile
 rm -f HGUpgrade/Makefile
 rm -f HGUpload/Makefile
 rm -f HGVersion/Makefile
@@ -50,8 +50,23 @@ if [ "${1}" == "hwall" ] || [ "${1}" == "hw"  ]|| [ "${1}" == "hwweb" ] || [ "${
 
 		if [ "${1}" == "hw" ]; then	
 
-			cd HGScanner
-			qmake -qt=qt5 -makefile "DEFINES += OEM_HANWANG" HGScanner.pro
+			cd HGOCR
+			qmake -qt=qt5 -makefile "DEFINES += OEM_HANWANG" HGOCR.pro
+			make -j8
+			cd ../
+
+			cd HGSaneUI
+			qmake -qt=qt5 -makefile "DEFINES += OEM_HANWANG" HGSaneUI.pro
+			make -j8
+			cd ../
+
+			cd HGSaneUser
+			qmake -qt=qt5 -makefile "DEFINES += OEM_HANWANG" HGSaneUser.pro
+			make -j8
+			cd ../
+
+			cd HGScanner2
+			qmake -qt=qt5 -makefile "DEFINES += OEM_HANWANG" HGScanner2.pro
 			make -j8
 			cd ../
 
@@ -96,10 +111,25 @@ elif [ "${1}" == "lscall" ] || [ "${1}" == "lsc" ] || [ "${1}" == "lscweb" ] ||
 		make -j8
 		cd ../
 
-		if [ "${1}" == "lsc" ]; then	
+		if [ "${1}" == "lsc" ]; then
 
-			cd HGScanner
-			qmake -qt=qt5 -makefile "DEFINES += OEM_LISICHENG" HGScanner.pro
+			cd HGOCR
+			qmake -qt=qt5 -makefile "DEFINES += OEM_LISICHENG" HGOCR.pro
+			make -j8
+			cd ../
+
+			cd HGSaneUI
+			qmake -qt=qt5 -makefile "DEFINES += OEM_LISICHENG" HGSaneUI.pro
+			make -j8
+			cd ../
+
+			cd HGSaneUser
+			qmake -qt=qt5 -makefile "DEFINES += OEM_LISICHENG" HGSaneUser.pro
+			make -j8
+			cd ../	
+
+			cd HGScanner2
+			qmake -qt=qt5 -makefile "DEFINES += OEM_LISICHENG" HGScanner2.pro
 			make -j8
 			cd ../
 
@@ -144,10 +174,25 @@ elif [ "${1}" == "ctsall" ] || [ "${1}" == "cts" ] || [ "${1}" == "ctsweb" ] ||
 		make -j8
 		cd ../
 
-		if [ "${1}" == "cts" ]; then	
+		if [ "${1}" == "cts" ]; then
 
-			cd HGScanner
-			qmake -qt=qt5 -makefile "DEFINES += OEM_CANGTIAN" HGScanner.pro
+			cd HGOCR
+			qmake -qt=qt5 -makefile "DEFINES += OEM_CANGTIAN" HGOCR.pro
+			make -j8
+			cd ../	
+
+			cd HGSaneUI
+			qmake -qt=qt5 -makefile "DEFINES += OEM_CANGTIAN" HGSaneUI.pro
+			make -j8
+			cd ../
+
+			cd HGSaneUser
+			qmake -qt=qt5 -makefile "DEFINES += OEM_CANGTIAN" HGSaneUser.pro
+			make -j8
+			cd ../	
+
+			cd HGScanner2
+			qmake -qt=qt5 -makefile "DEFINES += OEM_CANGTIAN" HGScanner2.pro
 			make -j8
 			cd ../
 
@@ -194,8 +239,23 @@ elif [ "${1}" == "zjall" ] || [ "${1}" == "zj" ] || [ "${1}" == "zjweb" ] || [ "
 
 		if [ "${1}" == "zj" ]; then	
 
-			cd HGScanner
-			qmake -qt=qt5 -makefile "DEFINES += OEM_ZHONGJING" HGScanner.pro
+			cd HGOCR
+			qmake -qt=qt5 -makefile "DEFINES += OEM_ZHONGJING" HGOCR.pro
+			make -j8
+			cd ../
+
+			cd HGSaneUI
+			qmake -qt=qt5 -makefile "DEFINES += OEM_ZHONGJING" HGSaneUI.pro
+			make -j8
+			cd ../
+
+			cd HGSaneUser
+			qmake -qt=qt5 -makefile "DEFINES += OEM_ZHONGJING" HGSaneUser.pro
+			make -j8
+			cd ../	
+
+			cd HGScanner2
+			qmake -qt=qt5 -makefile "DEFINES += OEM_ZHONGJING" HGScanner2.pro
 			make -j8
 			cd ../
 
@@ -242,8 +302,23 @@ elif [ "${1}" == "zgall" ] || [ "${1}" == "zg" ] || [ "${1}" == "zgweb" ] || [ "
 
 		if [ "${1}" == "zg" ]; then	
 
-			cd HGScanner
-			qmake -qt=qt5 -makefile "DEFINES += OEM_ZIGUANG" HGScanner.pro
+			cd HGOCR
+			qmake -qt=qt5 -makefile "DEFINES += OEM_ZIGUANG" HGOCR.pro
+			make -j8
+			cd ../
+
+			cd HGSaneUI
+			qmake -qt=qt5 -makefile "DEFINES += OEM_ZIGUANG" HGSaneUI.pro
+			make -j8
+			cd ../
+
+			cd HGSaneUser
+			qmake -qt=qt5 -makefile "DEFINES += OEM_ZIGUANG" HGSaneUser.pro
+			make -j8
+			cd ../
+
+			cd HGScanner2
+			qmake -qt=qt5 -makefile "DEFINES += OEM_ZIGUANG" HGScanner2.pro
 			make -j8
 			cd ../
 
@@ -295,8 +370,23 @@ else
 			make -j8
 			cd ../
 
-			cd HGScanner
-			qmake -qt=qt5 -makefile HGScanner.pro
+			cd HGOCR
+			qmake -qt=qt5 -makefile HGOCR.pro
+			make -j8
+			cd ../
+
+			cd HGSaneUI
+			qmake -qt=qt5 -makefile HGSaneUI.pro
+			make -j8
+			cd ../
+
+			cd HGSaneUser
+			qmake -qt=qt5 -makefile HGSaneUser.pro
+			make -j8
+			cd ../
+
+			cd HGScanner2
+			qmake -qt=qt5 -makefile HGScanner2.pro
 			make -j8
 			cd ../
 
diff --git a/modules/saneui/hg_settingdialog.cpp b/modules/saneui/hg_settingdialog.cpp
index 6f43d06c..614e3bbb 100644
--- a/modules/saneui/hg_settingdialog.cpp
+++ b/modules/saneui/hg_settingdialog.cpp
@@ -961,6 +961,7 @@ void hg_settingdialog::slot_checkedClicked()
     else if(method & SANE_INFO_INEXACT)
         checkBox->setCheckState(checkBoxcurrentState ? Qt::CheckState::Checked : Qt::CheckState::Unchecked);
 
+    const SANE_Option_Descriptor* opt = nullptr;
     for (int i = 0; i < m_list_getOpt.size(); i++)
     {
         if (m_list_getOpt.at(i).first == id)