diff --git a/twain/ds/scanned_img.cpp b/twain/ds/scanned_img.cpp index f2126ed..0e441ba 100644 --- a/twain/ds/scanned_img.cpp +++ b/twain/ds/scanned_img.cpp @@ -2,6 +2,7 @@ #include "sane_helper.h" #include +#include #include @@ -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; } diff --git a/twain/ds/scanned_img.h b/twain/ds/scanned_img.h index 67a8b1a..c283889 100644 --- a/twain/ds/scanned_img.h +++ b/twain/ds/scanned_img.h @@ -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(); diff --git a/twain/ds/scanner.cpp b/twain/ds/scanner.cpp index 8349931..ac4692c 100644 --- a/twain/ds/scanner.cpp +++ b/twain/ds/scanner.cpp @@ -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 {