From 883137b93a84319beeee9f67de745bf65252ee77 Mon Sep 17 00:00:00 2001 From: gb <741021719@qq.com> Date: Fri, 28 Oct 2022 17:09:59 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=9B=9E=E8=B0=83=E5=87=BD?= =?UTF-8?q?=E6=95=B0=E6=96=B9=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sane/scanner.cpp | 4 ++-- sane/scanner.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/sane/scanner.cpp b/sane/scanner.cpp index 447ea51..f3c856e 100644 --- a/sane/scanner.cpp +++ b/sane/scanner.cpp @@ -201,7 +201,7 @@ namespace callback , {SANE_STD_OPT_NAME_IS_AUTO_FEED_STRENGTH , "\350\207\252\345\212\250\346\220\223\347\272\270\345\274\272\345\272\246"} // 自动搓纸强度 , {SANE_STD_OPT_NAME_FEED_STRENGTH_VALUE , "\346\220\223\347\272\270\351\230\210\345\200\274"} // " 搓纸阈值" }; - const char* __stdcall option_title_2_name(const char* title) + const char* option_title_2_name(const char* title) { while (*title == ' ') title++; @@ -492,7 +492,7 @@ void __stdcall scanner::ui_callback(int uev, void* sender, void* param) { ((scanner*)param)->on_ui_event(uev, sender); } -bool __stdcall scanner::is_option_float(int sn, void* param) +bool scanner::is_option_float(int sn, void* param) { SANE_Option_Descriptor* desc = hg_sane_middleware::instance()->get_option_descriptor((SANE_Handle)param, sn); diff --git a/sane/scanner.h b/sane/scanner.h index 6ef08ca..999551e 100644 --- a/sane/scanner.h +++ b/sane/scanner.h @@ -184,7 +184,7 @@ class scanner : public ISaneInvoker, virtual public refer static int __stdcall to_int(SANE_Int v); static float __stdcall to_float(SANE_Fixed v); static void __stdcall ui_callback(int uev, void* sender, void* param); - static bool __stdcall is_option_float(int sn, void* param); + static bool is_option_float(int sn, void* param); public: scanner(SCANNERID id);