lmh188
/
tx-gxx-linux
mirror of http://192.168.1.51:8099/scanner/tx-gxx-linux.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix get raw value bug

This commit is contained in:
gb 2023-05-06 16:35:01 +08:00
parent 90b03e47fe
commit 459cafeb26
2 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
device/gxx-linux/usb/src/async_model/common/sane_cfg.cpp
View File

@ -351,19 +351,19 @@ data_type sane_cfg_provider::type_from_string(const char* type_desc)
if(root->get_value(key, bv)) if(root->get_value(key, bv))
{ {
val = std::string((char*)&bv, sizeof(bv)); val = std::string((char*)&bv, sizeof(bv));
if(*type) if(type)
*type = DATA_TYPE_BOOL; *type = DATA_TYPE_BOOL;
} }
else if(root->get_value(key, nv)) else if(root->get_value(key, nv))
{ {
val = std::string((char*)&nv, sizeof(nv)); val = std::string((char*)&nv, sizeof(nv));
if(*type) if(type)
*type = DATA_TYPE_INT4; *type = DATA_TYPE_INT4;
} }
else if(root->get_value(key, fv)) else if(root->get_value(key, fv))
{ {
val = std::string((char*)&fv, sizeof(fv)); val = std::string((char*)&fv, sizeof(fv));
if(*type) if(type)
*type = DATA_TYPE_FLOAT; *type = DATA_TYPE_FLOAT;
} }
else else

21
device/gxx-linux/usb/src/async_model/img_process/algs/img_algorithm.cpp
View File

@ -360,16 +360,17 @@ int32_t img_resizer::set_config(const char* cfg_name, void* data, size_t* len, u
} }
bool img_resizer::update_enabled(const char* name, std::function<GET_SANE_OPT_PROTO> get_opt) bool img_resizer::update_enabled(const char* name, std::function<GET_SANE_OPT_PROTO> get_opt)
{ {
uint32_t dtype = 0; // uint32_t dtype = 0;
std::string val(""); // std::string val("");
//
if(get_opt("cis-dpi", "cur", val, &dtype) == 0) // if(get_opt("cis-dpi", "cur", val, &dtype) == 0)
{ // {
if(dtype == DATA_TYPE_INT4) // if(dtype == DATA_TYPE_INT4)
enable_ = dpi_ != *(int*)val.c_str(); // enable_ = dpi_ != *(int*)val.c_str();
else if(dtype == DATA_TYPE_FLOAT) // else if(dtype == DATA_TYPE_FLOAT)
enable_ = dpi_ != (int)*(double*)val.c_str(); // enable_ = dpi_ != (int)*(double*)val.c_str();
} // }
enable_ = true;
return false; return false;
} }