lmh188
/
code_twain
mirror of http://192.168.10.5:8099/sane/code_twain.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

应用跨平台函数

This commit is contained in:
gb 2022-10-27 10:45:37 +08:00
parent 6c350e3b05
commit de9d416ddd
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
sane/gb_json.cpp
View File

@ -1159,7 +1159,7 @@ namespace gb
for (size_t i = 0; i < bytes; ++i)
{
sprintf_s(buf, _countof(buf) - 1, "%02X", ptr[i]);
sprintf(buf, "%02X", ptr[i]);
hex += buf;
}
@ -1205,7 +1205,7 @@ namespace gb
bool sane_config_schm::load_from_mem(const char* mem, bool in_b64)
{
gb::base64 b64;
std::string stream(in_b64 ? b64.decode(mem, lstrlenA(mem)) : mem);
std::string stream(in_b64 ? b64.decode(mem, strlen(mem)) : mem);
clear();
jsn_ = new gb::json();
@ -1367,7 +1367,7 @@ namespace gb
if(with_ver)
{
char ver[40] = { 0 };
sprintf_s(ver, "%u.%u", VERSION_MAIN, VERSION_SUB);
sprintf(ver, "%u.%u", VERSION_MAIN, VERSION_SUB);
jsn_->set_value("ver", ver);
}
@ -1448,7 +1448,7 @@ namespace gb
} while (jsn_->next_child(val, &name));
}
}
sprintf_s(vs, _countof(vs) - 1, "%u.%u", VERSION_MAIN, VERSION_SUB);
sprintf(vs, "%u.%u", VERSION_MAIN, VERSION_SUB);
jsn_->set_value("ver", vs);
if (changed)
@ -1699,7 +1699,7 @@ namespace gb
if (it == schemes_.end())
global_->set_value(scanner_cfg::cur_sel_.c_str(), -1);
else
global_->set_value(scanner_cfg::cur_sel_.c_str(), it - schemes_.begin());
global_->set_value(scanner_cfg::cur_sel_.c_str(), (int)(it - schemes_.begin()));
return true;
}