From b6f7aaf3486e9653ae6755bf496bda877f103ddb Mon Sep 17 00:00:00 2001 From: yangjiaxuan <171295266@qq.com> Date: Thu, 20 Jul 2023 18:35:07 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=BE=97=E5=8A=9Bds?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build_all.bat | 2 -- sane/scanner.cpp | 6 +----- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/build_all.bat b/build_all.bat index ec0f739..1e8c5dd 100644 --- a/build_all.bat +++ b/build_all.bat @@ -217,8 +217,6 @@ EXIT /B 0 if %ERRORLEVEL% neq 0 EXIT /B %ERRORLEVEL% call build_ds.bat %1 %2 401C if %ERRORLEVEL% neq 0 EXIT /B %ERRORLEVEL% - call build_ds.bat %1 %2 4020 - if %ERRORLEVEL% neq 0 EXIT /B %ERRORLEVEL% call build_ds.bat %1 %2 4015 if %ERRORLEVEL% neq 0 EXIT /B %ERRORLEVEL% call build_ds.bat %1 %2 4019 diff --git a/sane/scanner.cpp b/sane/scanner.cpp index aea6a83..d48aaac 100644 --- a/sane/scanner.cpp +++ b/sane/scanner.cpp @@ -578,11 +578,7 @@ bool scanner::is_belong_serial(int vid, int pid, SCANNERID serial) { if (GET_SCANNER_PID(serial) == 0x401C) { - return pid == 0x401C || pid == 0x401D || pid == 0x401E || pid == 0x401F; - } - else if (GET_SCANNER_PID(serial) == 0x4020) - { - return pid == 0x4020 || pid == 0x4021 || pid == 0x4022; + return pid == 0x401C || pid == 0x401D || pid == 0x401E || pid == 0x401F|| pid == 0x4021 || pid == 0x4022; } else if (GET_SCANNER_PID(serial) == 0x4015) {