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

Merge branch 'master' of http://192.168.100.140:8099/sane/code_app

This commit is contained in:
gb 2022-07-05 16:46:18 +08:00
parent 070ae4eeaf e5d86f4878
commit 88f41f596f
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
sdk/webservice/ManagerV2.cpp
View File

@ -187,7 +187,7 @@ namespace ver_2
{
assert(NULL != param && this == param->mgr);
std::list<std::string>::const_iterator iter;
std::list<std::string>::iterator iter;
for (iter = m_saveFilePathList.begin(); iter != m_saveFilePathList.end(); ++iter)
{
if (*iter == param->fileName)
@ -382,7 +382,7 @@ namespace ver_2
int ret = -1;
errInfo = "错误";
std::list<std::string>::const_iterator iter;
std::list<std::string>::iterator iter;
for (iter = m_saveFilePathList.begin(); iter != m_saveFilePathList.end(); ++iter)
{
if (filePath == *iter)
@ -814,7 +814,7 @@ namespace ver_2
if (NULL != image)
{
HGImage img = NULL;
HGImgProc_ImageAutoCrop(image, (HGBool)autoCrop, (HGBool)deskew, (HGBool)fillBlank, NULL,
HGImgProc_ImageAutoCrop(image, (HGBool)autoCrop, (HGBool)deskew, (HGBool)fillBlank, NULL,
(HGUInt)width, (HGUInt)height, 0, HGBASE_IMGORIGIN_TOP, &img);
if (NULL != img)
{
@ -1017,7 +1017,7 @@ namespace ver_2
m_saveFilePathList.push_back(outImagePath);
RestoreSaveFilePathList(m_saveFilePathList);
}
errInfo.clear();
ret = 0;
}
@ -1065,7 +1065,7 @@ namespace ver_2
m_saveFilePathList.push_back(outImagePath);
RestoreSaveFilePathList(m_saveFilePathList);
}
errInfo.clear();
ret = 0;
}
@ -1651,7 +1651,7 @@ namespace ver_2
sqlite3_stmt* stmt = NULL;
char sql[256];
sprintf(sql, "select format, tag, thumb from table_%s join table_%s_idx on table_%s.id == table_%s_idx.id order by table_%s_idx.idx asc",
sprintf(sql, "select format, tag, thumb from table_%s join table_%s_idx on table_%s.id == table_%s_idx.id order by table_%s_idx.idx asc",
m_currBatchId.c_str(), m_currBatchId.c_str(), m_currBatchId.c_str(), m_currBatchId.c_str(), m_currBatchId.c_str());
int ret = sqlite3_prepare(m_sqlite, sql, -1, &stmt, NULL);
assert(0 == ret);
@ -2561,7 +2561,7 @@ namespace ver_2
std::vector<BatchTableInfo> tables;
GetBatchTableInfo(tables);
if (imageIndex1 < 0 || imageIndex1 >= (int)tables.size()
if (imageIndex1 < 0 || imageIndex1 >= (int)tables.size()
|| imageIndex2 < 0 || imageIndex2 >= (int)tables.size())
return -1;
@ -3177,10 +3177,10 @@ namespace ver_2
for (int j = 0; j < (int)devParams[i].devParams.size(); ++j)
{
const DeviceParam& devParam = devParams[i].devParams[j];
char sql[1024];
if (1 == devParam.valueType)
sprintf(sql, "insert into device_params values ('%s', '%s', '%s')",
sprintf(sql, "insert into device_params values ('%s', '%s', '%s')",
devParam.title.c_str(), "string", devParam.stringValue.c_str());
else if (2 == devParam.valueType)
sprintf(sql, "insert into device_params values ('%s', '%s', '%d')",
@ -3691,8 +3691,8 @@ namespace ver_2
sqlite3_stmt* stmt = NULL;
char sql[256];
sprintf(sql, "select table_%s.id, table_%s.format from table_%s join table_%s_idx on table_%s.id == table_%s_idx.id order by table_%s_idx.idx asc",
m_currBatchId.c_str(), m_currBatchId.c_str(), m_currBatchId.c_str(), m_currBatchId.c_str(), m_currBatchId.c_str(),
sprintf(sql, "select table_%s.id, table_%s.format from table_%s join table_%s_idx on table_%s.id == table_%s_idx.id order by table_%s_idx.idx asc",
m_currBatchId.c_str(), m_currBatchId.c_str(), m_currBatchId.c_str(), m_currBatchId.c_str(), m_currBatchId.c_str(),
m_currBatchId.c_str(), m_currBatchId.c_str());
int ret = sqlite3_prepare(m_sqlite, sql, -1, &stmt, NULL);
assert(0 == ret);

BIN
third_party/coredumper/coredumper-1.2.1.tar.gz vendored Normal file
View File

Binary file not shown.