This commit is contained in:
parent
f26ecbcc34
commit
ac4f938e32
|
@ -4485,10 +4485,6 @@ namespace ver_2
|
|||
{
|
||||
HGBase_SetImageDpi(img, p->m_dpi, p->m_dpi);
|
||||
|
||||
HGBool blank = HGFALSE;
|
||||
if (p->m_scanBlankCheck)
|
||||
HGImgProc_ImageBlankCheck(img, NULL, &blank);
|
||||
|
||||
HGBase_EnterLock(p->m_lock);
|
||||
std::string imagePath;
|
||||
int ret = p->SaveImage(img, !p->m_scanLocalSave, imagePath);
|
||||
|
@ -4509,6 +4505,10 @@ namespace ver_2
|
|||
}
|
||||
}
|
||||
|
||||
HGBool blank = HGFALSE;
|
||||
if (p->m_scanBlankCheck)
|
||||
HGImgProc_ImageBlankCheck(img, NULL, &blank);
|
||||
|
||||
std::list<class WSUser *>::iterator iter;
|
||||
for (iter = p->m_user.begin(); iter != p->m_user.end(); ++iter)
|
||||
{
|
||||
|
|
|
@ -924,13 +924,6 @@ namespace ver_2
|
|||
{
|
||||
WSUser* p = (WSUser*)param;
|
||||
|
||||
std::string base64;
|
||||
if (getBase64)
|
||||
{
|
||||
std::string errInfo;
|
||||
p->GetManager()->LoadLocalImage(path, base64, errInfo);
|
||||
}
|
||||
|
||||
cJSON *retJson = cJSON_CreateObject();
|
||||
if (NULL != retJson)
|
||||
{
|
||||
|
@ -950,7 +943,12 @@ namespace ver_2
|
|||
cJSON_AddItemToObject(retJson, "image_path", cJSON_CreateString(StdStringToUtf8(path).c_str()));
|
||||
|
||||
if (getBase64)
|
||||
{
|
||||
std::string base64;
|
||||
std::string errInfo;
|
||||
p->GetManager()->LoadLocalImage(path, base64, errInfo);
|
||||
cJSON_AddItemToObject(retJson, "image_base64", cJSON_CreateString(base64.c_str()));
|
||||
}
|
||||
|
||||
char* resp = cJSON_Print(retJson);
|
||||
if (NULL != resp)
|
||||
|
|
Loading…
Reference in New Issue