Merge branch 'master' of http://192.168.100.140:8099/sane/code_device

build.sh

@@ -4,7 +4,7 @@ cpu=$(arch) #cpu架构
 sys=$(cat /etc/issue)
 sys=${sys%% *} #操作系统
 mainverstr="s/ver_1/4/g"  #版本控制
-minver="21"
+minver="22"
 minverstr="s/ver_2/"
 verstr3="s/ver_3/"
 ver3=10

hgdriver/hgdev/hg_scanner.cpp

@@ -965,7 +965,11 @@ int hg_scanner::setting_help(int sn, void* data)
 	}
 
 	com += helpfile;
+#if defined(WIN32) || defined(_WIN64)
+	ShellExecuteA(NULL, "Open", com.c_str(), NULL, NULL, SW_SHOWNORMAL);
+#else
 	system(com.c_str());
+#endif
 	VLOG_MINI_1(LOG_LEVEL_DEBUG_INFO,"App_Help_pdf path  is:%s  system is:%d\r\n",helpfile.c_str());
 	return ret;
 }

hgdriver/hgdev/hg_scanner.h

@@ -354,7 +354,7 @@ public:
 #ifdef UOS
     #ifdef OEM_HANWANG
     static const std::string helpfile_ ="/opt/apps/com.hanvonchina.hanvonscan/entries/help/HanvonScan_scanSettings_Help_manual.pdf";//帮助文档路径
-    #elif  OEM_LISICHENG
+    #elif  defined(OEM_LISICHENG)
     static const std::string helpfile_ ="/opt/apps/com.lanxumchina.lanxumscan/entries/help/LanxumScan_scanSettings_Help_manual.pdf";//帮助文档路径
     #else
     static const std::string helpfile_ ="/opt/apps/com.huagaochina.huagoscan/entries/help/HuaGoScan_scanSettings_Help_manual.pdf";//帮助文档路径
@@ -362,17 +362,17 @@ public:
 #elif KYLIN
     #ifdef OEM_HANWANG
     static const std::string helpfile_ ="/opt/apps/scanner-driver-hanvon/doc/HanvonScan_scanSettings_Help_manual.pdf";//帮助文档路径
-    #elif  OEM_LISICHENG
+    #elif  defined(OEM_LISICHENG)
     static const std::string helpfile_ ="/opt/apps/scanner-driver-lanxum/doc/LanxumScan_scanSettings_Help_manual.pdf";//帮助文档路径
     #else
     static const std::string helpfile_ ="/opt/apps/scanner-driver-huagao/doc/HuaGoScan_scanSettings_Help_manual.pdf";//帮助文档路径
     #endif
 #elif defined(WIN32) || defined(_WIN64)
     #ifdef OEM_HANWANG
-    static const std::string helpfile_ ="HanvonScan_scanSettings_Help_manual.pdf";//帮助文档路径
+    static const std::string helpfile_ = "HanvonScan_scanSettings_Help_manual.pdf";//帮助文档路径
-    #elif  OEM_LISICHENG
+    #elif defined(OEM_LISICHENG)
-    static const std::string helpfile_ ="LanxumScan_scanSettings_Help_manual.pdf";//帮助文档路径
+    static const std::string helpfile_ = "LanxumScan_scanSettings_Help_manual.pdf";//帮助文档路径
     #else
-    static const std::string helpfile_ ="HuaGoScan_scanSettings_Help_manual.pdf";//帮助文档路径
+    static const std::string helpfile_ = "HuaGoScan_scanSettings_Help_manual.pdf";//帮助文档路径
     #endif
 #endif

hgdriver/hgdev/hg_scanner_239.cpp

@@ -891,7 +891,10 @@ int hg_scanner_239::writedown_image_configuration(void)
 	}
 	else
 	{
-		ic.scannum = (ic.is_duplex ? scan_count_ * 2 : scan_count_);
+		if (scan_count_ == -1)
+			ic.scannum = -1;
+		else
+			ic.scannum = (ic.is_duplex ? scan_count_ * 2 : scan_count_);
 	}
 	ic.is_backrotate180 = image_prc_param_.bits.rotate_back_180;
 	ic.is_dogeardetection = image_prc_param_.bits.fractate_check;

hgdriver/hgdev/hg_scanner_302.cpp

@@ -993,7 +993,10 @@ int hg_scanner_302::writedown_image_configuration(void)
 	}
 	else
 	{
-		ic.scannum = (ic.is_duplex ? scan_count_ * 2 : scan_count_);
+		if (scan_count_ == -1)
+			ic.scannum = -1;
+		else
+			ic.scannum = (ic.is_duplex ? scan_count_ * 2 : scan_count_);
 	}
 	ic.is_backrotate180 = image_prc_param_.bits.rotate_back_180;
 	ic.is_dogeardetection = image_prc_param_.bits.fractate_check;

hgdriver/hgdev/hg_scanner_402.cpp

@@ -998,7 +998,10 @@ int hg_scanner_402::writedown_image_configuration(void)
 	}
 	else
 	{
-		ic.scannum = (ic.is_duplex ? scan_count_ * 2 : scan_count_);
+		if (scan_count_ == -1)
+			ic.scannum = -1;
+		else
+			ic.scannum = scan_count_;	// (ic.is_duplex ? scan_count_ * 2 : scan_count_);
 	}
 	ic.is_backrotate180 = image_prc_param_.bits.rotate_back_180;
 	ic.is_dogeardetection = image_prc_param_.bits.fractate_check;

hgdriver/hgdev/hg_scanner_439.cpp

@@ -863,7 +863,10 @@ int hg_scanner_439::writedown_image_configuration(void)
 	}
 	else
 	{
-		ic.scannum = (ic.is_duplex ? scan_count_ * 2 : scan_count_);
+		if (scan_count_ == -1)
+			ic.scannum = -1;
+		else
+			ic.scannum = (ic.is_duplex ? scan_count_ * 2 : scan_count_);
 	}
 	ic.is_backrotate180 = image_prc_param_.bits.rotate_back_180;
 	ic.is_dogeardetection = image_prc_param_.bits.fractate_check;