lmh188
/
twain3.0
mirror of http://192.168.1.51:8099/lmh188/twain3.0
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

1.去掉多余include 头文件 

2.修改USB底层通信库，避免针对安卓有屏版机器异常
This commit is contained in:
lovelyyoung 2021-04-08 16:11:38 +08:00
parent 8efc7aed0b
commit 26c9e77a6c
4 changed files with 10 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
huagao/Device/GScanO400.cpp
View File

@ -310,7 +310,6 @@ BOOL GScanO400::Get_Scanner_PaperOn()
if (!(m_usb.get() && m_usb->is_open())) if (!(m_usb.get() && m_usb->is_open()))
return false; return false;
USBCB usbcb = { GET_PAPER_STATUS ,0,0 }; USBCB usbcb = { GET_PAPER_STATUS ,0,0 };
usbcb.u32_Data = 1;
std::lock_guard<std::mutex> lck(m_imgLocker); std::lock_guard<std::mutex> lck(m_imgLocker);
m_usb->write_bulk(&usbcb, sizeof(usbcb)); m_usb->write_bulk(&usbcb, sizeof(usbcb));
if (m_usb.get() && m_usb->is_connected()) { if (m_usb.get() && m_usb->is_connected()) {

2
huagao/Device/ImageMatQueue.cpp
View File

@ -6,7 +6,7 @@
#include "filetools.h" #include "filetools.h"
#include <math.h> #include <math.h>
#include "StopWatch.h" #include "StopWatch.h"
#include "JpegBuffer.h" //#include "JpegBuffer.h"
using namespace cv; using namespace cv;
using namespace std; using namespace std;

5
huagao/Device/ImageMatQueue.h
View File

@ -6,7 +6,7 @@
#include "PublicFunc.h" #include "PublicFunc.h"
#include "BlockingQueue.h" #include "BlockingQueue.h"
#include <memory> #include <memory>
#include "threadpool.hpp" //#include "threadpool.hpp"
#include "PaperSize.h" #include "PaperSize.h"
#include "filetools.h" #include "filetools.h"
@ -62,7 +62,8 @@ private:
class Mat2BmpBw :public IMat2Bmp { class Mat2BmpBw :public IMat2Bmp {
public: public:
Mat2BmpBw(const cv::Mat& mat,float res) { Mat2BmpBw(const cv::Mat& mat,float res) {
//static int indeximg = 0;
//cv::imwrite("D:\\" + to_string(++indeximg) + ".jpg", mat);
m_data = std::shared_ptr<std::vector<unsigned char>>(new std::vector<unsigned char >()); m_data = std::shared_ptr<std::vector<unsigned char>>(new std::vector<unsigned char >());
int headsize = 62; int headsize = 62;
int width = mat.cols; int width = mat.cols;

18
huagao/Device/UsbScanEx.cpp
View File

@ -164,14 +164,9 @@ int UsbScanEx::read_bulk(void* data, int len)
int error_code = GetLastError(); int error_code = GetLastError();
switch (error_code) switch (error_code)
{ {
case ERROR_IO_PENDING: { case ERROR_IO_PENDING:
int re = GetOverlappedResult(h_pipe, lp_overlap, &pdw_ret, TRUE); GetOverlappedResult(h_pipe, lp_overlap, &pdw_ret, TRUE);
if (0 != re) return pdw_ret;
{
return pdw_ret;
}
error_code = GetLastError();
}
case ERROR_FILE_NOT_FOUND: case ERROR_FILE_NOT_FOUND:
case ERROR_ACCESS_DENIED: case ERROR_ACCESS_DENIED:
m_b_is_connected = false; m_b_is_connected = false;
@ -206,10 +201,9 @@ int UsbScanEx::write_bulk(void* data, int len)
int errorcode = GetLastError(); int errorcode = GetLastError();
switch (errorcode) switch (errorcode)
{ {
case ERROR_IO_PENDING: { case ERROR_IO_PENDING:
if (0 != GetOverlappedResult(h_pipe, lp_overlap, &dw_size, TRUE)) GetOverlappedResult(h_pipe, lp_overlap, &dw_size, TRUE);
return dw_size; return dw_size;
}
case ERROR_FILE_NOT_FOUND: case ERROR_FILE_NOT_FOUND:
case ERROR_ACCESS_DENIED: case ERROR_ACCESS_DENIED:
m_b_is_connected = false; m_b_is_connected = false;