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

cts

This commit is contained in:
13038267101 2023-01-17 15:08:39 +08:00
parent f397231416
commit eb6125da51
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
device/win_usb/win_usb.cpp
View File

@ -17,13 +17,13 @@
#pragma comment(lib, "rpcrt4.lib") #pragma comment(lib, "rpcrt4.lib")
#pragma comment(lib, "advapi32.lib") // for Reg... #pragma comment(lib, "advapi32.lib") // for Reg...
#if defined(OEM_NONE) || defined(OEM_LISCHENG) || defined(OEM_HANWANG) #if defined(OEM_NONE) || defined(OEM_LISCHENG) || defined(OEM_HANWANG) || defined(OEM_CANGTIAN)
#include "../wrapper/hg_log.h" #include "../wrapper/hg_log.h"
#else #else
#define VLOG_MINI_1(l, f, d) printf(f, d) #define VLOG_MINI_1(l, f, d) printf(f, d)
#define VLOG_MINI_2(l, f, d1, d2) printf(f, d1, d2) #define VLOG_MINI_2(l, f, d1, d2) printf(f, d1, d2)
#define VLOG_MINI_3(l, f, d1, d2, d3) printf(f, d1, d2, d3) #define VLOG_MINI_3(l, f, d1, d2, d3) printf(f, d1, d2, d3)
#define VLOG_MINI_4(l, f, d1, d2, d3, d4) printf(f, d1, d2, d3, d4) #define VLOG_MINI_4(l, f, d1, d2, d3, d4) printf(f, d1, d2, d3, d4)
#endif #endif
#include "usbview/enum.h" #include "usbview/enum.h"
#include "../../../sdk/include/huagao/brand.h" #include "../../../sdk/include/huagao/brand.h"
@ -47,7 +47,7 @@ void usb_callback::notify(libusb_context* ctx, usb_device* dev, int ev)
} }
std::string u2utf8(const wchar_t* u) std::string u2utf8(const wchar_t* u)
{ {
#if defined(OEM_NONE) || defined(OEM_LISCHENG) || defined(OEM_HANWANG) #if defined(OEM_NONE) || defined(OEM_LISCHENG) || defined(OEM_HANWANG)|| defined(OEM_CANGTIAN)
return hg_log::u2utf8(u); return hg_log::u2utf8(u);
#else #else
int len = WideCharToMultiByte(CP_UTF8, 0, u, lstrlenW(u), NULL, 0, NULL, NULL); int len = WideCharToMultiByte(CP_UTF8, 0, u, lstrlenW(u), NULL, 0, NULL, NULL);

4
sln/hgscanner.sln
View File

@ -47,8 +47,8 @@ Global
{C3B47CE2-27CE-4509-AB59-3C0F194F0FCE}.Release|x64.Build.0 = Release|x64 {C3B47CE2-27CE-4509-AB59-3C0F194F0FCE}.Release|x64.Build.0 = Release|x64
{C3B47CE2-27CE-4509-AB59-3C0F194F0FCE}.Release|x86.ActiveCfg = Release|Win32 {C3B47CE2-27CE-4509-AB59-3C0F194F0FCE}.Release|x86.ActiveCfg = Release|Win32
{C3B47CE2-27CE-4509-AB59-3C0F194F0FCE}.Release|x86.Build.0 = Release|Win32 {C3B47CE2-27CE-4509-AB59-3C0F194F0FCE}.Release|x86.Build.0 = Release|Win32
{A7528596-FBA2-4FFF-8649-C8D0EEBC6554}.Debug|x64.ActiveCfg = Debug|x64 {A7528596-FBA2-4FFF-8649-C8D0EEBC6554}.Debug|x64.ActiveCfg = Debug|Win32
{A7528596-FBA2-4FFF-8649-C8D0EEBC6554}.Debug|x64.Build.0 = Debug|x64 {A7528596-FBA2-4FFF-8649-C8D0EEBC6554}.Debug|x64.Build.0 = Debug|Win32
{A7528596-FBA2-4FFF-8649-C8D0EEBC6554}.Debug|x86.ActiveCfg = Debug|Win32 {A7528596-FBA2-4FFF-8649-C8D0EEBC6554}.Debug|x86.ActiveCfg = Debug|Win32
{A7528596-FBA2-4FFF-8649-C8D0EEBC6554}.Debug|x86.Build.0 = Debug|Win32 {A7528596-FBA2-4FFF-8649-C8D0EEBC6554}.Debug|x86.Build.0 = Debug|Win32
{A7528596-FBA2-4FFF-8649-C8D0EEBC6554}.Release|x64.ActiveCfg = Release|x64 {A7528596-FBA2-4FFF-8649-C8D0EEBC6554}.Release|x64.ActiveCfg = Release|x64