修复warnings
This commit is contained in:
parent
823fb48da0
commit
3adab8d029
|
@ -33,7 +33,7 @@ SANE_Status sane_init(SANE_Int* version_code, SANE_Auth_Callback authorize)
|
||||||
}
|
}
|
||||||
void sane_exit(void)
|
void sane_exit(void)
|
||||||
{
|
{
|
||||||
return inner_sane_exit();
|
inner_sane_exit();
|
||||||
}
|
}
|
||||||
SANE_Status sane_get_devices(const SANE_Device*** device_list, SANE_Bool local_only)
|
SANE_Status sane_get_devices(const SANE_Device*** device_list, SANE_Bool local_only)
|
||||||
{
|
{
|
||||||
|
|
|
@ -39,63 +39,59 @@ static std::string g_sane_name(GET_BACKEND_NAME);
|
||||||
namespace local_utility
|
namespace local_utility
|
||||||
{
|
{
|
||||||
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
|
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
|
||||||
|
#define RETURN_MATCH_ERROR(err, from, to) \
|
||||||
|
if(err == from) \
|
||||||
|
return to;
|
||||||
|
|
||||||
SANE_Status scanner_err_2_sane_statu(int hgerr)
|
SANE_Status scanner_err_2_sane_statu(int hgerr)
|
||||||
{
|
{
|
||||||
#define RETURN_MATCH_ERROR(hg, sane) \
|
RETURN_MATCH_ERROR(hgerr, SCANNER_ERR_OK, SANE_STATUS_GOOD);
|
||||||
if(hgerr == hg) \
|
RETURN_MATCH_ERROR(hgerr, SCANNER_ERR_INVALID_PARAMETER, SANE_STATUS_INVAL);
|
||||||
return sane;
|
RETURN_MATCH_ERROR(hgerr, SCANNER_ERR_INSUFFICIENT_MEMORY, SANE_STATUS_NO_MEM);
|
||||||
|
RETURN_MATCH_ERROR(hgerr, SCANNER_ERR_ACCESS_DENIED, SANE_STATUS_ACCESS_DENIED);
|
||||||
|
RETURN_MATCH_ERROR(hgerr, SCANNER_ERR_IO_PENDING, SANE_STATUS_GOOD);
|
||||||
|
RETURN_MATCH_ERROR(hgerr, SCANNER_ERR_NOT_EXACT, SANE_STATUS_GOOD);
|
||||||
|
RETURN_MATCH_ERROR(hgerr, SCANNER_ERR_CONFIGURATION_CHANGED, SANE_STATUS_GOOD);
|
||||||
|
RETURN_MATCH_ERROR(hgerr, SCANNER_ERR_NOT_OPEN, SANE_STATUS_NO_DOCS);
|
||||||
|
RETURN_MATCH_ERROR(hgerr, SCANNER_ERR_NOT_START, SANE_STATUS_NO_DOCS);
|
||||||
|
RETURN_MATCH_ERROR(hgerr, SCANNER_ERR_NO_DATA, SANE_STATUS_EOF);
|
||||||
|
RETURN_MATCH_ERROR(hgerr, SCANNER_ERR_HAS_DATA_YET, SANE_STATUS_IO_ERROR);
|
||||||
|
RETURN_MATCH_ERROR(hgerr, SCANNER_ERR_OUT_OF_RANGE, SANE_STATUS_NO_MEM);
|
||||||
|
RETURN_MATCH_ERROR(hgerr, SCANNER_ERR_IO, SANE_STATUS_IO_ERROR);
|
||||||
|
RETURN_MATCH_ERROR(hgerr, SCANNER_ERR_TIMEOUT, SANE_STATUS_IO_ERROR);
|
||||||
|
|
||||||
RETURN_MATCH_ERROR(SCANNER_ERR_OK, SANE_STATUS_GOOD);
|
// RETURN_MATCH_ERROR(hgerr, SCANNER_ERR_DEVICE_NOT_FOUND, SANE_STATUS_NO_DOCS);
|
||||||
RETURN_MATCH_ERROR(SCANNER_ERR_INVALID_PARAMETER, SANE_STATUS_INVAL);
|
RETURN_MATCH_ERROR(hgerr, SCANNER_ERR_DEVICE_NOT_SUPPORT, SANE_STATUS_UNSUPPORTED);
|
||||||
RETURN_MATCH_ERROR(SCANNER_ERR_INSUFFICIENT_MEMORY, SANE_STATUS_NO_MEM);
|
RETURN_MATCH_ERROR(hgerr, SCANNER_ERR_DEVICE_BUSY, SANE_STATUS_DEVICE_BUSY);
|
||||||
RETURN_MATCH_ERROR(SCANNER_ERR_ACCESS_DENIED, SANE_STATUS_ACCESS_DENIED);
|
RETURN_MATCH_ERROR(hgerr, SCANNER_ERR_DEVICE_COVER_OPENNED, SANE_STATUS_COVER_OPEN);
|
||||||
RETURN_MATCH_ERROR(SCANNER_ERR_IO_PENDING, SANE_STATUS_GOOD);
|
RETURN_MATCH_ERROR(hgerr, SCANNER_ERR_DEVICE_NO_PAPER, SANE_STATUS_NO_DOCS);
|
||||||
RETURN_MATCH_ERROR(SCANNER_ERR_NOT_EXACT, SANE_STATUS_GOOD);
|
RETURN_MATCH_ERROR(hgerr, SCANNER_ERR_DEVICE_PAPER_JAMMED, SANE_STATUS_JAMMED);
|
||||||
RETURN_MATCH_ERROR(SCANNER_ERR_CONFIGURATION_CHANGED, SANE_STATUS_GOOD);
|
|
||||||
RETURN_MATCH_ERROR(SCANNER_ERR_NOT_OPEN, SANE_STATUS_NO_DOCS);
|
|
||||||
RETURN_MATCH_ERROR(SCANNER_ERR_NOT_START, SANE_STATUS_NO_DOCS);
|
|
||||||
RETURN_MATCH_ERROR(SCANNER_ERR_NO_DATA, SANE_STATUS_EOF);
|
|
||||||
RETURN_MATCH_ERROR(SCANNER_ERR_HAS_DATA_YET, SANE_STATUS_IO_ERROR);
|
|
||||||
RETURN_MATCH_ERROR(SCANNER_ERR_OUT_OF_RANGE, SANE_STATUS_NO_MEM);
|
|
||||||
RETURN_MATCH_ERROR(SCANNER_ERR_IO, SANE_STATUS_IO_ERROR);
|
|
||||||
RETURN_MATCH_ERROR(SCANNER_ERR_TIMEOUT, SANE_STATUS_IO_ERROR);
|
|
||||||
|
|
||||||
// RETURN_MATCH_ERROR(SCANNER_ERR_DEVICE_NOT_FOUND, SANE_STATUS_NO_DOCS);
|
|
||||||
RETURN_MATCH_ERROR(SCANNER_ERR_DEVICE_NOT_SUPPORT, SANE_STATUS_UNSUPPORTED);
|
|
||||||
RETURN_MATCH_ERROR(SCANNER_ERR_DEVICE_BUSY, SANE_STATUS_DEVICE_BUSY);
|
|
||||||
RETURN_MATCH_ERROR(SCANNER_ERR_DEVICE_COVER_OPENNED, SANE_STATUS_COVER_OPEN);
|
|
||||||
RETURN_MATCH_ERROR(SCANNER_ERR_DEVICE_NO_PAPER, SANE_STATUS_NO_DOCS);
|
|
||||||
RETURN_MATCH_ERROR(SCANNER_ERR_DEVICE_PAPER_JAMMED, SANE_STATUS_JAMMED);
|
|
||||||
|
|
||||||
return (SANE_Status)hgerr;
|
return (SANE_Status)hgerr;
|
||||||
}
|
}
|
||||||
int sane_statu_2_scanner_err(int statu)
|
int sane_statu_2_scanner_err(int statu)
|
||||||
{
|
{
|
||||||
#define RETURN_MATCH_ERROR(hg, sane) \
|
RETURN_MATCH_ERROR(statu, SANE_STATUS_GOOD, SCANNER_ERR_OK);
|
||||||
if(statu == sane) \
|
RETURN_MATCH_ERROR(statu, SANE_STATUS_INVAL, SCANNER_ERR_INVALID_PARAMETER);
|
||||||
return hg;
|
RETURN_MATCH_ERROR(statu, SANE_STATUS_NO_MEM, SCANNER_ERR_INSUFFICIENT_MEMORY);
|
||||||
|
RETURN_MATCH_ERROR(statu, SANE_STATUS_ACCESS_DENIED, SCANNER_ERR_ACCESS_DENIED);
|
||||||
|
RETURN_MATCH_ERROR(statu, SANE_STATUS_GOOD, SCANNER_ERR_IO_PENDING);
|
||||||
|
RETURN_MATCH_ERROR(statu, SANE_STATUS_GOOD, SCANNER_ERR_NOT_EXACT);
|
||||||
|
RETURN_MATCH_ERROR(statu, SANE_STATUS_GOOD, SCANNER_ERR_CONFIGURATION_CHANGED);
|
||||||
|
RETURN_MATCH_ERROR(statu, SANE_STATUS_NO_DOCS, SCANNER_ERR_NOT_OPEN);
|
||||||
|
RETURN_MATCH_ERROR(statu, SANE_STATUS_NO_DOCS, SCANNER_ERR_NOT_START);
|
||||||
|
RETURN_MATCH_ERROR(statu, SANE_STATUS_EOF, SCANNER_ERR_NO_DATA);
|
||||||
|
RETURN_MATCH_ERROR(statu, SANE_STATUS_IO_ERROR, SCANNER_ERR_HAS_DATA_YET);
|
||||||
|
RETURN_MATCH_ERROR(statu, SANE_STATUS_NO_MEM, SCANNER_ERR_OUT_OF_RANGE);
|
||||||
|
RETURN_MATCH_ERROR(statu, SANE_STATUS_IO_ERROR, SCANNER_ERR_IO);
|
||||||
|
RETURN_MATCH_ERROR(statu, SANE_STATUS_IO_ERROR, SCANNER_ERR_TIMEOUT);
|
||||||
|
|
||||||
RETURN_MATCH_ERROR(SCANNER_ERR_OK, SANE_STATUS_GOOD);
|
RETURN_MATCH_ERROR(statu, SANE_STATUS_NO_DOCS, SCANNER_ERR_DEVICE_NOT_FOUND);
|
||||||
RETURN_MATCH_ERROR(SCANNER_ERR_INVALID_PARAMETER, SANE_STATUS_INVAL);
|
RETURN_MATCH_ERROR(statu, SANE_STATUS_UNSUPPORTED, SCANNER_ERR_DEVICE_NOT_SUPPORT);
|
||||||
RETURN_MATCH_ERROR(SCANNER_ERR_INSUFFICIENT_MEMORY, SANE_STATUS_NO_MEM);
|
RETURN_MATCH_ERROR(statu, SANE_STATUS_DEVICE_BUSY, SCANNER_ERR_DEVICE_BUSY);
|
||||||
RETURN_MATCH_ERROR(SCANNER_ERR_ACCESS_DENIED, SANE_STATUS_ACCESS_DENIED);
|
RETURN_MATCH_ERROR(statu, SANE_STATUS_COVER_OPEN, SCANNER_ERR_DEVICE_COVER_OPENNED);
|
||||||
RETURN_MATCH_ERROR(SCANNER_ERR_IO_PENDING, SANE_STATUS_GOOD);
|
RETURN_MATCH_ERROR(statu, SANE_STATUS_NO_DOCS, SCANNER_ERR_DEVICE_NO_PAPER);
|
||||||
RETURN_MATCH_ERROR(SCANNER_ERR_NOT_EXACT, SANE_STATUS_GOOD);
|
RETURN_MATCH_ERROR(statu, SANE_STATUS_JAMMED, SCANNER_ERR_DEVICE_PAPER_JAMMED);
|
||||||
RETURN_MATCH_ERROR(SCANNER_ERR_CONFIGURATION_CHANGED, SANE_STATUS_GOOD);
|
|
||||||
RETURN_MATCH_ERROR(SCANNER_ERR_NOT_OPEN, SANE_STATUS_NO_DOCS);
|
|
||||||
RETURN_MATCH_ERROR(SCANNER_ERR_NOT_START, SANE_STATUS_NO_DOCS);
|
|
||||||
RETURN_MATCH_ERROR(SCANNER_ERR_NO_DATA, SANE_STATUS_EOF);
|
|
||||||
RETURN_MATCH_ERROR(SCANNER_ERR_HAS_DATA_YET, SANE_STATUS_IO_ERROR);
|
|
||||||
RETURN_MATCH_ERROR(SCANNER_ERR_OUT_OF_RANGE, SANE_STATUS_NO_MEM);
|
|
||||||
RETURN_MATCH_ERROR(SCANNER_ERR_IO, SANE_STATUS_IO_ERROR);
|
|
||||||
RETURN_MATCH_ERROR(SCANNER_ERR_TIMEOUT, SANE_STATUS_IO_ERROR);
|
|
||||||
|
|
||||||
RETURN_MATCH_ERROR(SCANNER_ERR_DEVICE_NOT_FOUND, SANE_STATUS_NO_DOCS);
|
|
||||||
RETURN_MATCH_ERROR(SCANNER_ERR_DEVICE_NOT_SUPPORT, SANE_STATUS_UNSUPPORTED);
|
|
||||||
RETURN_MATCH_ERROR(SCANNER_ERR_DEVICE_BUSY, SANE_STATUS_DEVICE_BUSY);
|
|
||||||
RETURN_MATCH_ERROR(SCANNER_ERR_DEVICE_COVER_OPENNED, SANE_STATUS_COVER_OPEN);
|
|
||||||
RETURN_MATCH_ERROR(SCANNER_ERR_DEVICE_NO_PAPER, SANE_STATUS_NO_DOCS);
|
|
||||||
RETURN_MATCH_ERROR(SCANNER_ERR_DEVICE_PAPER_JAMMED, SANE_STATUS_JAMMED);
|
|
||||||
|
|
||||||
return statu;
|
return statu;
|
||||||
}
|
}
|
||||||
|
@ -595,8 +591,8 @@ SANE_Option_Descriptor* hg_sane_middleware::number_option_to_SANE_descriptor(con
|
||||||
sod->type = double_val ? SANE_TYPE_FIXED : SANE_TYPE_INT;
|
sod->type = double_val ? SANE_TYPE_FIXED : SANE_TYPE_INT;
|
||||||
sod->unit = SANE_UNIT_NONE;
|
sod->unit = SANE_UNIT_NONE;
|
||||||
sod->size = sizeof(SANE_Word);
|
sod->size = sizeof(SANE_Word);
|
||||||
sod->cap = SANE_CAP_SOFT_SELECT | SANE_CAP_SOFT_DETECT // 软件å<C2B6>¯è®¾ç½®é€‰é¡¹
|
sod->cap = SANE_CAP_SOFT_SELECT | SANE_CAP_SOFT_DETECT
|
||||||
/*| SANE_CAP_AUTOMATIC*/; // 硬件å<C2B6>¯è®¾ç½®é»˜è®¤å€?
|
/*| SANE_CAP_AUTOMATIC*/;
|
||||||
if (lower || upper)
|
if (lower || upper)
|
||||||
{
|
{
|
||||||
sod->size = sizeof(SANE_Range);
|
sod->size = sizeof(SANE_Range);
|
||||||
|
@ -607,14 +603,14 @@ SANE_Option_Descriptor* hg_sane_middleware::number_option_to_SANE_descriptor(con
|
||||||
if (double_val)
|
if (double_val)
|
||||||
(*(SANE_Range*)str).min = hg_sane_middleware::double_2_sane_fixed(*lower);
|
(*(SANE_Range*)str).min = hg_sane_middleware::double_2_sane_fixed(*lower);
|
||||||
else
|
else
|
||||||
(*(SANE_Range*)str).min = *lower;
|
(*(SANE_Range*)str).min = (SANE_Word)*lower;
|
||||||
}
|
}
|
||||||
if (upper)
|
if (upper)
|
||||||
{
|
{
|
||||||
if (double_val)
|
if (double_val)
|
||||||
(*(SANE_Range*)str).max = hg_sane_middleware::double_2_sane_fixed(*upper);
|
(*(SANE_Range*)str).max = hg_sane_middleware::double_2_sane_fixed(*upper);
|
||||||
else
|
else
|
||||||
(*(SANE_Range*)str).max = *upper;
|
(*(SANE_Range*)str).max = (SANE_Word)*upper;
|
||||||
}
|
}
|
||||||
(*(SANE_Range*)str).quant = 0;
|
(*(SANE_Range*)str).quant = 0;
|
||||||
|
|
||||||
|
@ -1159,7 +1155,7 @@ void* hg_sane_middleware::get_default_value(scanner_handle handle, int option)
|
||||||
val = "";
|
val = "";
|
||||||
jsn->get_value("default", val);
|
jsn->get_value("default", val);
|
||||||
|
|
||||||
if (size < val.length())
|
if (size < (int)val.length())
|
||||||
size = val.length();
|
size = val.length();
|
||||||
data = local_utility::acquire_memory(size + 4, "");
|
data = local_utility::acquire_memory(size + 4, "");
|
||||||
strcpy((char*)data, val.c_str());
|
strcpy((char*)data, val.c_str());
|
||||||
|
@ -1627,7 +1623,7 @@ bool hg_sane_middleware::parse_master_option(const char* depend_str, MASTEROP& m
|
||||||
ret = local_utility::get_number(depend_str, num);
|
ret = local_utility::get_number(depend_str, num);
|
||||||
if (ret)
|
if (ret)
|
||||||
{
|
{
|
||||||
mo.option_no = num;
|
mo.option_no = (int)num;
|
||||||
local_utility::skip_space(depend_str);
|
local_utility::skip_space(depend_str);
|
||||||
if (*depend_str == '=')
|
if (*depend_str == '=')
|
||||||
{
|
{
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#include <signal.h>
|
#include <signal.h>
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
|
|
|
@ -208,7 +208,7 @@ void* sane_std_opts::get_current_value(scanner_handle h, int opt)
|
||||||
if (val == "string")
|
if (val == "string")
|
||||||
{
|
{
|
||||||
jsn->get_value("cur", val);
|
jsn->get_value("cur", val);
|
||||||
if (size < val.length())
|
if (size < (int)val.length())
|
||||||
size = val.length() + 4;
|
size = val.length() + 4;
|
||||||
ret = local_utility::acquire_memory(size, "");
|
ret = local_utility::acquire_memory(size, "");
|
||||||
strcpy((char*)ret, val.c_str());
|
strcpy((char*)ret, val.c_str());
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
#ifndef WRRPER_SANE_SCANNER_H_EX
|
#ifndef WRRPER_SANE_SCANNER_H_EX
|
||||||
#define WRRPER_SANE_SCANNER_H_EX
|
#define WRRPER_SANE_SCANNER_H_EX
|
||||||
|
|
||||||
/////////////////////////////////////////////////////////////////////////////////////////////
|
/////////////////////////////////////////////////////////////////////////////////////////////
|
||||||
|
|
Loading…
Reference in New Issue