diff --git a/HuaGoCorrect/HuaGoCorrect.aps b/HuaGoCorrect/HuaGoCorrect.aps index b1f6a47..ae81bd9 100644 Binary files a/HuaGoCorrect/HuaGoCorrect.aps and b/HuaGoCorrect/HuaGoCorrect.aps differ 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)