From 72e9dd0078fc12e91e99cc9c6be12f021390412e Mon Sep 17 00:00:00 2001
From: pm <1002639516@qq.com>
Date: Sat, 7 Dec 2019 17:47:56 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9C=A8=E6=9E=90=E6=9E=84=E5=87=BD=E6=95=B0?=
 =?UTF-8?q?=E4=B8=AD=E9=87=8A=E6=94=BE=E6=99=BA=E8=83=BD=E5=9E=8B=E6=8C=87?=
 =?UTF-8?q?=E9=92=88=EF=BC=8C=E7=A8=8B=E5=BA=8F=E9=80=80=E5=87=BA=E5=8D=A1?=
 =?UTF-8?q?=E4=B8=BB=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CScanner_FreeImage.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CScanner_FreeImage.cpp b/CScanner_FreeImage.cpp
index 5ece1dc..2b40671 100644
--- a/CScanner_FreeImage.cpp
+++ b/CScanner_FreeImage.cpp
@@ -114,6 +114,7 @@ CScanner_FreeImage::CScanner_FreeImage() :
 //////////////////////////////////////////////////////////////////////////////
 CScanner_FreeImage::~CScanner_FreeImage()
 {
+	g_scan.reset();
 }
 
 void CScanner_FreeImage::InitMSGMap()
@@ -174,6 +175,7 @@ bool CScanner_FreeImage::acquireImage(bool bscan)
 		if (getDeviceOnline())
 		{
 			g_scan->config_params(*(getSetting()));
+			g_scan->setdecodepixtype(m_HardWareParams.PixType);
 			g_scan->Scanner_StartScan(m_wScanCount);
 		}
 		else