From 14c670fcdf5b9a93da620f0b2499d1798c26bbe7 Mon Sep 17 00:00:00 2001
From: 13038267101 <mo1027728827@qq.com>
Date: Sat, 13 Aug 2022 15:14:23 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E7=9D=A1=E7=9C=A0=E6=A8=A1=E5=BC=8F=20-1?=
 =?UTF-8?q?=E4=B8=BAbu=20=E7=9D=A1=E7=9C=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hgdriver/hgdev/hg_scanner.cpp | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/hgdriver/hgdev/hg_scanner.cpp b/hgdriver/hgdev/hg_scanner.cpp
index 035fc81..ab06129 100644
--- a/hgdriver/hgdev/hg_scanner.cpp
+++ b/hgdriver/hgdev/hg_scanner.cpp
@@ -1719,6 +1719,7 @@ int hg_scanner::setting_setsleeptime(int sn, void* data)
 {
 	std::string str((char *)data);
 	int val = match_best_sleep_time(str,0);
+	int mintosec = 0;
 	switch (val)
 	{
 	case SLEEP_TIME_0MIN:
@@ -1745,7 +1746,12 @@ int hg_scanner::setting_setsleeptime(int sn, void* data)
 	}
 	if (val == sleeptime_)
 		return SCANNER_ERR_OK;
-	int mintosec = val * 60;
+	mintosec = val ;
+	if (val != -1)
+	{
+		mintosec = val * 60;
+	}
+		
 	int ret = set_sleep_time(mintosec);	
 	if (ret == SCANNER_ERR_OK)
 		sleeptime_ = val;

From 827a644b93dae0bf5639fbba67b34bea791d698d Mon Sep 17 00:00:00 2001
From: 13038267101 <mo1027728827@qq.com>
Date: Sat, 13 Aug 2022 16:28:40 +0800
Subject: [PATCH 2/2] =?UTF-8?q?win=20=E6=96=87=E6=9C=AC=E6=96=B9=E5=90=91?=
 =?UTF-8?q?=E8=AF=86=E5=88=AB=E4=BB=A3=E7=A0=81=E6=9A=82=E6=97=B6=E4=BF=9D?=
 =?UTF-8?q?=E7=95=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hgdriver/hgdev/image_process.cpp | 21 ++++++++++++++++++---
 1 file changed, 18 insertions(+), 3 deletions(-)

diff --git a/hgdriver/hgdev/image_process.cpp b/hgdriver/hgdev/image_process.cpp
index c25f253..3af39cc 100644
--- a/hgdriver/hgdev/image_process.cpp
+++ b/hgdriver/hgdev/image_process.cpp
@@ -804,7 +804,7 @@ namespace hg_imgproc
 #endif
 #if ((!defined x86_64) && (!defined WIN32))
 //linux x86_64 暂时没有OCR三方
-#ifndef test
+		#ifndef test
             ret = HWOCR_SDKInitialize(&pHanld);
 			for (size_t i = 0; i < mats.size(); i++)
 			{
@@ -823,7 +823,7 @@ namespace hg_imgproc
 				mats_.push_back(mats[i]);
 			}
             HWOCR_SDKExit(pHanld);
-#else
+		#else
         typedef int (*sdkinit)(void *);
 		typedef int (*sdkgetfiledirectimage)(unsigned char*pbImage, int nWidth, int nHeight, TColorType nColorType, void *pstHandle, int *pDirect);
 		typedef int (*sdkexit)(void *);
@@ -860,7 +860,22 @@ namespace hg_imgproc
 		} 
         	e(pHanld) ;
 			dlclose(hanlde);
-#endif
+		#endif
+#else
+		/*#ifdef _WIN32
+				printf("\r\n rotatetype:%d\r\n", rotatetype);
+				TCHAR szIniFile[MAX_PATH] = {0};
+				SHGetSpecialFolderPath(NULL, szIniFile, CSIDL_WINDOWS, TRUE);
+				_tcscat(szIniFile, _T("\\twain_32\\HuaGoScan\\tessdata"));
+				int iLen = WideCharToMultiByte(CP_ACP, 0, szIniFile, -1, NULL, 0, NULL, NULL);
+				char *chRtn = new char[iLen * sizeof(char)];
+				WideCharToMultiByte(CP_ACP, 0, szIniFile, -1, chRtn, iLen, NULL, NULL);
+				std:shared_ptr<CImageApplyRotation>p_rotation(new CImageApplyRotation(rotatetype, m_param.imageProcess.backRotate180, m_param.resolution, chRtn));
+				//printf("chRtn : %s ,duplex:%d   m_param.resolution:%d\r\n", chRtn, m_param.scanSide.duplex, m_param.resolution);
+				p_rotation->apply(mats_, m_param.scanSide.duplex);
+				delete []chRtn;
+				chRtn = NULL;
+		#endif // WIN32*/ //暂时保留文本方向旋转
 #endif
                
 		return ret;