mirror of http://192.168.1.51:8099/lmh188/twain3.0
1)修改背面180°不生效问题
This commit is contained in:
commit
90257df69d
|
@ -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()) {
|
||||||
|
|
|
@ -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;
|
||||||
|
|
|
@ -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;
|
||||||
|
|
|
@ -201,7 +201,7 @@ 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:
|
||||||
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:
|
||||||
|
|
Loading…
Reference in New Issue