diff --git a/app/scanner/hg_settingdialog.cpp b/app/scanner/hg_settingdialog.cpp
index defccc14..2fe1038f 100644
--- a/app/scanner/hg_settingdialog.cpp
+++ b/app/scanner/hg_settingdialog.cpp
@@ -1046,8 +1046,8 @@ void hg_settingdialog::slot_gammaButtonClicked()
setPicClrTool dlg(this);
int colorMode; // 0-彩色, 1-灰度
- if (Utf8ToStdString(m_colorModeValue.toUtf8()) == "256级灰度"
- || Utf8ToStdString(m_colorModeValue.toUtf8()) == "黑白")
+ if (m_colorModeValue.toStdString() == OPTION_VALUE_YSMS_256JHD
+ || m_colorModeValue.toStdString() == OPTION_VALUE_YSMS_HB)
{
colorMode = 1;
diff --git a/build-qt/HGSolution/HGScanner.pro b/build-qt/HGSolution/HGScanner.pro
index e7dab395..3fa0ca29 100644
--- a/build-qt/HGSolution/HGScanner.pro
+++ b/build-qt/HGSolution/HGScanner.pro
@@ -80,7 +80,35 @@ unix {
}
}
}
- contains(DISTRIBUTION, kylin){
+ contains(DISTRIBUTION, Kylin){
+
+ contains(ARCH, x86_64){
+ LIBS += -L../../../release/kylin/x86_64 -lHGBase -lHGImgFmt -lHGImgProc -lsane-hgsane -lhgdriver
+ CONFIG(release, debug|release) {
+ DESTDIR = ../../../release/kylin/x86_64/
+ }
+ CONFIG(debug, debug|release) {
+
+ }
+ }
+ contains(ARCH, aarch64){
+ LIBS += -L../../../release/kylin/aarch64 -lHGBase -lHGImgFmt -lHGImgProc -lsane-hgsane -lhgdriver
+ CONFIG(release, debug|release) {
+ DESTDIR = ../../../release/kylin/aarch64/
+ }
+ CONFIG(debug, debug|release) {
+
+ }
+ }
+ contains(ARCH, mips64){
+ LIBS += -L../../../release/kylin/mips64 -lHGBase -lHGImgFmt -lHGImgProc -lsane-hgsane -lhgdriver
+ CONFIG(release, debug|release) {
+ DESTDIR = ../../../release/kylin/mips64/
+ }
+ CONFIG(debug, debug|release) {
+
+ }
+ }
}
}
diff --git a/build/linux/HGBase/HGBase.cbp b/build/linux/HGBase/HGBase.cbp
index e2914d75..f42c3683 100644
--- a/build/linux/HGBase/HGBase.cbp
+++ b/build/linux/HGBase/HGBase.cbp
@@ -46,7 +46,11 @@
+
+
+
+
@@ -57,9 +61,11 @@
+
+
@@ -71,7 +77,11 @@
+
+
+
+
@@ -82,9 +92,104 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -97,6 +202,7 @@
+
diff --git a/build/linux/HGImgFmt/HGImgFmt.cbp b/build/linux/HGImgFmt/HGImgFmt.cbp
index 89ebae2e..f870ee99 100644
--- a/build/linux/HGImgFmt/HGImgFmt.cbp
+++ b/build/linux/HGImgFmt/HGImgFmt.cbp
@@ -183,6 +183,183 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/build/linux/HGImgProc/HGImgProc.cbp b/build/linux/HGImgProc/HGImgProc.cbp
index bc19248f..e46e5ac3 100644
--- a/build/linux/HGImgProc/HGImgProc.cbp
+++ b/build/linux/HGImgProc/HGImgProc.cbp
@@ -148,6 +148,148 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/build/linux/HGSaneUser/HGSaneUser.cbp b/build/linux/HGSaneUser/HGSaneUser.cbp
index 8a1b6a05..e1b28675 100644
--- a/build/linux/HGSaneUser/HGSaneUser.cbp
+++ b/build/linux/HGSaneUser/HGSaneUser.cbp
@@ -81,6 +81,81 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/build/linux/HGTest/HGTest.cbp b/build/linux/HGTest/HGTest.cbp
index f4ed1223..b5a01afc 100644
--- a/build/linux/HGTest/HGTest.cbp
+++ b/build/linux/HGTest/HGTest.cbp
@@ -96,6 +96,96 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/build/linux/HGWebService/HGWebService.cbp b/build/linux/HGWebService/HGWebService.cbp
index 691b6063..ababfd4d 100644
--- a/build/linux/HGWebService/HGWebService.cbp
+++ b/build/linux/HGWebService/HGWebService.cbp
@@ -19,6 +19,7 @@
+
@@ -42,6 +43,7 @@
+
@@ -62,6 +64,7 @@
+
@@ -85,6 +88,7 @@
+
@@ -105,6 +109,7 @@
+
@@ -128,6 +133,7 @@
+
@@ -135,10 +141,144 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-