From 9a78bfd9cb43587dffcb64dae22cd7f65a018267 Mon Sep 17 00:00:00 2001 From: MistEO Date: Thu, 8 Dec 2022 21:24:59 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8DOCR=E5=8F=82=E6=95=B0?= =?UTF-8?q?=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/MaaCore/Config/Miscellaneous/OcrPack.cpp | 12 ++++-------- src/MaaCore/Config/Miscellaneous/OcrPack.h | 9 --------- 2 files changed, 4 insertions(+), 17 deletions(-) diff --git a/src/MaaCore/Config/Miscellaneous/OcrPack.cpp b/src/MaaCore/Config/Miscellaneous/OcrPack.cpp index a8d2c6ffc6..eeb50312f0 100644 --- a/src/MaaCore/Config/Miscellaneous/OcrPack.cpp +++ b/src/MaaCore/Config/Miscellaneous/OcrPack.cpp @@ -27,17 +27,13 @@ static std::filesystem::path prepare_paddle_dir(const std::filesystem::path& dir #endif asst::OcrPack::OcrPack() - : m_ocr_option(std::make_unique()), m_det(nullptr), m_rec(nullptr), m_ocr(nullptr), - m_backend(OcrBackend::ONNXRuntime) -{} + : m_ocr_option(std::make_unique()), m_det(nullptr), m_rec(nullptr), m_ocr(nullptr) +{ + m_ocr_option->UseOrtBackend(); +} asst::OcrPack::~OcrPack() {} -void asst::OcrPack::set_backend_before_load(OcrBackend backend) -{ - m_backend = backend; -} - bool asst::OcrPack::load(const std::filesystem::path& path) { bool use_temp_dir = false; diff --git a/src/MaaCore/Config/Miscellaneous/OcrPack.h b/src/MaaCore/Config/Miscellaneous/OcrPack.h index ab7dcd4c87..5b77486a9b 100644 --- a/src/MaaCore/Config/Miscellaneous/OcrPack.h +++ b/src/MaaCore/Config/Miscellaneous/OcrPack.h @@ -30,16 +30,9 @@ namespace asst { class OcrPack : public AbstractResource { - public: - enum class OcrBackend - { - ONNXRuntime, - }; public: virtual ~OcrPack() override; - void set_backend_before_load(OcrBackend backend); - virtual bool load(const std::filesystem::path& path) override; std::vector recognize(const cv::Mat& image, const TextRectProc& pred = nullptr, @@ -54,8 +47,6 @@ namespace asst std::unique_ptr m_det; std::unique_ptr m_rec; std::unique_ptr m_ocr; - - OcrBackend m_backend; }; class WordOcr final : public SingletonHolder, public OcrPack