fix image status type

This commit is contained in:
gb 2023-11-20 15:50:37 +08:00
parent cd6e9af474
commit 01c20b79dd
3 changed files with 7 additions and 6 deletions

View File

@ -2,6 +2,7 @@
#include "sane_helper.h"
#include <base/utils.h>
#include <base/packet.h>
#include <string.h>
@ -247,7 +248,7 @@ scanned_img::~scanned_img()
delete data_;
}
void scanned_img::set_image_status(SANE_Image_Statu status)
void scanned_img::set_image_status(int status)
{
status_ = status;
}

View File

@ -39,9 +39,9 @@ class scanned_img : public IScanImg, virtual public refer
unsigned int header_size_;
SANE_FinalImgFormat fmt_;
SANE_Image_Statu status_;
image_buf* data_;
size_t pal_size_ = 0;
int status_;
image_buf* data_;
size_t pal_size_ = 0;
// 部分APP不会通过XferMech来设置传输模式原来预先准备数据的方法不适合该场合
// 为适应该场景增加prepare_data_for_transfer接口在真实读取数据之前调用以准备恰当的数据
@ -55,7 +55,7 @@ public:
scanned_img(SANE_Handle dev, SANE_Parameters head, void* data, unsigned int len, int dpi, const char* tmp_file
, twain_xfer xfer = TWAIN_XFER_Native, SANE_FinalImgFormat *fmt = NULL);
void set_image_status(SANE_Image_Statu status);
void set_image_status(int status);
protected:
~scanned_img();

View File

@ -1373,7 +1373,7 @@ int scanner::handle_device_event(int ev_code, void* data, unsigned int* len)
int times = 0;
images_.count(&bytes);
img->set_image_status((SANE_Image_Statu)simg->flag.statu);
img->set_image_status(simg->flag.statu);
bytes /= 1024 * 1024;
while (bytes > max_img_mem_ && !user_cancel_ && times++ < 20) // memory control
{