From 4adf7e44b67428d5bc89e71bf7b302f1f996dcc3 Mon Sep 17 00:00:00 2001 From: Hermet Park Date: Wed, 16 Sep 2020 19:00:19 +0900 Subject: [PATCH] capi: code refactoring (#58) * capi: refactoring code. init/term method allows mixing enum values, we don't need to call them separatetly. Change-Id: I900137b5578173895ba695c86703ee0035f19e69 --- src/bindings/capi/tvgCapi.cpp | 22 ++++++---------------- 1 file changed, 6 insertions(+), 16 deletions(-) diff --git a/src/bindings/capi/tvgCapi.cpp b/src/bindings/capi/tvgCapi.cpp index 2240223..be2ec92 100644 --- a/src/bindings/capi/tvgCapi.cpp +++ b/src/bindings/capi/tvgCapi.cpp @@ -52,25 +52,15 @@ struct _Tvg_Gradient /* Engine API */ /************************************************************************/ -TVG_EXPORT Tvg_Result tvg_engine_init(unsigned engine_method, unsigned threads) { - Result ret = Result::Success; - - if (engine_method & TVG_ENGINE_SW) ret = tvg::Initializer::init(tvg::CanvasEngine::Sw, threads); - if (ret != Result::Success) return (Tvg_Result) ret; - - if (engine_method & TVG_ENGINE_GL) ret = tvg::Initializer::init(tvg::CanvasEngine::Gl, threads); - return (Tvg_Result) ret; +TVG_EXPORT Tvg_Result tvg_engine_init(unsigned engine_method, unsigned threads) +{ + return (Tvg_Result) Initializer::init(CanvasEngine(engine_method), threads); } -TVG_EXPORT Tvg_Result tvg_engine_term(unsigned engine_method) { - Result ret = Result::Success; - - if (engine_method & TVG_ENGINE_SW) ret = tvg::Initializer::term(tvg::CanvasEngine::Sw); - if (ret != Result::Success) return (Tvg_Result) ret; - - if (engine_method & TVG_ENGINE_GL) ret = tvg::Initializer::term(tvg::CanvasEngine::Gl); - return (Tvg_Result) ret; +TVG_EXPORT Tvg_Result tvg_engine_term(unsigned engine_method) +{ + return (Tvg_Result) Initializer::term(CanvasEngine(engine_method)); } /************************************************************************/ -- 2.7.4