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

调整函数命名和python 内部函数名冲突问题

This commit is contained in:
13038267101 2023-02-13 17:02:47 +08:00
parent 00c8df8edf
commit 4ce22545e1
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
device/device.def
View File

@ -20,5 +20,5 @@ EXPORTS
hg_scanner_err_description hg_scanner_err_description
hg_scanner_log_is_enable hg_scanner_log_is_enable
hg_scanner_log hg_scanner_log
get_current_time hg_get_current_time
get_current_time_w hg_get_current_time_w

4
sane/scanner.cpp
View File

@ -2950,7 +2950,7 @@ void init_log(void)
wchar_t ts[128] = { 0 }, now[40] = { 0 }; wchar_t ts[128] = { 0 }, now[40] = { 0 };
get_current_time_w(now); hg_get_current_time_w(now);
swprintf_s(ts, _countof(ts) - 1, L"==================%s==================\r\n", now); swprintf_s(ts, _countof(ts) - 1, L"==================%s==================\r\n", now);
fwrite(ts, 2, lstrlenW(ts), g_file_); fwrite(ts, 2, lstrlenW(ts), g_file_);
} }
@ -2979,7 +2979,7 @@ void log(const wchar_t* info)
unsigned short bom = 0x0feff; unsigned short bom = 0x0feff;
wchar_t ts[128] = { 0 }, now[40] = { 0 }; wchar_t ts[128] = { 0 }, now[40] = { 0 };
get_current_time_w(now); hg_get_current_time_w(now);
swprintf_s(ts, _countof(ts) - 1, L"==================%s (Truncated when size > 10MB) ==================\r\n", now); swprintf_s(ts, _countof(ts) - 1, L"==================%s (Truncated when size > 10MB) ==================\r\n", now);
fwrite(&bom, sizeof(bom), 1, g_file_); fwrite(&bom, sizeof(bom), 1, g_file_);
fwrite(ts, 2, lstrlenW(ts), g_file_); fwrite(ts, 2, lstrlenW(ts), g_file_);