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

解决webscan库的编译问题

This commit is contained in:
luoliangyi 2024-10-14 17:35:54 +08:00
parent f043dc5a29
commit 57327408d8
2 changed files with 3 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
sdk/webscan/WebServer.cpp
View File

@ -1,6 +1,5 @@
#include "WebServer.h"
#include "WebUser.h"
#include "base/HGInfo.h"
WebServer::WebServer(HGMsgPump msgPump)
{
@ -39,7 +38,6 @@ bool WebServer::Open(HGUShort port)
if (-1 == sockServer)
#endif
{
HGBase_WriteInfo(HGBASE_INFOTYPE_ERROR, "open webserver failed 1, port=%u", port);
return false;
}
@ -63,7 +61,6 @@ bool WebServer::Open(HGUShort port)
#else
close(sockServer);
#endif
HGBase_WriteInfo(HGBASE_INFOTYPE_ERROR, "open webserver failed 2, port=%u", port);
return false;
}
@ -75,14 +72,12 @@ bool WebServer::Open(HGUShort port)
#else
close(sockServer);
#endif
HGBase_WriteInfo(HGBASE_INFOTYPE_ERROR, "open webserver failed 3, port=%u", port);
return false;
}
m_sockServer = sockServer;
HGBase_OpenThread(ThreadFunc, this, &m_listenThread);
assert(NULL != m_listenThread);
HGBase_WriteInfo(HGBASE_INFOTYPE_DESC, "open webserver success, port=%u", port);
return true;
}

15
sdk/webscan/WebUser.cpp
View File

@ -1,6 +1,5 @@
#include "WebUser.h"
#include "WebServer.h"
#include "base/HGInfo.h"
#include "base/HGBase64.h"
#include "base/HGImage.h"
#include "imgfmt/HGJpeg.h"
@ -1039,7 +1038,6 @@ int WebUser::sane_ex_callback(SANE_Handle hdev, int code, void* data, unsigned i
case SANE_EVENT_DEVICE_ARRIVED:
{
SANE_Device* sane_dev = (SANE_Device*)data;
HGBase_WriteInfo(HGBASE_INFOTYPE_DESC, "SANE_EVENT_DEVICE_ARRIVED, name=%s", Utf8ToStdString(sane_dev->name).c_str());
HGBase_EnterLock(p->m_lockName);
p->m_devNameList.push_back(sane_dev->name);
@ -1049,7 +1047,6 @@ int WebUser::sane_ex_callback(SANE_Handle hdev, int code, void* data, unsigned i
case SANE_EVENT_DEVICE_LEFT:
{
SANE_Device* sane_dev = (SANE_Device*)data;
HGBase_WriteInfo(HGBASE_INFOTYPE_DESC, "SANE_EVENT_DEVICE_LEFT, name=%s", Utf8ToStdString(sane_dev->name).c_str());
CloseDevParam* closeDevParam = new CloseDevParam;
closeDevParam->svr = p->m_server;
@ -1078,13 +1075,11 @@ int WebUser::sane_ex_callback(SANE_Handle hdev, int code, void* data, unsigned i
break;
case SANE_EVENT_WORKING:
{
HGBase_WriteInfo(HGBASE_INFOTYPE_DESC, "SANE_EVENT_WORKING, msg=%s", Utf8ToStdString((char*)data).c_str());
//
}
break;
case SANE_EVENT_SCAN_FINISHED:
{
HGBase_WriteInfo(HGBASE_INFOTYPE_DESC, "SANE_EVENT_SCAN_FINISHED, msg=%s", Utf8ToStdString((char*)data).c_str());
HGBase_SetEvent(p->m_scanEvent);
ScanFinishParam* scanFinishParam = new ScanFinishParam;
@ -1124,18 +1119,16 @@ int WebUser::sane_ex_callback(SANE_Handle hdev, int code, void* data, unsigned i
break;
case SANE_EVENT_STATUS:
{
HGBase_WriteInfo(HGBASE_INFOTYPE_DESC, "SANE_EVENT_STATUS, msg=%s", Utf8ToStdString((char*)data).c_str());
//
}
break;
case SANE_EVENT_ERROR:
{
HGBase_WriteInfo(HGBASE_INFOTYPE_DESC, "SANE_EVENT_ERROR, msg=%s", Utf8ToStdString((char*)data).c_str());
//
}
break;
case SANE_EVENT_IMAGE_OK:
{
HGBase_WriteInfo(HGBASE_INFOTYPE_DESC, "SANE_EVENT_IMAGE_OK");
SANE_Image* sane_img = (SANE_Image*)data;
HGUInt imgType = 0;
@ -1328,8 +1321,6 @@ bool WebUser::ShakeHand(const std::string& head)
HttpHead::AnalysisHead(head, requestMethod, requestURIPath, requestURIQueryInfos,
requestURIFragment, httpVersion, headInfos);
HGBase_WriteInfo(HGBASE_INFOTYPE_DESC, head.c_str());
//if (std::string::npos == HttpHead::GetValue(headInfos, "Connection").find("Upgrade"))
// return false;
//if ("websocket" != HttpHead::GetValue(headInfos, "Upgrade"))