From 5bd17e89b283972d5d7d2be936d9471dd8c636e6 Mon Sep 17 00:00:00 2001 From: masayume <1936714878@qq.com> Date: Wed, 20 Apr 2022 09:32:25 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=95=A6=E5=8D=97=20?= =?UTF-8?q?=E5=AE=89=E8=B7=AFcis=E5=8E=9F=E5=9B=BE=E6=89=AB=E6=8F=8F?= =?UTF-8?q?=E4=B8=8D=E8=83=BD=E4=BF=9D=E5=AD=98=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- HuaGoCorrect/HuaGoCorrect.aps | Bin 130352 -> 109084 bytes HuaGoCorrect/HuaGoCorrectDlg.cpp | 2 +- HuaGoCorrect/gscan3399.cpp | 9 ++++----- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/HuaGoCorrect/HuaGoCorrect.aps b/HuaGoCorrect/HuaGoCorrect.aps index b1f6a47ac355595f573666f6a2849aab6ae97c57..ae81bd94d193efec23c2c37c642985f662cb4ac5 100644 GIT binary patch delta 3366 zcmb7GeNa@_6+Z_MR#*ti$A0i(>KLUOaTgZYwXI=49_xl>cinx9VAPFT5P=A&QDX=~ zVq0TEqTZI9L}GBpPO(iprvBj{)hY2GX-XYCO=db(Du9KcrFrOl^AH|ZtAGZ=<8c0)5ggA*n4adN z*YN38(==X&Z7o~5ep*Q4M}lt{R)QW>AXGwUalb((UD%bOR- ztCe~(L5&Ndn;!iX_ag9=JGhLdRm!xUCjQkYn89Daqh$Nm9o!H`3NFC}6vd?wgxc_} zyV2-c7unzvZ4j04?|+6}6!~|b;TIys_wV9ne&;U~T6+)I5OTim9uA}zRZ^i=sDe5O zfdgFh>;^A5Y2~KpdU_6mOq#w4%wI8A@$_^PZ=1jz{_F%M{U5HLm}}07@zx1EH1BQ7 zaS8vyBx*3>gAYDRW*_fcxXBCPa@a#Q$zQW$XJAi5I~Wb+M({;pXU&%VQMd%w#o(B_ z6#P-x7N<5rfc-foS4X>scaS}yfVEb#S2@KNk@b-ZW~Fibvb-4hhR*wk)2fOEt_Jz zQ}P5Pzsu?td^v1Z7^mMB3P^6rE(h#Zk4F-@5F26-R65hMF}Kez`K(S!uobW+hCAbT zHN#doejr!7EynvLo7XD~n+1NzTIcI^4KXt4b68~&(`yf?Hf>i}AEgyzjnEV` z1tfW`SEOk+!j2d$5(#H-E`jD4OzH?+3N36wYL31&Mv_OW^LYazmlIZ6>}FR}3vdtnJXL3U zJ}RR4ey`gt`IXZ(n_;g)*{f~A+8VDz5=UjWz&>E>IyHs+A7w02BrgEl*{RbWh)O&Z zJd&iv0539cnr21k3`tFil16xG2DS!8Q5GX~v14g@&m4>q4)1!=14{{XE1=uv@yf2M zdIjv6QBvf9TatXTt45rwr4(MC;cQCyQh0@W_L2?{vG1rgwLgmRL0R^COu}P=AICh= zolWo)1+=e~?A1m^cQ^u7+a!iK`_Fk6;-(-u@^YAG9UV7faW6?m>bXbx*b}NjA5;(4q zwr~NIn9)!QEP~169A@s2V16126_Bgk^lE#myux9EpDDOVBOId)`XWl3OYO5d9CYK2 zhBDynR=RfOTQl)R!+nydn_e+^JA#LEDHWI*-eDhhYw!eHlcE1^|BR3Fa?xp1!SJpE zh8s&Q5YS21laZ72UVJpc7!5GMdV6#Ur-1#ctq^~~QeJ%=2id)zMTKVoLRMcOa)fHF?x45@f*+HXT^TJ#S?r4!7ui>h zyYUih-o6hnv$5^F=Z~N;mO};WY0751n#w671Aj1qnj`}xsknL)pPZLQT^ME^L#vV- z=}Cpm^I<-_GPE$+j{v8UcYTc|i?!sOo=&76fiyBRlfqw|;`uIha$r8&{0IHgyTlHv zqf+wFh?f=-e>Q{dyrN$^m;o^PSX4T1mUNKf4;8Ymzw4I{Cj%T_7L}&Vk~WdMy_gk$ zuCMwdUHZw=sC51;>EIIpTEs};QfE{=3k?J*Wq(yd)aL%LO_E}Ch zHR^00^0sT_93XN2a@zAAE&fK@>jvZ}zC>NxeL97|8bz2)zUphtNzNufRmS~OXe-)S zfph(g%H~I>=&NX8jt=oHb#MxER*cWt&=WQk6`ALj6Q7zwZKB(Z{Iv-xT6{`fpv6;@ aSdh|3SFE!a*%xv_N^cf``4}>1u;4#hdel(> delta 15670 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 diff --git a/HuaGoCorrect/HuaGoCorrectDlg.cpp b/HuaGoCorrect/HuaGoCorrectDlg.cpp index d81b321..15da577 100644 --- a/HuaGoCorrect/HuaGoCorrectDlg.cpp +++ b/HuaGoCorrect/HuaGoCorrectDlg.cpp @@ -358,7 +358,7 @@ void CHuaGoCorrectDlg::Scan() config.g400params.dpi = m_iDpiIndex == 0 ? 1 : (m_iDpiIndex == 1 ? 2 : 3);//only support 200DPI ;// 1;//only support 200DPI config.g400params.pageSize = 0; config.g400params.isCorrect = !((CButton*)GetDlgItem(IDC_CKBORGINIMG))->GetCheck(); - config.g400params.lutmode = ((CButton*)GetDlgItem(IDC_CKBLUTMODE))->GetCheck(); + //config.g400params.lutmode = ((CButton*)GetDlgItem(IDC_CKBLUTMODE))->GetCheck(); config.g400params.isColor = m_iColorIndex == 1 ? 1 : 0; config.g400params.doubleFeeded = TRUE; config.g400params.enableStable = FALSE; diff --git a/HuaGoCorrect/gscan3399.cpp b/HuaGoCorrect/gscan3399.cpp index a6f52b3..d997314 100644 --- a/HuaGoCorrect/gscan3399.cpp +++ b/HuaGoCorrect/gscan3399.cpp @@ -589,8 +589,8 @@ void gscan3399::get_imgdata() { if (is_bulktransferring()) { - std::this_thread::sleep_for(std::chrono::milliseconds(1)); - return; + std::this_thread::sleep_for(std::chrono::milliseconds(10)); + continue; } imgremains++; auto& buffi = im_data; @@ -607,7 +607,7 @@ void gscan3399::get_imgdata() bool gscan3399::is_runing() { - return scanner_read_reg(m_usb, SR_STATUS) & 0x01; + return scanner_read_reg(m_usb, SR_STATUS) & 0x03; } bool gscan3399::bulk_starttransfer() @@ -686,8 +686,7 @@ void gscan3399::usb_run() switch (info.From) { case IMG: - if (is_runing()) - get_imgdata(); + get_imgdata(); break; case AutoCorrect: if (info.Img_Index != 0)