From 46f43ebd0d2ce8ccc29ef2b3cde26c8bade84558 Mon Sep 17 00:00:00 2001 From: gb <741021719@qq.com> Date: Thu, 17 Nov 2022 10:26:53 +0800 Subject: [PATCH] =?UTF-8?q?TWAIN=E5=A2=9E=E5=8A=A0=E4=BB=93=E7=94=B0OEM?= =?UTF-8?q?=E5=88=A4=E5=AE=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sane/scanner.cpp | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/sane/scanner.cpp b/sane/scanner.cpp index ae5f2e7..69489e3 100644 --- a/sane/scanner.cpp +++ b/sane/scanner.cpp @@ -364,7 +364,7 @@ bool scanner::is_belong_serial(int vid, int pid, SCANNERID serial) { if (GET_SCANNER_PID(serial) == 0x100) { - return pid == 0x100 || pid == 0x139 ; + return pid == 0x100 || pid == 0x139; } else if (GET_SCANNER_PID(serial) == 0x200) { @@ -378,6 +378,11 @@ bool scanner::is_belong_serial(int vid, int pid, SCANNERID serial) { return pid == 0x400 || pid == 0x402 || pid == 0x439; } + else if (GET_SCANNER_PID(serial) == 0x138 || + GET_SCANNER_PID(serial) == 0x238 || + GET_SCANNER_PID(serial) == 0x303 || + GET_SCANNER_PID(serial) == 0x404) // OEM_CANGTIAN + return true; } } else if (vid == PRODUCT_VENDOR_HG1) @@ -2837,7 +2842,7 @@ void init_log(void) fseek(g_file_, 0, SEEK_END); if (ftell(g_file_)) { - std::wstring sep(L"\r\n\r\n\r\n=================================================\r\n"); + std::wstring sep(L"\r\n\r\n\r\n=======================================================\r\n"); fwrite(sep.c_str(), 2, sep.length(), g_file_); } else