From ed5f19354b99f6da5900da85ac8793449ac90ccf Mon Sep 17 00:00:00 2001
From: gb <741021719@qq.com>
Date: Thu, 7 Dec 2023 16:18:31 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=9B=BE=E5=83=8F=E5=A4=84?=
 =?UTF-8?q?=E7=90=86=E9=94=99=E8=AF=AF=E4=BB=A3=E7=A0=81=EF=BC=8C=E7=A1=AE?=
 =?UTF-8?q?=E5=AE=9A=E4=B8=BA=E5=86=85=E5=AD=98=E5=88=86=E9=85=8D=E5=A4=B1?=
 =?UTF-8?q?=E8=B4=A5=E6=89=8D=E8=BF=94=E5=9B=9E=E5=86=85=E5=AD=98=E9=94=99?=
 =?UTF-8?q?=E8=AF=AF=EF=BC=8C=E5=85=B6=E5=AE=83=E8=BF=94=E5=9B=9ESCANNER?=
 =?UTF-8?q?=5FERR=5FIMAGE=5FPROC=5FFATAL=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hgdriver/hgdev/hg_scanner.cpp              | 10 ++++++----
 hgdriver/wrapper/huagaoxxx_warraper_ex.cpp |  4 ++++
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/hgdriver/hgdev/hg_scanner.cpp b/hgdriver/hgdev/hg_scanner.cpp
index 2baa791..38f41c9 100644
--- a/hgdriver/hgdev/hg_scanner.cpp
+++ b/hgdriver/hgdev/hg_scanner.cpp
@@ -1094,7 +1094,7 @@ void hg_scanner::thread_handle_image_process(void)
 					if (!ImagePrc_pHandle_)
 					{
 						VLOG_MINI_1(LOG_LEVEL_FATAL, "[thread_handle_image_process]:Get Image Process is NULL  pid is %d.\n", pid_);
-						stop_fatal_ = SCANNER_ERR_INSUFFICIENT_MEMORY;
+						stop_fatal_ = SCANNER_ERR_IMAGE_PROC_FATAL;
 						do_stop();
 						invoke_stop = true; 
 						break;
@@ -1108,9 +1108,11 @@ void hg_scanner::thread_handle_image_process(void)
 				{
 					is_dpi_color_check = false;
 					stop_fatal_ = SCANNER_ERR_DEVICE_DISTORTION;
-				}	
-				else
+				}
+				else if (strstr(e.what(), "Insufficient "))
 					stop_fatal_ = SCANNER_ERR_INSUFFICIENT_MEMORY;
+				else
+					stop_fatal_ = SCANNER_ERR_IMAGE_PROC_FATAL;
 				VLOG_MINI_1(LOG_LEVEL_FATAL, "[thread_handle_image_process]:is opencv Fatal and stop scanner: %s\n", e.what());
 				do_stop();
 				invoke_stop = true;
@@ -1120,7 +1122,7 @@ void hg_scanner::thread_handle_image_process(void)
 			catch (...)
 			{
 				VLOG_MINI_1(LOG_LEVEL_FATAL, "[thread_handle_image_process]:stop scanner!!! Insufficient memory when proecss image with %d bytes.\n", tiny_buffer->size());
-				stop_fatal_ = SCANNER_ERR_INSUFFICIENT_MEMORY;
+				stop_fatal_ = SCANNER_ERR_IMAGE_PROC_FATAL;
 				do_stop();
 				invoke_stop = true;
 				break;
diff --git a/hgdriver/wrapper/huagaoxxx_warraper_ex.cpp b/hgdriver/wrapper/huagaoxxx_warraper_ex.cpp
index 357dc52..cbde3cc 100644
--- a/hgdriver/wrapper/huagaoxxx_warraper_ex.cpp
+++ b/hgdriver/wrapper/huagaoxxx_warraper_ex.cpp
@@ -240,6 +240,8 @@ extern "C"
 		RETURN_IF(err, SCANNER_ERR_CONFIGURATION_CHANGED);
 		RETURN_IF(err, SCANNER_ERR_RELOAD_IMAGE_PARAM);
 		RETURN_IF(err, SCANNER_ERR_RELOAD_OPT_PARAM);
+		RETURN_IF(err, SCANNER_ERR_IMAGE_PROC_FATAL);
+
 		RETURN_IF(err, SCANNER_ERR_NOT_OPEN);
 		RETURN_IF(err, SCANNER_ERR_NOT_START);
 		RETURN_IF(err, SCANNER_ERR_NOT_ANY_MORE);
@@ -317,6 +319,8 @@ extern "C"
 		RETURN_DESC_IF(err, SCANNER_ERR_CONFIGURATION_CHANGED);
 		RETURN_DESC_IF(err, SCANNER_ERR_RELOAD_IMAGE_PARAM);
 		RETURN_DESC_IF(err, SCANNER_ERR_RELOAD_OPT_PARAM);
+		RETURN_DESC_IF(err, SCANNER_ERR_IMAGE_PROC_FATAL);
+
 		RETURN_DESC_IF(err, SCANNER_ERR_NOT_OPEN);
 		RETURN_DESC_IF(err, SCANNER_ERR_NOT_START);
 		RETURN_DESC_IF(err, SCANNER_ERR_NOT_ANY_MORE);