From 1b54abb175f2cdb7ac2d701b6f176633ab73d76f Mon Sep 17 00:00:00 2001 From: gb <741021719@qq.com> Date: Mon, 7 Nov 2022 16:49:24 +0800 Subject: [PATCH] =?UTF-8?q?=E9=92=88=E5=AF=B9=E4=BA=91=E9=98=85=E5=8D=B7?= =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E5=90=AF=E5=8A=A8=E6=89=AB=E6=8F=8F=E5=90=8E?= =?UTF-8?q?=EF=BC=8C=E4=B8=8D=E7=AD=89=E7=8A=B6=E6=80=81=E6=94=B9=E5=8F=98?= =?UTF-8?q?=E5=B0=B1=E5=8F=96=E5=9B=BE=E7=9A=84=E6=93=8D=E4=BD=9C=E9=80=82?= =?UTF-8?q?=E9=85=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sane/scanner.cpp | 3 ++- twain/twain/huagaods.cpp | 3 +++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/sane/scanner.cpp b/sane/scanner.cpp index 4f6f98c..f50deb6 100644 --- a/sane/scanner.cpp +++ b/sane/scanner.cpp @@ -2227,7 +2227,8 @@ COM_API_IMPLEMENT(scanner, int, get_scanned_images(DWORD milliseconds)) TranslateMessage(&msg); DispatchMessageW(&msg); } - Sleep(elapse); + else + Sleep(elapse); int ev = get_event(); diff --git a/twain/twain/huagaods.cpp b/twain/twain/huagaods.cpp index 5c9651e..99f120b 100644 --- a/twain/twain/huagaods.cpp +++ b/twain/twain/huagaods.cpp @@ -1332,6 +1332,9 @@ Result huagao_ds::call(const Identity& origin, DataGroup dg, Dat dat, Msg msg, v try { // we can override almost anything from SourceFromThis, even the top-most source instance call //FileTools::write_log("D:\\1.txt", "call:datagroup-"+to_string((int)dg)+"dat-"+to_string(int(dat))+"msg-"+to_string(int(msg))); + if (dat == Dat::ImageNativeXfer && state() == DsState::Enabled) // 云阅卷扫描端不等状态改变,直接取图,此处设置一次状态 2022-11-07 + notifyXferReady(); + return Base::call(origin, dg, dat, msg, data); } catch (const CapabilityException& e) {