From 7b13bec0d00175266438bab4e7a6cc47f1f2cecc Mon Sep 17 00:00:00 2001
From: yangjiaxuan <171295266@qq.com>
Date: Wed, 20 Jul 2022 17:51:44 +0800
Subject: [PATCH] =?UTF-8?q?x86=5F64=E5=B1=8F=E8=94=BDOcr?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/scanner/dialog_aquireinto.cpp           |  2 +-
 app/scanner/dialog_export.cpp               |  2 +-
 app/scanner/dialog_saveas.cpp               |  2 +-
 build-qt/HGSolution/HGScanner/HGScanner.pro | 11 +++++++++--
 4 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/app/scanner/dialog_aquireinto.cpp b/app/scanner/dialog_aquireinto.cpp
index c6a51c3d..30440b06 100644
--- a/app/scanner/dialog_aquireinto.cpp
+++ b/app/scanner/dialog_aquireinto.cpp
@@ -41,7 +41,7 @@ Dialog_AquireInto::Dialog_AquireInto(QWidget* parent) :
     ui->lineEdit_fileName->setText(getCfgValue("aquire", "namePrefix", QString("HGScan")));
 #endif
 
-#if defined(OEM_LISICHENG)
+#if defined(OEM_LISICHENG) || defined(x86_64)
     ui->cbox_format->removeItem(7);
     ui->cbox_format->removeItem(6);
 #endif
diff --git a/app/scanner/dialog_export.cpp b/app/scanner/dialog_export.cpp
index c4aae079..0bd1e7a1 100644
--- a/app/scanner/dialog_export.cpp
+++ b/app/scanner/dialog_export.cpp
@@ -25,7 +25,7 @@ static struct
     int     attr;
 }g_support_type[] =
 {
-#if defined(OEM_LISICHENG)
+#if defined(OEM_LISICHENG) || defined(x86_64)
       {".jpg", "JPG - JPEG / JFIF", FILE_TYPE_ATTR_MORE_OPTIONS}
     , {".bmp", "BMP - Windows Bitmap", FILE_TYPE_ATTR_NO_MORE_OPTION}
     , {".png", "PNG - Portable Network Graphics", FILE_TYPE_ATTR_NO_MORE_OPTION}
diff --git a/app/scanner/dialog_saveas.cpp b/app/scanner/dialog_saveas.cpp
index a8ea17ae..683f7f99 100644
--- a/app/scanner/dialog_saveas.cpp
+++ b/app/scanner/dialog_saveas.cpp
@@ -15,7 +15,7 @@ Dialog_SaveAs::Dialog_SaveAs(QWidget *parent) :
     ui->fileDialog->setWindowFlags(ui->fileDialog->windowFlags() & ~Qt::Dialog);
     ui->fileDialog->setOption(QFileDialog::DontUseNativeDialog, true);
     ui->fileDialog->setSizeGripEnabled(false);
-#if defined(OEM_LISICHENG)
+#if defined(OEM_LISICHENG) || defined(x86_64)
     ui->fileDialog->setNameFilter("JPG - JPEG / JFIF(*.jpg);;"
                 "BMP - Windows Bitmap(*.bmp);;"
                 "PNG - Portable Network Graphics(*.png);;"
diff --git a/build-qt/HGSolution/HGScanner/HGScanner.pro b/build-qt/HGSolution/HGScanner/HGScanner.pro
index 1b00e5b1..45fdeb74 100644
--- a/build-qt/HGSolution/HGScanner/HGScanner.pro
+++ b/build-qt/HGSolution/HGScanner/HGScanner.pro
@@ -26,6 +26,7 @@ win32 {
 	DEFINES += _CRT_SECURE_NO_WARNINGS
 	
 	contains(QT_ARCH, i386) {
+                DEFINES += i386
                 LIBS += -L../../../../sdk/lib/win/x86/Release -lHGBase -lHGImgFmt -lHGImgProc -lsane
 		CONFIG(release, debug|release) {
                         DESTDIR = ../../../../release/win/x86/Release/
@@ -53,8 +54,9 @@ unix {
 
         contains(DISTRIBUTION, UnionTech){
                 message('UOS')
-                DEFINES += UOS
+                        DEFINES += UOS
                 contains(ARCH, x86_64){
+                        DEFINES += x86_64
                         LIBS += -L../../../../release/uos/x86_64 -lHGBase -lHGImgFmt -lHGImgProc -lsane-hgsane -lhgdriver
 			CONFIG(release, debug|release) {
                                 DESTDIR = ../../../../release/uos/x86_64/
@@ -64,6 +66,7 @@ unix {
 			}
 		}
                 contains(ARCH, aarch64){
+                        DEFINES += aarch64
                         LIBS += -L../../../../release/uos/aarch64 -lHGBase -lHGImgFmt -lHGImgProc -lsane-hgsane -lhgdriver
 			CONFIG(release, debug|release) {
                                 DESTDIR = ../../../../release/uos/aarch64/
@@ -73,6 +76,7 @@ unix {
 			}
 		}
 		contains(ARCH, mips64){
+                        DEFINES += mips64
                         LIBS += -L../../../../release/uos/mips64 -lHGBase -lHGImgFmt -lHGImgProc -lsane-hgsane -lhgdriver
 			CONFIG(release, debug|release) {
                                 DESTDIR = ../../../../release/uos/mips64/
@@ -83,8 +87,9 @@ unix {
 		}
 	}else{
                 message('KYLIN')
-                DEFINES += KYLIN
+                        DEFINES += KYLIN
                 contains(ARCH, x86_64){
+                        DEFINES += x86_64
                         LIBS += -L../../../../release/kylin/x86_64 -lHGBase -lHGImgFmt -lHGImgProc -lsane-hgsane -lhgdriver
                         CONFIG(release, debug|release) {
                                 DESTDIR = ../../../../release/kylin/x86_64/
@@ -94,6 +99,7 @@ unix {
                         }
                 }
                 contains(ARCH, aarch64){
+                        DEFINES += aarch64
                         LIBS += -L../../../../release/kylin/aarch64 -lHGBase -lHGImgFmt -lHGImgProc -lsane-hgsane -lhgdriver
                         CONFIG(release, debug|release) {
                                 DESTDIR = ../../../../release/kylin/aarch64/
@@ -103,6 +109,7 @@ unix {
                         }
                 }
                 contains(ARCH, mips64){
+                        DEFINES += mips64
                         LIBS += -L../../../../release/kylin/mips64 -lHGBase -lHGImgFmt -lHGImgProc -lsane-hgsane -lhgdriver
                         CONFIG(release, debug|release) {
                                 DESTDIR = ../../../../release/kylin/mips64/