api: revise the engine initializer for the 1.0 release.

This change introduces the CanvasEngine::All type to automatically
initialize the engines available on the current system.

These revisions improve the usability of these APIs.

Addtions:
- enum class CanvasEngine::All

Modifications:
- Result Initializer::init(CanvasEngine engine, uint32_t threads) ->
Result Initializer::init(uint32_t threads, CanvasEngine engine = tvg::CanvasEngine::All)

inc/thorvg.h

@@ -212,6 +212,7 @@ enum class BlendMethod : uint8_t
  */
 enum class CanvasEngine : uint8_t
 {
+    All = 0,       ///< All feasible rasterizers.
     Sw = (1 << 1), ///< CPU rasterizer.
     Gl = (1 << 2), ///< OpenGL rasterizer.
     Wg = (1 << 3), ///< WebGPU rasterizer. @BETA_API
@@ -1594,19 +1595,18 @@ public:
      * You can indicate the number of threads, the count of which is designated @p threads.
      * In the initialization step, TVG will generate/spawn the threads as set by @p threads count.
      *
-     * @param[in] engine The engine types to initialize. This is relative to the Canvas types, in which it will be used. For multiple backends bitwise operation is allowed.
      * @param[in] threads The number of additional threads. Zero indicates only the main thread is to be used.
+     * @param[in] engine The engine types to initialize. This is relative to the Canvas types, in which it will be used. For multiple backends bitwise operation is allowed.
      *
      * @retval Result::Success When succeed.
      * @retval Result::FailedAllocation An internal error possibly with memory allocation.
-     * @retval Result::InvalidArguments If unknown engine type chosen.
      * @retval Result::NonSupport In case the engine type is not supported on the system.
      * @retval Result::Unknown Others.
      *
      * @note The Initializer keeps track of the number of times it was called. Threads count is fixed at the first init() call.
      * @see Initializer::term()
      */
-    static Result init(CanvasEngine engine, uint32_t threads) noexcept;
+    static Result init(uint32_t threads, CanvasEngine engine = tvg::CanvasEngine::All) noexcept;
 
     /**
      * @brief Terminates TVG engines.
@@ -1615,14 +1615,13 @@ public:
      *
      * @retval Result::Success When succeed.
      * @retval Result::InsufficientCondition In case there is nothing to be terminated.
-     * @retval Result::InvalidArguments If unknown engine type chosen.
      * @retval Result::NonSupport In case the engine type is not supported on the system.
      * @retval Result::Unknown Others.
      *
      * @note Initializer does own reference counting for multiple calls.
      * @see Initializer::init()
      */
-    static Result term(CanvasEngine engine) noexcept;
+    static Result term(CanvasEngine engine = tvg::CanvasEngine::All) noexcept;
 
     _TVG_DISABLE_CTOR(Initializer);
 };

src/bindings/capi/tvgCapi.cpp

@@ -38,7 +38,7 @@ extern "C" {
 
 TVG_API Tvg_Result tvg_engine_init(Tvg_Engine engine_method, unsigned threads)
 {
-    return (Tvg_Result) Initializer::init(CanvasEngine(engine_method), threads);
+    return (Tvg_Result) Initializer::init(threads, CanvasEngine(engine_method));
 }
 
 

src/bindings/wasm/tvgWasm.cpp

@@ -47,7 +47,7 @@ public:
     ~TvgWasm()
     {
         free(buffer);
-        Initializer::term(CanvasEngine::Sw);
+        Initializer::term();
     }
 
     static unique_ptr<TvgWasm> create()
@@ -276,7 +276,7 @@ private:
     {
         errorMsg = NoError;
 
-        if (Initializer::init(CanvasEngine::Sw, 0) != Result::Success) {
+        if (Initializer::init(0) != Result::Success) {
             errorMsg = "init() fail";
             return;
         }

src/examples/Accessor.cpp

@@ -128,24 +128,18 @@ void drawGLview(Evas_Object *obj)
 
 int main(int argc, char **argv)
 {
-    tvg::CanvasEngine tvgEngine = tvg::CanvasEngine::Sw;
+    auto tvgEngine = tvg::CanvasEngine::Sw;
 
     if (argc > 1) {
         if (!strcmp(argv[1], "gl")) tvgEngine = tvg::CanvasEngine::Gl;
     }
 
-    //Initialize ThorVG Engine
-    if (tvgEngine == tvg::CanvasEngine::Sw) {
-        cout << "tvg engine: software" << endl;
-    } else {
-        cout << "tvg engine: opengl" << endl;
-    }
-
     //Threads Count
     auto threads = std::thread::hardware_concurrency();
+    if (threads > 0) --threads;    //Allow the designated main thread capacity
 
     //Initialize ThorVG Engine
-    if (tvg::Initializer::init(tvgEngine, threads) == tvg::Result::Success) {
+    if (tvg::Initializer::init(threads) == tvg::Result::Success) {
 
         elm_init(argc, argv);
 
@@ -159,7 +153,7 @@ int main(int argc, char **argv)
         elm_shutdown();
 
         //Terminate ThorVG Engine
-        tvg::Initializer::term(tvgEngine);
+        tvg::Initializer::term();
 
     } else {
         cout << "engine is not supported" << endl;

src/examples/AnimateMasking.cpp

@@ -162,25 +162,18 @@ void transitGlCb(Elm_Transit_Effect *effect, Elm_Transit* transit, double progre
 
 int main(int argc, char **argv)
 {
-    tvg::CanvasEngine tvgEngine = tvg::CanvasEngine::Sw;
+    auto tvgEngine = tvg::CanvasEngine::Sw;
 
     if (argc > 1) {
         if (!strcmp(argv[1], "gl")) tvgEngine = tvg::CanvasEngine::Gl;
     }
 
-    //Initialize ThorVG Engine
-    if (tvgEngine == tvg::CanvasEngine::Sw) {
-        cout << "tvg engine: software" << endl;
-    } else {
-        cout << "tvg engine: opengl" << endl;
-    }
-
     //Threads Count
     auto threads = std::thread::hardware_concurrency();
     if (threads > 0) --threads;    //Allow the designated main thread capacity
 
     //Initialize ThorVG Engine
-    if (tvg::Initializer::init(tvgEngine, threads) == tvg::Result::Success) {
+    if (tvg::Initializer::init(threads) == tvg::Result::Success) {
 
         elm_init(argc, argv);
 
@@ -203,7 +196,7 @@ int main(int argc, char **argv)
         elm_shutdown();
 
         //Terminate ThorVG Engine
-        tvg::Initializer::term(tvgEngine);
+        tvg::Initializer::term();
 
     } else {
         cout << "engine is not supported" << endl;

src/examples/Animation.cpp

@@ -157,25 +157,18 @@ void transitGlCb(Elm_Transit_Effect *effect, Elm_Transit* transit, double progre
 
 int main(int argc, char **argv)
 {
-    tvg::CanvasEngine tvgEngine = tvg::CanvasEngine::Sw;
+    auto tvgEngine = tvg::CanvasEngine::Sw;
 
     if (argc > 1) {
         if (!strcmp(argv[1], "gl")) tvgEngine = tvg::CanvasEngine::Gl;
     }
 
-    //Initialize ThorVG Engine
-    if (tvgEngine == tvg::CanvasEngine::Sw) {
-        cout << "tvg engine: software" << endl;
-    } else {
-        cout << "tvg engine: opengl" << endl;
-    }
-
     //Threads Count
     auto threads = std::thread::hardware_concurrency();
     if (threads > 0) --threads;    //Allow the designated main thread capacity
 
     //Initialize ThorVG Engine
-    if (tvg::Initializer::init(tvgEngine, threads) == tvg::Result::Success) {
+    if (tvg::Initializer::init(threads) == tvg::Result::Success) {
 
         elm_init(argc, argv);
 
@@ -193,7 +186,7 @@ int main(int argc, char **argv)
         elm_shutdown();
 
         //Terminate ThorVG Engine
-        tvg::Initializer::term(tvgEngine);
+        tvg::Initializer::term();
     } else {
         cout << "engine is not supported" << endl;
     }

src/examples/Arc.cpp

@@ -157,25 +157,18 @@ void drawGLview(Evas_Object *obj)
 
 int main(int argc, char **argv)
 {
-    tvg::CanvasEngine tvgEngine = tvg::CanvasEngine::Sw;
+    auto tvgEngine = tvg::CanvasEngine::Sw;
 
     if (argc > 1) {
         if (!strcmp(argv[1], "gl")) tvgEngine = tvg::CanvasEngine::Gl;
     }
 
-    //Initialize ThorVG Engine
-    if (tvgEngine == tvg::CanvasEngine::Sw) {
-        cout << "tvg engine: software" << endl;
-    } else {
-        cout << "tvg engine: opengl" << endl;
-    }
-
     //Threads Count
     auto threads = std::thread::hardware_concurrency();
     if (threads > 0) --threads;    //Allow the designated main thread capacity
 
     //Initialize ThorVG Engine
-    if (tvg::Initializer::init(tvgEngine, threads) == tvg::Result::Success) {
+    if (tvg::Initializer::init(threads) == tvg::Result::Success) {
 
         elm_init(argc, argv);
 
@@ -189,7 +182,7 @@ int main(int argc, char **argv)
         elm_shutdown();
 
         //Terminate ThorVG Engine
-        tvg::Initializer::term(tvgEngine);
+        tvg::Initializer::term();
 
     } else {
         cout << "engine is not supported" << endl;

src/examples/Blending.cpp

@@ -238,25 +238,18 @@ void drawGLview(Evas_Object *obj)
 
 int main(int argc, char **argv)
 {
-    tvg::CanvasEngine tvgEngine = tvg::CanvasEngine::Sw;
+    auto tvgEngine = tvg::CanvasEngine::Sw;
 
     if (argc > 1) {
         if (!strcmp(argv[1], "gl")) tvgEngine = tvg::CanvasEngine::Gl;
     }
 
-    //Initialize ThorVG Engine
-    if (tvgEngine == tvg::CanvasEngine::Sw) {
-        cout << "tvg engine: software" << endl;
-    } else {
-        cout << "tvg engine: opengl" << endl;
-    }
-
     //Threads Count
     auto threads = std::thread::hardware_concurrency();
     if (threads > 0) --threads;    //Allow the designated main thread capacity
 
     //Initialize ThorVG Engine
-    if (tvg::Initializer::init(tvgEngine, threads) == tvg::Result::Success) {
+    if (tvg::Initializer::init(threads) == tvg::Result::Success) {
 
         elm_init(argc, argv);
 
@@ -270,7 +263,7 @@ int main(int argc, char **argv)
         elm_shutdown();
 
         //Terminate ThorVG Engine
-        tvg::Initializer::term(tvgEngine);
+        tvg::Initializer::term();
 
     } else {
         cout << "engine is not supported" << endl;

src/examples/ClipPath.cpp

@@ -219,25 +219,18 @@ void drawGLview(Evas_Object *obj)
 
 int main(int argc, char **argv)
 {
-    tvg::CanvasEngine tvgEngine = tvg::CanvasEngine::Sw;
+    auto tvgEngine = tvg::CanvasEngine::Sw;
 
     if (argc > 1) {
         if (!strcmp(argv[1], "gl")) tvgEngine = tvg::CanvasEngine::Gl;
     }
 
-    //Initialize ThorVG Engine
-    if (tvgEngine == tvg::CanvasEngine::Sw) {
-        cout << "tvg engine: software" << endl;
-    } else {
-        cout << "tvg engine: opengl" << endl;
-    }
-
     //Threads Count
     auto threads = std::thread::hardware_concurrency();
     if (threads > 0) --threads;    //Allow the designated main thread capacity
 
     //Initialize ThorVG Engine
-    if (tvg::Initializer::init(tvgEngine, threads) == tvg::Result::Success) {
+    if (tvg::Initializer::init(threads) == tvg::Result::Success) {
 
         elm_init(argc, argv);
 
@@ -251,7 +244,7 @@ int main(int argc, char **argv)
         elm_shutdown();
 
         //Terminate ThorVG Engine
-        tvg::Initializer::term(tvgEngine);
+        tvg::Initializer::term();
 
     } else {
         cout << "engine is not supported" << endl;

src/examples/Common.h

@@ -47,6 +47,8 @@ void win_del(void *data, Evas_Object *o, void *ev)
 
 static Eo* createSwView(uint32_t w = 800, uint32_t h = 800)
 {
+    cout << "tvg engine: software" << endl;
+
     WIDTH = w;
     HEIGHT = h;
 
@@ -80,6 +82,8 @@ void drawGLview(Evas_Object *obj);
 
 static Eo* createGlView(uint32_t w = 800, uint32_t h = 800)
 {
+    cout << "tvg engine: opengl" << endl;
+
     WIDTH = w;
     HEIGHT = h;
 

src/examples/CustomTransform.cpp

@@ -172,25 +172,18 @@ void transitGlCb(Elm_Transit_Effect *effect, Elm_Transit* transit, double progre
 
 int main(int argc, char **argv)
 {
-    tvg::CanvasEngine tvgEngine = tvg::CanvasEngine::Sw;
+    auto tvgEngine = tvg::CanvasEngine::Sw;
 
     if (argc > 1) {
         if (!strcmp(argv[1], "gl")) tvgEngine = tvg::CanvasEngine::Gl;
     }
 
-    //Initialize ThorVG Engine
-    if (tvgEngine == tvg::CanvasEngine::Sw) {
-        cout << "tvg engine: software" << endl;
-    } else {
-        cout << "tvg engine: opengl" << endl;
-    }
-
     //Threads Count
     auto threads = std::thread::hardware_concurrency();
     if (threads > 0) --threads;    //Allow the designated main thread capacity
 
     //Initialize ThorVG Engine
-    if (tvg::Initializer::init(tvgEngine, threads) == tvg::Result::Success) {
+    if (tvg::Initializer::init(threads) == tvg::Result::Success) {
 
         elm_init(argc, argv);
 
@@ -213,7 +206,7 @@ int main(int argc, char **argv)
         elm_shutdown();
 
         //Terminate ThorVG Engine
-        tvg::Initializer::term(tvgEngine);
+        tvg::Initializer::term();
 
     } else {
         cout << "engine is not supported" << endl;

src/examples/DirectUpdate.cpp

@@ -159,25 +159,18 @@ void transitGlCb(Elm_Transit_Effect *effect, Elm_Transit* transit, double progre
 
 int main(int argc, char **argv)
 {
-    tvg::CanvasEngine tvgEngine = tvg::CanvasEngine::Sw;
+    auto tvgEngine = tvg::CanvasEngine::Sw;
 
     if (argc > 1) {
         if (!strcmp(argv[1], "gl")) tvgEngine = tvg::CanvasEngine::Gl;
     }
 
-    //Initialize ThorVG Engine
-    if (tvgEngine == tvg::CanvasEngine::Sw) {
-        cout << "tvg engine: software" << endl;
-    } else {
-        cout << "tvg engine: opengl" << endl;
-    }
-
     //Threads Count
     auto threads = std::thread::hardware_concurrency();
     if (threads > 0) --threads;    //Allow the designated main thread capacity
 
     //Initialize ThorVG Engine
-    if (tvg::Initializer::init(tvgEngine, threads) == tvg::Result::Success) {
+    if (tvg::Initializer::init(threads) == tvg::Result::Success) {
 
         elm_init(argc, argv);
 
@@ -200,7 +193,7 @@ int main(int argc, char **argv)
         elm_shutdown();
 
         //Terminate ThorVG Engine
-        tvg::Initializer::term(tvgEngine);
+        tvg::Initializer::term();
 
     } else {
         cout << "engine is not supported" << endl;

src/examples/Duplicate.cpp

@@ -206,25 +206,18 @@ void drawGLview(Evas_Object *obj)
 
 int main(int argc, char **argv)
 {
-    tvg::CanvasEngine tvgEngine = tvg::CanvasEngine::Sw;
+    auto tvgEngine = tvg::CanvasEngine::Sw;
 
     if (argc > 1) {
         if (!strcmp(argv[1], "gl")) tvgEngine = tvg::CanvasEngine::Gl;
     }
 
-    //Initialize ThorVG Engine
-    if (tvgEngine == tvg::CanvasEngine::Sw) {
-        cout << "tvg engine: software" << endl;
-    } else {
-        cout << "tvg engine: opengl" << endl;
-    }
-
     //Threads Count
     auto threads = std::thread::hardware_concurrency();
     if (threads > 0) --threads;    //Allow the designated main thread capacity
 
     //Initialize ThorVG Engine
-    if (tvg::Initializer::init(tvgEngine, threads) == tvg::Result::Success) {
+    if (tvg::Initializer::init(threads) == tvg::Result::Success) {
 
         elm_init(argc, argv);
 
@@ -238,7 +231,7 @@ int main(int argc, char **argv)
         elm_shutdown();
 
         //Terminate ThorVG Engine
-        tvg::Initializer::term(tvgEngine);
+        tvg::Initializer::term();
 
     } else {
         cout << "engine is not supported" << endl;

src/examples/FillRule.cpp

@@ -123,25 +123,18 @@ void drawGLview(Evas_Object *obj)
 
 int main(int argc, char **argv)
 {
-    tvg::CanvasEngine tvgEngine = tvg::CanvasEngine::Sw;
+    auto tvgEngine = tvg::CanvasEngine::Sw;
 
     if (argc > 1) {
         if (!strcmp(argv[1], "gl")) tvgEngine = tvg::CanvasEngine::Gl;
     }
 
-    //Initialize ThorVG Engine
-    if (tvgEngine == tvg::CanvasEngine::Sw) {
-        cout << "tvg engine: software" << endl;
-    } else {
-        cout << "tvg engine: opengl" << endl;
-    }
-
     //Threads Count
     auto threads = std::thread::hardware_concurrency();
     if (threads > 0) --threads;    //Allow the designated main thread capacity
 
     //Initialize ThorVG Engine
-    if (tvg::Initializer::init(tvgEngine, threads) == tvg::Result::Success) {
+    if (tvg::Initializer::init(threads) == tvg::Result::Success) {
 
         elm_init(argc, argv);
 
@@ -155,7 +148,7 @@ int main(int argc, char **argv)
         elm_shutdown();
 
         //Terminate ThorVG Engine
-        tvg::Initializer::term(tvgEngine);
+        tvg::Initializer::term();
 
     } else {
         cout << "engine is not supported" << endl;

src/examples/GradientMasking.cpp

@@ -206,24 +206,18 @@ void drawGLview(Evas_Object *obj)
 
 int main(int argc, char **argv)
 {
-    tvg::CanvasEngine tvgEngine = tvg::CanvasEngine::Sw;
+    auto tvgEngine = tvg::CanvasEngine::Sw;
 
     if (argc > 1) {
         if (!strcmp(argv[1], "gl")) tvgEngine = tvg::CanvasEngine::Gl;
     }
 
-    //Initialize ThorVG Engine
-    if (tvgEngine == tvg::CanvasEngine::Sw) {
-        cout << "tvg engine: software" << endl;
-    } else {
-        cout << "tvg engine: opengl" << endl;
-    }
-
     //Threads Count
     auto threads = std::thread::hardware_concurrency();
+    if (threads > 0) --threads;    //Allow the designated main thread capacity
 
     //Initialize ThorVG Engine
-    if (tvg::Initializer::init(tvgEngine, threads) == tvg::Result::Success) {
+    if (tvg::Initializer::init(threads) == tvg::Result::Success) {
 
         elm_init(argc, argv);
 
@@ -237,7 +231,7 @@ int main(int argc, char **argv)
         elm_shutdown();
 
         //Terminate ThorVG Engine
-        tvg::Initializer::term(tvgEngine);
+        tvg::Initializer::term();
 
     } else {
         cout << "engine is not supported" << endl;

src/examples/GradientStroke.cpp

@@ -190,25 +190,18 @@ void drawGLview(Evas_Object *obj)
 
 int main(int argc, char **argv)
 {
-    tvg::CanvasEngine tvgEngine = tvg::CanvasEngine::Sw;
+    auto tvgEngine = tvg::CanvasEngine::Sw;
 
     if (argc > 1) {
         if (!strcmp(argv[1], "gl")) tvgEngine = tvg::CanvasEngine::Gl;
     }
 
-    //Initialize ThorVG Engine
-    if (tvgEngine == tvg::CanvasEngine::Sw) {
-        cout << "tvg engine: software" << endl;
-    } else {
-        cout << "tvg engine: opengl" << endl;
-    }
-
     //Threads Count
     auto threads = std::thread::hardware_concurrency();
     if (threads > 0) --threads;    //Allow the designated main thread capacity
 
     //Initialize ThorVG Engine
-    if (tvg::Initializer::init(tvgEngine, threads) == tvg::Result::Success) {
+    if (tvg::Initializer::init(threads) == tvg::Result::Success) {
         elm_init(argc, argv);
 
         if (tvgEngine == tvg::CanvasEngine::Sw) {
@@ -221,7 +214,7 @@ int main(int argc, char **argv)
         elm_shutdown();
 
         //Terminate ThorVG Engine
-        tvg::Initializer::term(tvgEngine);
+        tvg::Initializer::term();
 
     } else {
         cout << "engine is not supported" << endl;

src/examples/GradientTransform.cpp

@@ -193,25 +193,18 @@ void transitGlCb(Elm_Transit_Effect *effect, Elm_Transit* transit, double progre
 
 int main(int argc, char **argv)
 {
-    tvg::CanvasEngine tvgEngine = tvg::CanvasEngine::Sw;
+    auto tvgEngine = tvg::CanvasEngine::Sw;
 
     if (argc > 1) {
         if (!strcmp(argv[1], "gl")) tvgEngine = tvg::CanvasEngine::Gl;
     }
 
-    //Initialize ThorVG Engine
-    if (tvgEngine == tvg::CanvasEngine::Sw) {
-        cout << "tvg engine: software" << endl;
-    } else {
-        cout << "tvg engine: opengl" << endl;
-    }
-
     //Threads Count
     auto threads = std::thread::hardware_concurrency();
     if (threads > 0) --threads;    //Allow the designated main thread capacity
 
     //Initialize ThorVG Engine
-    if (tvg::Initializer::init(tvgEngine, threads) == tvg::Result::Success) {
+    if (tvg::Initializer::init(threads) == tvg::Result::Success) {
 
         elm_init(argc, argv);
 
@@ -234,7 +227,7 @@ int main(int argc, char **argv)
         elm_shutdown();
 
         //Terminate ThorVG Engine
-        tvg::Initializer::term(tvgEngine);
+        tvg::Initializer::term();
 
     } else {
         cout << "engine is not supported" << endl;

src/examples/ImageScaleDown.cpp

@@ -148,21 +148,18 @@ void transitGlCb(Elm_Transit_Effect *effect, Elm_Transit* transit, double progre
 
 int main(int argc, char **argv)
 {
-    tvg::CanvasEngine tvgEngine = tvg::CanvasEngine::Sw;
+    auto tvgEngine = tvg::CanvasEngine::Sw;
 
     if (argc > 1) {
         if (!strcmp(argv[1], "gl")) tvgEngine = tvg::CanvasEngine::Gl;
     }
 
-    //Initialize ThorVG Engine
+    //Threads Count
-    if (tvgEngine == tvg::CanvasEngine::Sw) {
+    auto threads = std::thread::hardware_concurrency();
-        cout << "tvg engine: software" << endl;
+    if (threads > 0) --threads;    //Allow the designated main thread capacity
-    } else {
-        cout << "tvg engine: opengl" << endl;
-    }
 
     //Initialize ThorVG Engine
-    if (tvg::Initializer::init(tvgEngine, 0) == tvg::Result::Success) {
+    if (tvg::Initializer::init(threads) == tvg::Result::Success) {
 
         elm_init(argc, argv);
 
@@ -185,7 +182,7 @@ int main(int argc, char **argv)
         elm_shutdown();
 
         //Terminate ThorVG Engine
-        tvg::Initializer::term(tvgEngine);
+        tvg::Initializer::term();
 
     } else {
         cout << "engine is not supported" << endl;

src/examples/ImageScaleUp.cpp

@@ -148,21 +148,18 @@ void transitGlCb(Elm_Transit_Effect *effect, Elm_Transit* transit, double progre
 
 int main(int argc, char **argv)
 {
-    tvg::CanvasEngine tvgEngine = tvg::CanvasEngine::Sw;
+    auto tvgEngine = tvg::CanvasEngine::Sw;
 
     if (argc > 1) {
         if (!strcmp(argv[1], "gl")) tvgEngine = tvg::CanvasEngine::Gl;
     }
 
-    //Initialize ThorVG Engine
+    //Threads Count
-    if (tvgEngine == tvg::CanvasEngine::Sw) {
+    auto threads = std::thread::hardware_concurrency();
-        cout << "tvg engine: software" << endl;
+    if (threads > 0) --threads;    //Allow the designated main thread capacity
-    } else {
-        cout << "tvg engine: opengl" << endl;
-    }
 
     //Initialize ThorVG Engine
-    if (tvg::Initializer::init(tvgEngine, 0) == tvg::Result::Success) {
+    if (tvg::Initializer::init(threads) == tvg::Result::Success) {
 
         elm_init(argc, argv);
 
@@ -185,7 +182,7 @@ int main(int argc, char **argv)
         elm_shutdown();
 
         //Terminate ThorVG Engine
-        tvg::Initializer::term(tvgEngine);
+        tvg::Initializer::term();
 
     } else {
         cout << "engine is not supported" << endl;

src/examples/InvLumaMasking.cpp

@@ -183,25 +183,17 @@ void drawGLview(Evas_Object *obj)
 
 int main(int argc, char **argv)
 {
-    tvg::CanvasEngine tvgEngine = tvg::CanvasEngine::Sw;
+    auto tvgEngine = tvg::CanvasEngine::Sw;
 
     if (argc > 1) {
         if (!strcmp(argv[1], "gl")) tvgEngine = tvg::CanvasEngine::Gl;
     }
-
-    //Initialize ThorVG Engine
-    if (tvgEngine == tvg::CanvasEngine::Sw) {
-        cout << "tvg engine: software" << endl;
-    } else {
-        cout << "tvg engine: opengl" << endl;
-    }
-
     //Threads Count
     auto threads = std::thread::hardware_concurrency();
     if (threads > 0) --threads;    //Allow the designated main thread capacity
 
     //Initialize ThorVG Engine
-    if (tvg::Initializer::init(tvgEngine, threads) == tvg::Result::Success) {
+    if (tvg::Initializer::init(threads) == tvg::Result::Success) {
 
         elm_init(argc, argv);
 
@@ -215,7 +207,7 @@ int main(int argc, char **argv)
         elm_shutdown();
 
         //Terminate ThorVG Engine
-        tvg::Initializer::term(tvgEngine);
+        tvg::Initializer::term();
 
     } else {
         cout << "engine is not supported" << endl;

src/examples/InvMasking.cpp

@@ -188,25 +188,18 @@ void drawGLview(Evas_Object *obj)
 
 int main(int argc, char **argv)
 {
-    tvg::CanvasEngine tvgEngine = tvg::CanvasEngine::Sw;
+    auto tvgEngine = tvg::CanvasEngine::Sw;
 
     if (argc > 1) {
         if (!strcmp(argv[1], "gl")) tvgEngine = tvg::CanvasEngine::Gl;
     }
 
-    //Initialize ThorVG Engine
-    if (tvgEngine == tvg::CanvasEngine::Sw) {
-        cout << "tvg engine: software" << endl;
-    } else {
-        cout << "tvg engine: opengl" << endl;
-    }
-
     //Threads Count
     auto threads = std::thread::hardware_concurrency();
     if (threads > 0) --threads;    //Allow the designated main thread capacity
 
     //Initialize ThorVG Engine
-    if (tvg::Initializer::init(tvgEngine, threads) == tvg::Result::Success) {
+    if (tvg::Initializer::init(threads) == tvg::Result::Success) {
 
         elm_init(argc, argv);
 
@@ -220,7 +213,7 @@ int main(int argc, char **argv)
         elm_shutdown();
 
         //Terminate ThorVG Engine
-        tvg::Initializer::term(tvgEngine);
+        tvg::Initializer::term();
 
     } else {
         cout << "engine is not supported" << endl;

src/examples/LinearGradient.cpp

@@ -156,25 +156,18 @@ void drawGLview(Evas_Object *obj)
 
 int main(int argc, char **argv)
 {
-    tvg::CanvasEngine tvgEngine = tvg::CanvasEngine::Sw;
+    auto tvgEngine = tvg::CanvasEngine::Sw;
 
     if (argc > 1) {
         if (!strcmp(argv[1], "gl")) tvgEngine = tvg::CanvasEngine::Gl;
     }
 
-    //Initialize ThorVG Engine
-    if (tvgEngine == tvg::CanvasEngine::Sw) {
-        cout << "tvg engine: software" << endl;
-    } else {
-        cout << "tvg engine: opengl" << endl;
-    }
-
     //Threads Count
     auto threads = std::thread::hardware_concurrency();
     if (threads > 0) --threads;    //Allow the designated main thread capacity
 
     //Initialize ThorVG Engine
-    if (tvg::Initializer::init(tvgEngine, threads) == tvg::Result::Success) {
+    if (tvg::Initializer::init(threads) == tvg::Result::Success) {
 
         elm_init(argc, argv);
 
@@ -188,7 +181,7 @@ int main(int argc, char **argv)
         elm_shutdown();
 
         //Terminate ThorVG Engine
-        tvg::Initializer::term(tvgEngine);
+        tvg::Initializer::term();
 
     } else {
         cout << "engine is not supported" << endl;

src/examples/Lottie.cpp

@@ -243,25 +243,18 @@ Eina_Bool animatorGlCb(void *data)
 
 int main(int argc, char **argv)
 {
-    tvg::CanvasEngine tvgEngine = tvg::CanvasEngine::Sw;
+    auto tvgEngine = tvg::CanvasEngine::Sw;
 
     if (argc > 1) {
         if (!strcmp(argv[1], "gl")) tvgEngine = tvg::CanvasEngine::Gl;
     }
 
-    //Initialize ThorVG Engine
-    if (tvgEngine == tvg::CanvasEngine::Sw) {
-        cout << "tvg engine: software" << endl;
-    } else {
-        cout << "tvg engine: opengl" << endl;
-    }
-
     //Threads Count
     auto threads = std::thread::hardware_concurrency();
     if (threads > 0) --threads;    //Allow the designated main thread capacity
 
     //Initialize ThorVG Engine
-    if (tvg::Initializer::init(tvgEngine, 4) == tvg::Result::Success) {
+    if (tvg::Initializer::init(4) == tvg::Result::Success) {
 
         elm_init(argc, argv);
 
@@ -277,7 +270,7 @@ int main(int argc, char **argv)
         elm_shutdown();
 
         //Terminate ThorVG Engine
-        tvg::Initializer::term(tvg::CanvasEngine::Sw);
+        tvg::Initializer::term();
 
     } else {
         cout << "engine is not supported" << endl;

src/examples/LumaMasking.cpp

@@ -183,25 +183,18 @@ void drawGLview(Evas_Object *obj)
 
 int main(int argc, char **argv)
 {
-    tvg::CanvasEngine tvgEngine = tvg::CanvasEngine::Sw;
+    auto tvgEngine = tvg::CanvasEngine::Sw;
 
     if (argc > 1) {
         if (!strcmp(argv[1], "gl")) tvgEngine = tvg::CanvasEngine::Gl;
     }
 
-    //Initialize ThorVG Engine
-    if (tvgEngine == tvg::CanvasEngine::Sw) {
-        cout << "tvg engine: software" << endl;
-    } else {
-        cout << "tvg engine: opengl" << endl;
-    }
-
     //Threads Count
     auto threads = std::thread::hardware_concurrency();
     if (threads > 0) --threads;    //Allow the designated main thread capacity
 
     //Initialize ThorVG Engine
-    if (tvg::Initializer::init(tvgEngine, threads) == tvg::Result::Success) {
+    if (tvg::Initializer::init(threads) == tvg::Result::Success) {
 
         elm_init(argc, argv);
 
@@ -215,7 +208,7 @@ int main(int argc, char **argv)
         elm_shutdown();
 
         //Terminate ThorVG Engine
-        tvg::Initializer::term(tvgEngine);
+        tvg::Initializer::term();
 
     } else {
         cout << "engine is not supported" << endl;

src/examples/Masking.cpp

@@ -190,25 +190,18 @@ void drawGLview(Evas_Object *obj)
 
 int main(int argc, char **argv)
 {
-    tvg::CanvasEngine tvgEngine = tvg::CanvasEngine::Sw;
+    auto tvgEngine = tvg::CanvasEngine::Sw;
 
     if (argc > 1) {
         if (!strcmp(argv[1], "gl")) tvgEngine = tvg::CanvasEngine::Gl;
     }
 
-    //Initialize ThorVG Engine
-    if (tvgEngine == tvg::CanvasEngine::Sw) {
-        cout << "tvg engine: software" << endl;
-    } else {
-        cout << "tvg engine: opengl" << endl;
-    }
-
     //Threads Count
     auto threads = std::thread::hardware_concurrency();
     if (threads > 0) --threads;    //Allow the designated main thread capacity
 
     //Initialize ThorVG Engine
-    if (tvg::Initializer::init(tvgEngine, threads) == tvg::Result::Success) {
+    if (tvg::Initializer::init(threads) == tvg::Result::Success) {
 
         elm_init(argc, argv);
 
@@ -222,7 +215,7 @@ int main(int argc, char **argv)
         elm_shutdown();
 
         //Terminate ThorVG Engine
-        tvg::Initializer::term(tvgEngine);
+        tvg::Initializer::term();
 
     } else {
         cout << "engine is not supported" << endl;

src/examples/MaskingMethods.cpp

@@ -455,25 +455,18 @@ void drawGLview(Evas_Object *obj)
 
 int main(int argc, char **argv)
 {
-    tvg::CanvasEngine tvgEngine = tvg::CanvasEngine::Sw;
+    auto tvgEngine = tvg::CanvasEngine::Sw;
 
     if (argc > 1) {
         if (!strcmp(argv[1], "gl")) tvgEngine = tvg::CanvasEngine::Gl;
     }
 
-    //Initialize ThorVG Engine
-    if (tvgEngine == tvg::CanvasEngine::Sw) {
-        cout << "tvg engine: software" << endl;
-    } else {
-        cout << "tvg engine: opengl" << endl;
-    }
-
     //Threads Count
     auto threads = std::thread::hardware_concurrency();
     if (threads > 0) --threads;    //Allow the designated main thread capacity
 
     //Initialize ThorVG Engine
-    if (tvg::Initializer::init(tvgEngine, threads) == tvg::Result::Success) {
+    if (tvg::Initializer::init(threads) == tvg::Result::Success) {
 
         elm_init(argc, argv);
 
@@ -487,7 +480,7 @@ int main(int argc, char **argv)
         elm_shutdown();
 
         //Terminate ThorVG Engine
-        tvg::Initializer::term(tvgEngine);
+        tvg::Initializer::term();
 
     } else {
         cout << "engine is not supported" << endl;

src/examples/MultiCanvas.cpp

@@ -215,25 +215,18 @@ void tvgGlTest(const char* name, const char* path, void* data)
 
 int main(int argc, char **argv)
 {
-    tvg::CanvasEngine tvgEngine = tvg::CanvasEngine::Sw;
+    auto tvgEngine = tvg::CanvasEngine::Sw;
 
     if (argc > 1) {
         if (!strcmp(argv[1], "gl")) tvgEngine = tvg::CanvasEngine::Gl;
     }
 
-    //Initialize ThorVG Engine
-    if (tvgEngine == tvg::CanvasEngine::Sw) {
-        cout << "tvg engine: software" << endl;
-    } else {
-        cout << "tvg engine: opengl" << endl;
-    }
-
     //Threads Count
     auto threads = std::thread::hardware_concurrency();
     if (threads > 0) --threads;    //Allow the designated main thread capacity
 
     //Initialize ThorVG Engine
-    if (tvg::Initializer::init(tvgEngine, threads) == tvg::Result::Success) {
+    if (tvg::Initializer::init(threads) == tvg::Result::Success) {
 
         elm_init(argc, argv);
 
@@ -253,7 +246,7 @@ int main(int argc, char **argv)
         elm_shutdown();
 
         //Terminate ThorVG Engine
-        tvg::Initializer::term(tvgEngine);
+        tvg::Initializer::term();
 
     } else {
         cout << "engine is not supported" << endl;

src/examples/MultiShapes.cpp

@@ -116,25 +116,18 @@ void drawGLview(Evas_Object *obj)
 
 int main(int argc, char **argv)
 {
-    tvg::CanvasEngine tvgEngine = tvg::CanvasEngine::Sw;
+    auto tvgEngine = tvg::CanvasEngine::Sw;
 
     if (argc > 1) {
         if (!strcmp(argv[1], "gl")) tvgEngine = tvg::CanvasEngine::Gl;
     }
 
-    //Initialize ThorVG Engine
-    if (tvgEngine == tvg::CanvasEngine::Sw) {
-        cout << "tvg engine: software" << endl;
-    } else {
-        cout << "tvg engine: opengl" << endl;
-    }
-
     //Threads Count
     auto threads = std::thread::hardware_concurrency();
     if (threads > 0) --threads;    //Allow the designated main thread capacity
 
     //Initialize ThorVG Engine
-    if (tvg::Initializer::init(tvgEngine, threads) == tvg::Result::Success) {
+    if (tvg::Initializer::init(threads) == tvg::Result::Success) {
 
         elm_init(argc, argv);
 
@@ -148,7 +141,7 @@ int main(int argc, char **argv)
         elm_shutdown();
 
         //Terminate ThorVG Engine
-        tvg::Initializer::term(tvgEngine);
+        tvg::Initializer::term();
 
     } else {
         cout << "engine is not supported" << endl;

src/examples/Opacity.cpp

@@ -172,25 +172,18 @@ void drawGLview(Evas_Object *obj)
 
 int main(int argc, char **argv)
 {
-    tvg::CanvasEngine tvgEngine = tvg::CanvasEngine::Sw;
+    auto tvgEngine = tvg::CanvasEngine::Sw;
 
     if (argc > 1) {
         if (!strcmp(argv[1], "gl")) tvgEngine = tvg::CanvasEngine::Gl;
     }
 
-    //Initialize ThorVG Engine
-    if (tvgEngine == tvg::CanvasEngine::Sw) {
-        cout << "tvg engine: software" << endl;
-    } else {
-        cout << "tvg engine: opengl" << endl;
-    }
-
     //Threads Count
     auto threads = std::thread::hardware_concurrency();
     if (threads > 0) --threads;    //Allow the designated main thread capacity
 
     //Initialize ThorVG Engine
-    if (tvg::Initializer::init(tvgEngine, threads) == tvg::Result::Success) {
+    if (tvg::Initializer::init(threads) == tvg::Result::Success) {
 
 
         elm_init(argc, argv);
@@ -205,7 +198,7 @@ int main(int argc, char **argv)
         elm_shutdown();
 
         //Terminate ThorVG Engine
-        tvg::Initializer::term(tvgEngine);
+        tvg::Initializer::term();
 
     } else {
         cout << "engine is not supported" << endl;

src/examples/Path.cpp

@@ -135,25 +135,18 @@ void drawGLview(Evas_Object *obj)
 
 int main(int argc, char **argv)
 {
-    tvg::CanvasEngine tvgEngine = tvg::CanvasEngine::Sw;
+    auto tvgEngine = tvg::CanvasEngine::Sw;
 
     if (argc > 1) {
         if (!strcmp(argv[1], "gl")) tvgEngine = tvg::CanvasEngine::Gl;
     }
 
-    //Initialize ThorVG Engine
-    if (tvgEngine == tvg::CanvasEngine::Sw) {
-        cout << "tvg engine: software" << endl;
-    } else {
-        cout << "tvg engine: opengl" << endl;
-    }
-
     //Threads Count
     auto threads = std::thread::hardware_concurrency();
     if (threads > 0) --threads;    //Allow the designated main thread capacity
 
     //Initialize ThorVG Engine
-    if (tvg::Initializer::init(tvgEngine, threads) == tvg::Result::Success) {
+    if (tvg::Initializer::init(threads) == tvg::Result::Success) {
 
         elm_init(argc, argv);
 
@@ -167,7 +160,7 @@ int main(int argc, char **argv)
         elm_shutdown();
 
         //Terminate ThorVG Engine
-        tvg::Initializer::term(tvgEngine);
+        tvg::Initializer::term();
 
     } else {
         cout << "engine is not supported" << endl;

src/examples/PathCopy.cpp

@@ -172,25 +172,18 @@ void drawGLview(Evas_Object *obj)
 
 int main(int argc, char **argv)
 {
-    tvg::CanvasEngine tvgEngine = tvg::CanvasEngine::Sw;
+    auto tvgEngine = tvg::CanvasEngine::Sw;
 
     if (argc > 1) {
         if (!strcmp(argv[1], "gl")) tvgEngine = tvg::CanvasEngine::Gl;
     }
 
-    //Initialize ThorVG Engine
-    if (tvgEngine == tvg::CanvasEngine::Sw) {
-        cout << "tvg engine: software" << endl;
-    } else {
-        cout << "tvg engine: opengl" << endl;
-    }
-
     //Threads Count
     auto threads = std::thread::hardware_concurrency();
     if (threads > 0) --threads;    //Allow the designated main thread capacity
 
     //Initialize ThorVG Engine
-    if (tvg::Initializer::init(tvgEngine, threads) == tvg::Result::Success) {
+    if (tvg::Initializer::init(threads) == tvg::Result::Success) {
 
         elm_init(argc, argv);
 
@@ -204,7 +197,7 @@ int main(int argc, char **argv)
         elm_shutdown();
 
         //Terminate ThorVG Engine
-        tvg::Initializer::term(tvgEngine);
+        tvg::Initializer::term();
 
     } else {
         cout << "engine is not supported" << endl;

src/examples/Performance.cpp

@@ -159,21 +159,18 @@ void transitGlCb(Elm_Transit_Effect *effect, Elm_Transit* transit, double progre
 
 int main(int argc, char **argv)
 {
-    tvg::CanvasEngine tvgEngine = tvg::CanvasEngine::Sw;
+    auto tvgEngine = tvg::CanvasEngine::Sw;
 
     if (argc > 1) {
         if (!strcmp(argv[1], "gl")) tvgEngine = tvg::CanvasEngine::Gl;
     }
 
-    //Initialize ThorVG Engine
+    //Threads Count
-    if (tvgEngine == tvg::CanvasEngine::Sw) {
+    auto threads = std::thread::hardware_concurrency();
-        cout << "tvg engine: software" << endl;
+    if (threads > 0) --threads;    //Allow the designated main thread capacity
-    } else {
-        cout << "tvg engine: opengl" << endl;
-    }
 
     //Initialize ThorVG Engine
-    if (tvg::Initializer::init(tvgEngine, 0) == tvg::Result::Success) {
+    if (tvg::Initializer::init(threads) == tvg::Result::Success) {
 
         elm_init(argc, argv);
 
@@ -196,7 +193,7 @@ int main(int argc, char **argv)
         elm_shutdown();
 
         //Terminate ThorVG Engine
-        tvg::Initializer::term(tvgEngine);
+        tvg::Initializer::term();
 
     } else {
         cout << "engine is not supported" << endl;

src/examples/PictureJpg.cpp

@@ -138,24 +138,18 @@ void drawGLview(Evas_Object *obj)
 
 int main(int argc, char **argv)
 {
-    tvg::CanvasEngine tvgEngine = tvg::CanvasEngine::Sw;
+    auto tvgEngine = tvg::CanvasEngine::Sw;
 
     if (argc > 1) {
         if (!strcmp(argv[1], "gl")) tvgEngine = tvg::CanvasEngine::Gl;
     }
 
-    //Initialize ThorVG Engine
-    if (tvgEngine == tvg::CanvasEngine::Sw) {
-        cout << "tvg engine: software" << endl;
-    } else {
-        cout << "tvg engine: opengl" << endl;
-    }
-
     //Threads Count
     auto threads = std::thread::hardware_concurrency();
+    if (threads > 0) --threads;    //Allow the designated main thread capacity
 
     //Initialize ThorVG Engine
-    if (tvg::Initializer::init(tvgEngine, threads) == tvg::Result::Success) {
+    if (tvg::Initializer::init(threads) == tvg::Result::Success) {
 
         elm_init(argc, argv);
 
@@ -169,7 +163,7 @@ int main(int argc, char **argv)
         elm_shutdown();
 
         //Terminate ThorVG Engine
-        tvg::Initializer::term(tvgEngine);
+        tvg::Initializer::term();
 
 
     } else {

src/examples/PicturePng.cpp

@@ -144,24 +144,18 @@ void drawGLview(Evas_Object *obj)
 
 int main(int argc, char **argv)
 {
-    tvg::CanvasEngine tvgEngine = tvg::CanvasEngine::Sw;
+    auto tvgEngine = tvg::CanvasEngine::Sw;
 
     if (argc > 1) {
         if (!strcmp(argv[1], "gl")) tvgEngine = tvg::CanvasEngine::Gl;
     }
 
-    //Initialize ThorVG Engine
-    if (tvgEngine == tvg::CanvasEngine::Sw) {
-        cout << "tvg engine: software" << endl;
-    } else {
-        cout << "tvg engine: opengl" << endl;
-    }
-
     //Threads Count
     auto threads = std::thread::hardware_concurrency();
+    if (threads > 0) --threads;    //Allow the designated main thread capacity
 
     //Initialize ThorVG Engine
-    if (tvg::Initializer::init(tvgEngine, threads) == tvg::Result::Success) {
+    if (tvg::Initializer::init(threads) == tvg::Result::Success) {
 
         elm_init(argc, argv);
 
@@ -175,7 +169,7 @@ int main(int argc, char **argv)
         elm_shutdown();
 
         //Terminate ThorVG Engine
-        tvg::Initializer::term(tvgEngine);
+        tvg::Initializer::term();
 
 
     } else {

src/examples/PictureRaw.cpp

@@ -136,25 +136,18 @@ void drawGLview(Evas_Object *obj)
 
 int main(int argc, char **argv)
 {
-    tvg::CanvasEngine tvgEngine = tvg::CanvasEngine::Sw;
+    auto tvgEngine = tvg::CanvasEngine::Sw;
 
     if (argc > 1) {
         if (!strcmp(argv[1], "gl")) tvgEngine = tvg::CanvasEngine::Gl;
     }
 
-    //Initialize ThorVG Engine
-    if (tvgEngine == tvg::CanvasEngine::Sw) {
-        cout << "tvg engine: software" << endl;
-    } else {
-        cout << "tvg engine: opengl" << endl;
-    }
-
     //Threads Count
     auto threads = std::thread::hardware_concurrency();
     if (threads > 0) --threads;    //Allow the designated main thread capacity
 
     //Initialize ThorVG Engine
-    if (tvg::Initializer::init(tvgEngine, threads) == tvg::Result::Success) {
+    if (tvg::Initializer::init(threads) == tvg::Result::Success) {
 
         elm_init(argc, argv);
 
@@ -168,7 +161,7 @@ int main(int argc, char **argv)
         elm_shutdown();
 
         //Terminate ThorVG Engine
-        tvg::Initializer::term(tvgEngine);
+        tvg::Initializer::term();
 
     } else {
         cout << "engine is not supported" << endl;

src/examples/PictureTvg.cpp

@@ -115,24 +115,18 @@ void drawGLview(Evas_Object *obj)
 
 int main(int argc, char **argv)
 {
-    tvg::CanvasEngine tvgEngine = tvg::CanvasEngine::Sw;
+    auto tvgEngine = tvg::CanvasEngine::Sw;
 
     if (argc > 1) {
         if (!strcmp(argv[1], "gl")) tvgEngine = tvg::CanvasEngine::Gl;
     }
 
-    //Initialize ThorVG Engine
-    if (tvgEngine == tvg::CanvasEngine::Sw) {
-        cout << "tvg engine: software" << endl;
-    } else {
-        cout << "tvg engine: opengl" << endl;
-    }
-
     //Threads Count
     auto threads = std::thread::hardware_concurrency();
+    if (threads > 0) --threads;    //Allow the designated main thread capacity
 
     //Initialize ThorVG Engine
-    if (tvg::Initializer::init(tvgEngine, threads) == tvg::Result::Success) {
+    if (tvg::Initializer::init(threads) == tvg::Result::Success) {
 
         elm_init(argc, argv);
 
@@ -146,7 +140,7 @@ int main(int argc, char **argv)
         elm_shutdown();
 
         //Terminate ThorVG Engine
-        tvg::Initializer::term(tvgEngine);
+        tvg::Initializer::term();
 
     } else {
         cout << "engine is not supported" << endl;

src/examples/PictureWebp.cpp

@@ -145,24 +145,18 @@ void drawGLview(Evas_Object *obj)
 
 int main(int argc, char **argv)
 {
-    tvg::CanvasEngine tvgEngine = tvg::CanvasEngine::Sw;
+    auto tvgEngine = tvg::CanvasEngine::Sw;
 
     if (argc > 1) {
         if (!strcmp(argv[1], "gl")) tvgEngine = tvg::CanvasEngine::Gl;
     }
 
-    //Initialize ThorVG Engine
-    if (tvgEngine == tvg::CanvasEngine::Sw) {
-        cout << "tvg engine: software" << endl;
-    } else {
-        cout << "tvg engine: opengl" << endl;
-    }
-
     //Threads Count
     auto threads = std::thread::hardware_concurrency();
+    if (threads > 0) --threads;    //Allow the designated main thread capacity
 
     //Initialize ThorVG Engine
-    if (tvg::Initializer::init(tvgEngine, threads) == tvg::Result::Success) {
+    if (tvg::Initializer::init(threads) == tvg::Result::Success) {
 
         elm_init(argc, argv);
 
@@ -176,7 +170,7 @@ int main(int argc, char **argv)
         elm_shutdown();
 
         //Terminate ThorVG Engine
-        tvg::Initializer::term(tvgEngine);
+        tvg::Initializer::term();
 
 
     } else {

src/examples/RadialGradient.cpp

@@ -156,25 +156,18 @@ void drawGLview(Evas_Object *obj)
 
 int main(int argc, char **argv)
 {
-    tvg::CanvasEngine tvgEngine = tvg::CanvasEngine::Sw;
+    auto tvgEngine = tvg::CanvasEngine::Sw;
 
     if (argc > 1) {
         if (!strcmp(argv[1], "gl")) tvgEngine = tvg::CanvasEngine::Gl;
     }
 
-    //Initialize ThorVG Engine
-    if (tvgEngine == tvg::CanvasEngine::Sw) {
-        cout << "tvg engine: software" << endl;
-    } else {
-        cout << "tvg engine: opengl" << endl;
-    }
-
     //Threads Count
     auto threads = std::thread::hardware_concurrency();
     if (threads > 0) --threads;    //Allow the designated main thread capacity
 
     //Initialize ThorVG Engine
-    if (tvg::Initializer::init(tvgEngine, threads) == tvg::Result::Success) {
+    if (tvg::Initializer::init(threads) == tvg::Result::Success) {
 
         elm_init(argc, argv);
 
@@ -188,7 +181,7 @@ int main(int argc, char **argv)
         elm_shutdown();
 
         //Terminate ThorVG Engine
-        tvg::Initializer::term(tvgEngine);
+        tvg::Initializer::term();
 
     } else {
         cout << "engine is not supported" << endl;

src/examples/Retaining.cpp

@@ -167,25 +167,18 @@ Eina_Bool timerGlCb(void *data)
 
 int main(int argc, char **argv)
 {
-    tvg::CanvasEngine tvgEngine = tvg::CanvasEngine::Sw;
+    auto tvgEngine = tvg::CanvasEngine::Sw;
 
     if (argc > 1) {
         if (!strcmp(argv[1], "gl")) tvgEngine = tvg::CanvasEngine::Gl;
     }
 
-    //Initialize ThorVG Engine
-    if (tvgEngine == tvg::CanvasEngine::Sw) {
-        cout << "tvg engine: software" << endl;
-    } else {
-        cout << "tvg engine: opengl" << endl;
-    }
-
     //Threads Count
     auto threads = std::thread::hardware_concurrency();
     if (threads > 0) --threads;    //Allow the designated main thread capacity
 
     //Initialize ThorVG Engine
-    if (tvg::Initializer::init(tvgEngine, threads) == tvg::Result::Success) {
+    if (tvg::Initializer::init(threads) == tvg::Result::Success) {
 
         elm_init(argc, argv);
 
@@ -201,7 +194,7 @@ int main(int argc, char **argv)
         elm_shutdown();
 
         //Terminate ThorVG Engine
-        tvg::Initializer::term(tvgEngine);
+        tvg::Initializer::term();
 
     } else {
         cout << "engine is not supported" << endl;

src/examples/Scene.cpp

@@ -163,25 +163,18 @@ void drawGLview(Evas_Object *obj)
 
 int main(int argc, char **argv)
 {
-    tvg::CanvasEngine tvgEngine = tvg::CanvasEngine::Sw;
+    auto tvgEngine = tvg::CanvasEngine::Sw;
 
     if (argc > 1) {
         if (!strcmp(argv[1], "gl")) tvgEngine = tvg::CanvasEngine::Gl;
     }
 
-    //Initialize ThorVG Engine
-    if (tvgEngine == tvg::CanvasEngine::Sw) {
-        cout << "tvg engine: software" << endl;
-    } else {
-        cout << "tvg engine: opengl" << endl;
-    }
-
     //Threads Count
     auto threads = std::thread::hardware_concurrency();
     if (threads > 0) --threads;    //Allow the designated main thread capacity
 
     //Initialize ThorVG Engine
-    if (tvg::Initializer::init(tvgEngine, threads) == tvg::Result::Success) {
+    if (tvg::Initializer::init(threads) == tvg::Result::Success) {
 
 
         elm_init(argc, argv);
@@ -196,7 +189,7 @@ int main(int argc, char **argv)
         elm_shutdown();
 
         //Terminate ThorVG Engine
-        tvg::Initializer::term(tvgEngine);
+        tvg::Initializer::term();
 
     } else {
         cout << "engine is not supported" << endl;

src/examples/SceneBlending.cpp

@@ -178,25 +178,18 @@ void drawGLview(Evas_Object *obj)
 
 int main(int argc, char **argv)
 {
-    tvg::CanvasEngine tvgEngine = tvg::CanvasEngine::Sw;
+    auto tvgEngine = tvg::CanvasEngine::Sw;
 
     if (argc > 1) {
         if (!strcmp(argv[1], "gl")) tvgEngine = tvg::CanvasEngine::Gl;
     }
 
-    //Initialize ThorVG Engine
-    if (tvgEngine == tvg::CanvasEngine::Sw) {
-        cout << "tvg engine: software" << endl;
-    } else {
-        cout << "tvg engine: opengl" << endl;
-    }
-
     //Threads Count
     auto threads = std::thread::hardware_concurrency();
     if (threads > 0) --threads;    //Allow the designated main thread capacity
 
     //Initialize ThorVG Engine
-    if (tvg::Initializer::init(tvgEngine, threads) == tvg::Result::Success) {
+    if (tvg::Initializer::init(threads) == tvg::Result::Success) {
 
 
         elm_init(argc, argv);
@@ -211,7 +204,7 @@ int main(int argc, char **argv)
         elm_shutdown();
 
         //Terminate ThorVG Engine
-        tvg::Initializer::term(tvgEngine);
+        tvg::Initializer::term();
 
     } else {
         cout << "engine is not supported" << endl;

src/examples/SceneClipper.cpp

@@ -141,25 +141,18 @@ void drawGLview(Evas_Object *obj)
 
 int main(int argc, char **argv)
 {
-    tvg::CanvasEngine tvgEngine = tvg::CanvasEngine::Sw;
+    auto tvgEngine = tvg::CanvasEngine::Sw;
 
     if (argc > 1) {
         if (!strcmp(argv[1], "gl")) tvgEngine = tvg::CanvasEngine::Gl;
     }
 
-    //Initialize ThorVG Engine
-    if (tvgEngine == tvg::CanvasEngine::Sw) {
-        cout << "tvg engine: software" << endl;
-    } else {
-        cout << "tvg engine: opengl" << endl;
-    }
-
     //Threads Count
     auto threads = std::thread::hardware_concurrency();
     if (threads > 0) --threads;    //Allow the designated main thread capacity
 
     //Initialize ThorVG Engine
-    if (tvg::Initializer::init(tvgEngine, threads) == tvg::Result::Success) {
+    if (tvg::Initializer::init(threads) == tvg::Result::Success) {
 
         elm_init(argc, argv);
 
@@ -173,7 +166,7 @@ int main(int argc, char **argv)
         elm_shutdown();
 
         //Terminate ThorVG Engine
-        tvg::Initializer::term(tvgEngine);
+        tvg::Initializer::term();
 
     } else {
         cout << "engine is not supported" << endl;

src/examples/SceneTransform.cpp

@@ -193,25 +193,18 @@ void transitGlCb(Elm_Transit_Effect *effect, Elm_Transit* transit, double progre
 
 int main(int argc, char **argv)
 {
-    tvg::CanvasEngine tvgEngine = tvg::CanvasEngine::Sw;
+    auto tvgEngine = tvg::CanvasEngine::Sw;
 
     if (argc > 1) {
         if (!strcmp(argv[1], "gl")) tvgEngine = tvg::CanvasEngine::Gl;
     }
 
-    //Initialize ThorVG Engine
-    if (tvgEngine == tvg::CanvasEngine::Sw) {
-        cout << "tvg engine: software" << endl;
-    } else {
-        cout << "tvg engine: opengl" << endl;
-    }
-
     //Threads Count
     auto threads = std::thread::hardware_concurrency();
     if (threads > 0) --threads;    //Allow the designated main thread capacity
 
     //Initialize ThorVG Engine
-    if (tvg::Initializer::init(tvgEngine, threads) == tvg::Result::Success) {
+    if (tvg::Initializer::init(threads) == tvg::Result::Success) {
 
         elm_init(argc, argv);
 
@@ -234,7 +227,7 @@ int main(int argc, char **argv)
         elm_shutdown();
 
         //Terminate ThorVG Engine
-        tvg::Initializer::term(tvgEngine);
+        tvg::Initializer::term();
 
     } else {
         cout << "engine is not supported" << endl;

src/examples/Shape.cpp

@@ -108,25 +108,18 @@ void drawGLview(Evas_Object *obj)
 
 int main(int argc, char **argv)
 {
-    tvg::CanvasEngine tvgEngine = tvg::CanvasEngine::Sw;
+    auto tvgEngine = tvg::CanvasEngine::Sw;
 
     if (argc > 1) {
         if (!strcmp(argv[1], "gl")) tvgEngine = tvg::CanvasEngine::Gl;
     }
 
-    //Initialize ThorVG Engine
-    if (tvgEngine == tvg::CanvasEngine::Sw) {
-        cout << "tvg engine: software" << endl;
-    } else {
-        cout << "tvg engine: opengl" << endl;
-    }
-
     //Threads Count
     auto threads = std::thread::hardware_concurrency();
     if (threads > 0) --threads;    //Allow the designated main thread capacity
 
     //Initialize ThorVG Engine
-    if (tvg::Initializer::init(tvgEngine, threads) == tvg::Result::Success) {
+    if (tvg::Initializer::init(threads) == tvg::Result::Success) {
 
         elm_init(argc, argv);
 
@@ -140,7 +133,7 @@ int main(int argc, char **argv)
         elm_shutdown();
 
         //Terminate ThorVG Engine
-        tvg::Initializer::term(tvgEngine);
+        tvg::Initializer::term();
 
     } else {
         cout << "engine is not supported" << endl;

src/examples/Stroke.cpp

@@ -194,25 +194,18 @@ void drawGLview(Evas_Object *obj)
 
 int main(int argc, char **argv)
 {
-    tvg::CanvasEngine tvgEngine = tvg::CanvasEngine::Sw;
+    auto tvgEngine = tvg::CanvasEngine::Sw;
 
     if (argc > 1) {
         if (!strcmp(argv[1], "gl")) tvgEngine = tvg::CanvasEngine::Gl;
     }
 
-    //Initialize ThorVG Engine
-    if (tvgEngine == tvg::CanvasEngine::Sw) {
-        cout << "tvg engine: software" << endl;
-    } else {
-        cout << "tvg engine: opengl" << endl;
-    }
-
     //Threads Count
     auto threads = std::thread::hardware_concurrency();
     if (threads > 0) --threads;    //Allow the designated main thread capacity
 
     //Initialize ThorVG Engine
-    if (tvg::Initializer::init(tvgEngine, threads) == tvg::Result::Success) {
+    if (tvg::Initializer::init(threads) == tvg::Result::Success) {
 
         elm_init(argc, argv);
 
@@ -226,7 +219,7 @@ int main(int argc, char **argv)
         elm_shutdown();
 
         //Terminate ThorVG Engine
-        tvg::Initializer::term(tvgEngine);
+        tvg::Initializer::term();
 
     } else {
         cout << "engine is not supported" << endl;

src/examples/StrokeLine.cpp

@@ -240,25 +240,18 @@ void drawGLview(Evas_Object *obj)
 
 int main(int argc, char **argv)
 {
-    tvg::CanvasEngine tvgEngine = tvg::CanvasEngine::Sw;
+    auto tvgEngine = tvg::CanvasEngine::Sw;
 
     if (argc > 1) {
         if (!strcmp(argv[1], "gl")) tvgEngine = tvg::CanvasEngine::Gl;
     }
 
-    //Initialize ThorVG Engine
-    if (tvgEngine == tvg::CanvasEngine::Sw) {
-        cout << "tvg engine: software" << endl;
-    } else {
-        cout << "tvg engine: opengl" << endl;
-    }
-
     //Threads Count
     auto threads = std::thread::hardware_concurrency();
     if (threads > 0) --threads;    //Allow the designated main thread capacity
 
     //Initialize ThorVG Engine
-    if (tvg::Initializer::init(tvgEngine, threads) == tvg::Result::Success) {
+    if (tvg::Initializer::init(threads) == tvg::Result::Success) {
 
 
         elm_init(argc, argv);
@@ -273,7 +266,7 @@ int main(int argc, char **argv)
         elm_shutdown();
 
         //Terminate ThorVG Engine
-        tvg::Initializer::term(tvgEngine);
+        tvg::Initializer::term();
 
     } else {
         cout << "engine is not supported" << endl;

src/examples/StrokeMiterlimit.cpp

@@ -229,24 +229,18 @@ void drawGLview(Evas_Object *obj)
 
 int main(int argc, char **argv)
 {
-    tvg::CanvasEngine tvgEngine = tvg::CanvasEngine::Sw;
+    auto tvgEngine = tvg::CanvasEngine::Sw;
 
     if (argc > 1) {
         if (!strcmp(argv[1], "gl")) tvgEngine = tvg::CanvasEngine::Gl;
     }
 
-    //Initialize ThorVG Engine
-    if (tvgEngine == tvg::CanvasEngine::Sw) {
-        cout << "tvg engine: software" << endl;
-    } else {
-        cout << "tvg engine: opengl" << endl;
-    }
-
     //Threads Count
     auto threads = std::thread::hardware_concurrency();
+    if (threads > 0) --threads;    //Allow the designated main thread capacity
 
     //Initialize ThorVG Engine
-    if (tvg::Initializer::init(tvgEngine, threads) == tvg::Result::Success) {
+    if (tvg::Initializer::init(threads) == tvg::Result::Success) {
 
         elm_init(argc, argv);
 
@@ -260,7 +254,7 @@ int main(int argc, char **argv)
         elm_shutdown();
 
         //Terminate ThorVG Engine
-        tvg::Initializer::term(tvgEngine);
+        tvg::Initializer::term();
 
 
     } else {

src/examples/Svg.cpp

@@ -165,25 +165,18 @@ void drawGLview(Evas_Object *obj)
 
 int main(int argc, char **argv)
 {
-    tvg::CanvasEngine tvgEngine = tvg::CanvasEngine::Sw;
+    auto tvgEngine = tvg::CanvasEngine::Sw;
 
     if (argc > 1) {
         if (!strcmp(argv[1], "gl")) tvgEngine = tvg::CanvasEngine::Gl;
     }
 
-    //Initialize ThorVG Engine
-    if (tvgEngine == tvg::CanvasEngine::Sw) {
-        cout << "tvg engine: software" << endl;
-    } else {
-        cout << "tvg engine: opengl" << endl;
-    }
-
     //Threads Count
     auto threads = std::thread::hardware_concurrency();
     if (threads > 0) --threads;    //Allow the designated main thread capacity
 
     //Initialize ThorVG Engine
-    if (tvg::Initializer::init(tvgEngine, threads) == tvg::Result::Success) {
+    if (tvg::Initializer::init(threads) == tvg::Result::Success) {
 
         elm_init(argc, argv);
 
@@ -197,7 +190,7 @@ int main(int argc, char **argv)
         elm_shutdown();
 
         //Terminate ThorVG Engine
-        tvg::Initializer::term(tvgEngine);
+        tvg::Initializer::term();
 
     } else {
         cout << "engine is not supported" << endl;

src/examples/Svg2.cpp

@@ -115,25 +115,18 @@ void drawGLview(Evas_Object *obj)
 
 int main(int argc, char **argv)
 {
-    tvg::CanvasEngine tvgEngine = tvg::CanvasEngine::Sw;
+    auto tvgEngine = tvg::CanvasEngine::Sw;
 
     if (argc > 1) {
         if (!strcmp(argv[1], "gl")) tvgEngine = tvg::CanvasEngine::Gl;
     }
 
-    //Initialize ThorVG Engine
-    if (tvgEngine == tvg::CanvasEngine::Sw) {
-        cout << "tvg engine: software" << endl;
-    } else {
-        cout << "tvg engine: opengl" << endl;
-    }
-
     //Threads Count
     auto threads = std::thread::hardware_concurrency();
     if (threads > 0) --threads;    //Allow the designated main thread capacity
 
     //Initialize ThorVG Engine
-    if (tvg::Initializer::init(tvgEngine, threads) == tvg::Result::Success) {
+    if (tvg::Initializer::init(threads) == tvg::Result::Success) {
 
         elm_init(argc, argv);
 
@@ -147,7 +140,7 @@ int main(int argc, char **argv)
         elm_shutdown();
 
         //Terminate ThorVG Engine
-        tvg::Initializer::term(tvgEngine);
+        tvg::Initializer::term();
 
     } else {
         cout << "engine is not supported" << endl;

src/examples/Texmap.cpp

@@ -155,25 +155,18 @@ void drawGLview(Evas_Object *obj)
 
 int main(int argc, char **argv)
 {
-    tvg::CanvasEngine tvgEngine = tvg::CanvasEngine::Sw;
+    auto tvgEngine = tvg::CanvasEngine::Sw;
 
     if (argc > 1) {
         if (!strcmp(argv[1], "gl")) tvgEngine = tvg::CanvasEngine::Gl;
     }
 
-    //Initialize ThorVG Engine
-    if (tvgEngine == tvg::CanvasEngine::Sw) {
-        cout << "tvg engine: software" << endl;
-    } else {
-        cout << "tvg engine: opengl" << endl;
-    }
-
     //Threads Count
     auto threads = std::thread::hardware_concurrency();
     if (threads > 0) --threads;    //Allow the designated main thread capacity
 
     //Initialize ThorVG Engine
-    if (tvg::Initializer::init(tvgEngine, threads) == tvg::Result::Success) {
+    if (tvg::Initializer::init(threads) == tvg::Result::Success) {
 
         elm_init(argc, argv);
 
@@ -187,7 +180,7 @@ int main(int argc, char **argv)
         elm_shutdown();
 
         //Terminate ThorVG Engine
-        tvg::Initializer::term(tvgEngine);
+        tvg::Initializer::term();
 
     } else {
         cout << "engine is not supported" << endl;

src/examples/Transform.cpp

@@ -150,25 +150,18 @@ void transitGlCb(Elm_Transit_Effect *effect, Elm_Transit* transit, double progre
 
 int main(int argc, char **argv)
 {
-    tvg::CanvasEngine tvgEngine = tvg::CanvasEngine::Sw;
+    auto tvgEngine = tvg::CanvasEngine::Sw;
 
     if (argc > 1) {
         if (!strcmp(argv[1], "gl")) tvgEngine = tvg::CanvasEngine::Gl;
     }
 
-    //Initialize ThorVG Engine
-    if (tvgEngine == tvg::CanvasEngine::Sw) {
-        cout << "tvg engine: software" << endl;
-    } else {
-        cout << "tvg engine: opengl" << endl;
-    }
-
     //Threads Count
     auto threads = std::thread::hardware_concurrency();
     if (threads > 0) --threads;    //Allow the designated main thread capacity
 
     //Initialize ThorVG Engine
-    if (tvg::Initializer::init(tvgEngine, threads) == tvg::Result::Success) {
+    if (tvg::Initializer::init(threads) == tvg::Result::Success) {
 
         elm_init(argc, argv);
 
@@ -191,7 +184,7 @@ int main(int argc, char **argv)
         elm_shutdown();
 
         //Terminate ThorVG Engine
-        tvg::Initializer::term(tvgEngine);
+        tvg::Initializer::term();
 
     } else {
         cout << "engine is not supported" << endl;

src/examples/Tvg.cpp

@@ -151,25 +151,18 @@ void drawGLview(Evas_Object *obj)
 
 int main(int argc, char **argv)
 {
-    tvg::CanvasEngine tvgEngine = tvg::CanvasEngine::Sw;
+    auto tvgEngine = tvg::CanvasEngine::Sw;
 
     if (argc > 1) {
         if (!strcmp(argv[1], "gl")) tvgEngine = tvg::CanvasEngine::Gl;
     }
 
-    //Initialize ThorVG Engine
-    if (tvgEngine == tvg::CanvasEngine::Sw) {
-        cout << "tvg engine: software" << endl;
-    } else {
-        cout << "tvg engine: opengl" << endl;
-    }
-
     //Threads Count
     auto threads = std::thread::hardware_concurrency();
     if (threads > 0) --threads;    //Allow the designated main thread capacity
 
     //Initialize ThorVG Engine
-    if (tvg::Initializer::init(tvgEngine, threads) == tvg::Result::Success) {
+    if (tvg::Initializer::init(threads) == tvg::Result::Success) {
 
         elm_init(argc, argv);
 
@@ -183,7 +176,7 @@ int main(int argc, char **argv)
         elm_shutdown();
 
         //Terminate ThorVG Engine
-        tvg::Initializer::term(tvgEngine);
+        tvg::Initializer::term();
 
     } else {
         cout << "engine is not supported" << endl;

src/examples/TvgSaver.cpp

@@ -266,29 +266,17 @@ void exportTvg()
 
 int main(int argc, char **argv)
 {
-    tvg::CanvasEngine tvgEngine = tvg::CanvasEngine::Sw;
-
-    if (argc > 1) {
-        if (!strcmp(argv[1], "gl")) tvgEngine = tvg::CanvasEngine::Gl;
-    }
-
-    //Initialize ThorVG Engine
-    if (tvgEngine == tvg::CanvasEngine::Sw) {
-        cout << "tvg engine: software" << endl;
-    } else {
-        cout << "tvg engine: opengl" << endl;
-    }
-
     //Threads Count
     auto threads = std::thread::hardware_concurrency();
+    if (threads > 0) --threads;    //Allow the designated main thread capacity
 
     //Initialize ThorVG Engine
-    if (tvg::Initializer::init(tvgEngine, threads) == tvg::Result::Success) {
+    if (tvg::Initializer::init(threads) == tvg::Result::Success) {
 
         exportTvg();
 
         //Terminate ThorVG Engine
-        tvg::Initializer::term(tvgEngine);
+        tvg::Initializer::term();
 
     } else {
         cout << "engine is not supported" << endl;

src/examples/Update.cpp

@@ -138,25 +138,18 @@ void transitGlCb(Elm_Transit_Effect *effect, Elm_Transit* transit, double progre
 
 int main(int argc, char **argv)
 {
-    tvg::CanvasEngine tvgEngine = tvg::CanvasEngine::Sw;
+    auto tvgEngine = tvg::CanvasEngine::Sw;
 
     if (argc > 1) {
         if (!strcmp(argv[1], "gl")) tvgEngine = tvg::CanvasEngine::Gl;
     }
 
-    //Initialize ThorVG Engine
-    if (tvgEngine == tvg::CanvasEngine::Sw) {
-        cout << "tvg engine: software" << endl;
-    } else {
-        cout << "tvg engine: opengl" << endl;
-    }
-
     //Threads Count
     auto threads = std::thread::hardware_concurrency();
     if (threads > 0) --threads;    //Allow the designated main thread capacity
 
     //Initialize ThorVG Engine
-    if (tvg::Initializer::init(tvgEngine, threads) == tvg::Result::Success) {
+    if (tvg::Initializer::init(threads) == tvg::Result::Success) {
 
         elm_init(argc, argv);
 
@@ -179,7 +172,7 @@ int main(int argc, char **argv)
         elm_shutdown();
 
         //Terminate ThorVG Engine
-        tvg::Initializer::term(tvgEngine);
+        tvg::Initializer::term();
 
     } else {
         cout << "engine is not supported" << endl;

src/renderer/tvgInitializer.cpp

@@ -92,26 +92,25 @@ static bool _buildVersionInfo()
 /* External Class Implementation                                        */
 /************************************************************************/
 
-Result Initializer::init(CanvasEngine engine, uint32_t threads) noexcept
+Result Initializer::init(uint32_t threads, CanvasEngine engine) noexcept
 {
     auto nonSupport = true;
-    if (static_cast<int>(engine) == 0) return Result::InvalidArguments;
 
-    if (engine & CanvasEngine::Sw) {
+    if (engine == CanvasEngine::All || engine & CanvasEngine::Sw) {
         #ifdef THORVG_SW_RASTER_SUPPORT
             if (!SwRenderer::init(threads)) return Result::FailedAllocation;
             nonSupport = false;
         #endif
     }
 
-    if (engine & CanvasEngine::Gl) {
+    if (engine == CanvasEngine::All || engine & CanvasEngine::Gl) {
         #ifdef THORVG_GL_RASTER_SUPPORT
             if (!GlRenderer::init(threads)) return Result::FailedAllocation;
             nonSupport = false;
         #endif
     }
 
-    if (engine & CanvasEngine::Wg) {
+    if (engine == CanvasEngine::All || engine & CanvasEngine::Wg) {
         #ifdef THORVG_WG_RASTER_SUPPORT
             if (!WgRenderer::init(threads)) return Result::FailedAllocation;
             nonSupport = false;
@@ -137,23 +136,22 @@ Result Initializer::term(CanvasEngine engine) noexcept
     if (_initCnt == 0) return Result::InsufficientCondition;
 
     auto nonSupport = true;
-    if (static_cast<int>(engine) == 0) return Result::InvalidArguments;
 
-    if (engine & CanvasEngine::Sw) {
+    if (engine == CanvasEngine::All || engine & CanvasEngine::Sw) {
         #ifdef THORVG_SW_RASTER_SUPPORT
             if (!SwRenderer::term()) return Result::InsufficientCondition;
             nonSupport = false;
         #endif
     }
 
-    if (engine & CanvasEngine::Gl) {
+    if (engine == CanvasEngine::All || engine & CanvasEngine::Gl) {
         #ifdef THORVG_GL_RASTER_SUPPORT
             if (!GlRenderer::term()) return Result::InsufficientCondition;
             nonSupport = false;
         #endif
     }
 
-    if (engine & CanvasEngine::Wg) {
+    if (engine == CanvasEngine::All || engine & CanvasEngine::Wg) {
         #ifdef THORVG_WG_RASTER_SUPPORT
             if (!WgRenderer::term()) return Result::InsufficientCondition;
             nonSupport = false;

src/tools/svg2png/svg2png.cpp

@@ -169,14 +169,12 @@ public:
 private:
     void createCanvas()
     {
-        //Canvas Engine
-        tvg::CanvasEngine tvgEngine = tvg::CanvasEngine::Sw;
-
         //Threads Count
         auto threads = thread::hardware_concurrency();
+        if (threads > 0) --threads; 
 
         //Initialize ThorVG Engine
-        if (tvg::Initializer::init(tvgEngine, threads) != tvg::Result::Success) {
+        if (tvg::Initializer::init(threads, tvg::CanvasEngine::Sw) != tvg::Result::Success) {
             cout << "Error: Engine is not supported" << endl;
         }
 

src/tools/svg2tvg/svg2tvg.cpp

@@ -22,6 +22,7 @@
 
 #include <iostream>
 #include <vector>
+#include <thread>
 #include <thorvg.h>
 #ifdef _WIN32
     #include <windows.h>
@@ -62,7 +63,11 @@ private:
 
    bool convert(string& in, string& out)
    {
-      if (Initializer::init(CanvasEngine::Sw, 0) != Result::Success) return false;
+       //Threads Count
+      auto threads = std::thread::hardware_concurrency();
+      if (threads > 0) --threads;    //Allow the designated main thread capacity
+
+      if (Initializer::init(threads, CanvasEngine::Sw) != Result::Success) return false;
 
       auto picture = Picture::gen();
       if (picture->load(in) != Result::Success) return false;

test/testAccessor.cpp

@@ -39,7 +39,7 @@ TEST_CASE("Accessor Creation", "[tvgAccessor]")
 
 TEST_CASE("Set", "[tvgAccessor]")
 {
-    REQUIRE(Initializer::init(CanvasEngine::Sw, 0) == Result::Success);
+    REQUIRE(Initializer::init(0) == Result::Success);
 
     auto canvas = SwCanvas::gen();
     REQUIRE(canvas);
@@ -74,7 +74,7 @@ TEST_CASE("Set", "[tvgAccessor]")
     picture = accessor->set(std::move(picture), f);
     REQUIRE(picture);
 
-    REQUIRE(Initializer::term(CanvasEngine::Sw) == Result::Success);
+    REQUIRE(Initializer::term() == Result::Success);
 }
 
 #endif

test/testAnimation.cpp

@@ -49,7 +49,7 @@ TEST_CASE("Animation Basic", "[tvgAnimation]")
 
 TEST_CASE("Animation Lottie", "[tvgAnimation]")
 {
-    REQUIRE(Initializer::init(CanvasEngine::Sw, 1) == Result::Success);
+    REQUIRE(Initializer::init(1) == Result::Success);
 
     auto animation = Animation::gen();
     REQUIRE(animation);
@@ -65,12 +65,12 @@ TEST_CASE("Animation Lottie", "[tvgAnimation]")
     REQUIRE(animation->duration() == Approx(4).margin(004004));
     REQUIRE(animation->frame(20) == Result::Success);
 
-    REQUIRE(Initializer::term(CanvasEngine::Sw) == Result::Success);
+    REQUIRE(Initializer::term() == Result::Success);
 }
 
 TEST_CASE("Animation Lottie2", "[tvgAnimation]")
 {
-    REQUIRE(Initializer::init(CanvasEngine::Sw, 0) == Result::Success);
+    REQUIRE(Initializer::init(0) == Result::Success);
 
     auto animation = Animation::gen();
     REQUIRE(animation);
@@ -82,12 +82,12 @@ TEST_CASE("Animation Lottie2", "[tvgAnimation]")
 
     REQUIRE(animation->frame(20) == Result::Success);
 
-    REQUIRE(Initializer::term(CanvasEngine::Sw) == Result::Success);
+    REQUIRE(Initializer::term() == Result::Success);
 }
 
 TEST_CASE("Animation Lottie3", "[tvgAnimation]")
 {
-    REQUIRE(Initializer::init(CanvasEngine::Sw, 0) == Result::Success);
+    REQUIRE(Initializer::init(0) == Result::Success);
 
     auto animation = Animation::gen();
     REQUIRE(animation);
@@ -97,12 +97,12 @@ TEST_CASE("Animation Lottie3", "[tvgAnimation]")
 
     REQUIRE(picture->load(TEST_DIR"/test3.json") == Result::Success);
     
-    REQUIRE(Initializer::term(CanvasEngine::Sw) == Result::Success);
+    REQUIRE(Initializer::term() == Result::Success);
 }
 
 TEST_CASE("Animation Lottie4", "[tvgAnimation]")
 {
-    REQUIRE(Initializer::init(CanvasEngine::Sw, 0) == Result::Success);
+    REQUIRE(Initializer::init(0) == Result::Success);
 
     auto animation = Animation::gen();
     REQUIRE(animation);
@@ -112,12 +112,12 @@ TEST_CASE("Animation Lottie4", "[tvgAnimation]")
 
     REQUIRE(picture->load(TEST_DIR"/test4.json") == Result::Success);
 
-    REQUIRE(Initializer::term(CanvasEngine::Sw) == Result::Success);
+    REQUIRE(Initializer::term() == Result::Success);
 }
 
 TEST_CASE("Animation Lottie5", "[tvgAnimation]")
 {
-    REQUIRE(Initializer::init(CanvasEngine::Sw, 0) == Result::Success);
+    REQUIRE(Initializer::init(0) == Result::Success);
 
     auto animation = Animation::gen();
     REQUIRE(animation);
@@ -127,12 +127,12 @@ TEST_CASE("Animation Lottie5", "[tvgAnimation]")
 
     REQUIRE(picture->load(TEST_DIR"/test5.json") == Result::Success);
     
-    REQUIRE(Initializer::term(CanvasEngine::Sw) == Result::Success);
+    REQUIRE(Initializer::term() == Result::Success);
 }
 
 TEST_CASE("Animation Lottie6", "[tvgAnimation]")
 {
-    REQUIRE(Initializer::init(CanvasEngine::Sw, 0) == Result::Success);
+    REQUIRE(Initializer::init(0) == Result::Success);
 
     auto animation = Animation::gen();
     REQUIRE(animation);
@@ -142,12 +142,12 @@ TEST_CASE("Animation Lottie6", "[tvgAnimation]")
 
     REQUIRE(picture->load(TEST_DIR"/test6.json") == Result::Success);
 
-    REQUIRE(Initializer::term(CanvasEngine::Sw) == Result::Success);
+    REQUIRE(Initializer::term() == Result::Success);
 }
 
 TEST_CASE("Animation Lottie7", "[tvgAnimation]")
 {
-    REQUIRE(Initializer::init(CanvasEngine::Sw, 0) == Result::Success);
+    REQUIRE(Initializer::init(0) == Result::Success);
 
     auto animation = Animation::gen();
     REQUIRE(animation);
@@ -157,12 +157,12 @@ TEST_CASE("Animation Lottie7", "[tvgAnimation]")
 
     REQUIRE(picture->load(TEST_DIR"/test7.json") == Result::Success);
 
-    REQUIRE(Initializer::term(CanvasEngine::Sw) == Result::Success);
+    REQUIRE(Initializer::term() == Result::Success);
 }
 
 TEST_CASE("Animation Lottie8", "[tvgAnimation]")
 {
-    REQUIRE(Initializer::init(CanvasEngine::Sw, 0) == Result::Success);
+    REQUIRE(Initializer::init(0) == Result::Success);
 
     auto animation = Animation::gen();
     REQUIRE(animation);
@@ -172,12 +172,12 @@ TEST_CASE("Animation Lottie8", "[tvgAnimation]")
 
     REQUIRE(picture->load(TEST_DIR"/test8.json") == Result::Success);
 
-    REQUIRE(Initializer::term(CanvasEngine::Sw) == Result::Success);
+    REQUIRE(Initializer::term() == Result::Success);
 }
 
 TEST_CASE("Animation Lottie9", "[tvgAnimation]")
 {
-    REQUIRE(Initializer::init(CanvasEngine::Sw, 0) == Result::Success);
+    REQUIRE(Initializer::init(0) == Result::Success);
 
     auto animation = Animation::gen();
     REQUIRE(animation);
@@ -187,7 +187,7 @@ TEST_CASE("Animation Lottie9", "[tvgAnimation]")
 
     REQUIRE(picture->load(TEST_DIR"/test9.json") == Result::Success);
 
-    REQUIRE(Initializer::term(CanvasEngine::Sw) == Result::Success);
+    REQUIRE(Initializer::term() == Result::Success);
 }
 
 #endif

test/testInitializer.cpp

@@ -29,27 +29,27 @@ using namespace tvg;
 
 TEST_CASE("Basic initialization", "[tvgInitializer]")
 {
-    REQUIRE(Initializer::init(CanvasEngine::Sw, 0) == Result::Success);
+    REQUIRE(Initializer::init(0) == Result::Success);
-    REQUIRE(Initializer::term(CanvasEngine::Sw) == Result::Success);
+    REQUIRE(Initializer::term() == Result::Success);
 }
 
 TEST_CASE("Multiple initialization", "[tvgInitializer]")
 {
-    REQUIRE(Initializer::init(CanvasEngine::Sw, 0) == Result::Success);
+    REQUIRE(Initializer::init(0) == Result::Success);
-    REQUIRE(Initializer::init(CanvasEngine::Sw, 0) == Result::Success);
+    REQUIRE(Initializer::init(0) == Result::Success);
-    REQUIRE(Initializer::term(CanvasEngine::Sw) == Result::Success);
+    REQUIRE(Initializer::term() == Result::Success);
 
-    REQUIRE(Initializer::init(CanvasEngine::Sw, 0) == Result::Success);
+    REQUIRE(Initializer::init(0) == Result::Success);
-    REQUIRE(Initializer::term(CanvasEngine::Sw) == Result::Success);
+    REQUIRE(Initializer::term() == Result::Success);
-    REQUIRE(Initializer::term(CanvasEngine::Sw) == Result::Success);
+    REQUIRE(Initializer::term() == Result::Success);
 }
 
 TEST_CASE("Negative termination", "[tvgInitializer]")
 {
-    REQUIRE(Initializer::term(CanvasEngine::Sw) == Result::InsufficientCondition);
+    REQUIRE(Initializer::term() == Result::InsufficientCondition);
 }
 
 TEST_CASE("Invalid engine", "[tvgInitializer]")
 {
-    REQUIRE(Initializer::init(CanvasEngine(0), 0) == Result::InvalidArguments);
+    REQUIRE(Initializer::init(0, CanvasEngine(100)) == Result::NonSupport);
 }

test/testPicture.cpp

@@ -72,7 +72,7 @@ TEST_CASE("Load RAW Data", "[tvgPicture]")
 
 TEST_CASE("Load RAW file and render", "[tvgPicture]")
 {
-    REQUIRE(Initializer::init(CanvasEngine::Sw, 0) == Result::Success);
+    REQUIRE(Initializer::init(0) == Result::Success);
 
     auto canvas = SwCanvas::gen();
     REQUIRE(canvas);
@@ -95,7 +95,7 @@ TEST_CASE("Load RAW file and render", "[tvgPicture]")
 
     REQUIRE(canvas->push(std::move(picture)) == Result::Success);
 
-    REQUIRE(Initializer::term(CanvasEngine::Sw) == Result::Success);
+    REQUIRE(Initializer::term() == Result::Success);
 
     free(data);
 }
@@ -266,7 +266,7 @@ TEST_CASE("Load SVG Data", "[tvgPicture]")
 
 TEST_CASE("Load SVG file and render", "[tvgPicture]")
 {
-    REQUIRE(Initializer::init(CanvasEngine::Sw, 0) == Result::Success);
+    REQUIRE(Initializer::init(0) == Result::Success);
 
     auto canvas = SwCanvas::gen();
     REQUIRE(canvas);
@@ -286,7 +286,7 @@ TEST_CASE("Load SVG file and render", "[tvgPicture]")
     REQUIRE(canvas->draw() == Result::Success);
     REQUIRE(canvas->sync() == Result::Success);
 
-    REQUIRE(Initializer::term(CanvasEngine::Sw) == Result::Success);
+    REQUIRE(Initializer::term() == Result::Success);
 
     delete[] buffer;
 }
@@ -338,7 +338,7 @@ TEST_CASE("Load PNG file from data", "[tvgPicture]")
 
 TEST_CASE("Load PNG file and render", "[tvgPicture]")
 {
-    REQUIRE(Initializer::init(CanvasEngine::Sw, 0) == Result::Success);
+    REQUIRE(Initializer::init(0) == Result::Success);
 
     auto canvas = SwCanvas::gen();
     REQUIRE(canvas);
@@ -355,7 +355,7 @@ TEST_CASE("Load PNG file and render", "[tvgPicture]")
 
     REQUIRE(canvas->push(std::move(picture)) == Result::Success);
 
-    REQUIRE(Initializer::term(CanvasEngine::Sw) == Result::Success);
+    REQUIRE(Initializer::term() == Result::Success);
 }
 
 #endif
@@ -408,7 +408,7 @@ TEST_CASE("Load JPG file from data", "[tvgPicture]")
 
 TEST_CASE("Load JPG file and render", "[tvgPicture]")
 {
-    REQUIRE(Initializer::init(CanvasEngine::Sw, 0) == Result::Success);
+    REQUIRE(Initializer::init(0) == Result::Success);
 
     auto canvas = SwCanvas::gen();
     REQUIRE(canvas);
@@ -423,7 +423,7 @@ TEST_CASE("Load JPG file and render", "[tvgPicture]")
 
     REQUIRE(canvas->push(std::move(picture)) == Result::Success);
 
-    REQUIRE(Initializer::term(CanvasEngine::Sw) == Result::Success);
+    REQUIRE(Initializer::term() == Result::Success);
 }
 
 #endif
@@ -476,7 +476,7 @@ TEST_CASE("Load TVG file from data", "[tvgPicture]")
 
 TEST_CASE("Load TVG file and render", "[tvgPicture]")
 {
-    REQUIRE(Initializer::init(CanvasEngine::Sw, 0) == Result::Success);
+    REQUIRE(Initializer::init(0) == Result::Success);
 
     auto canvas = SwCanvas::gen();
     REQUIRE(canvas);
@@ -496,7 +496,7 @@ TEST_CASE("Load TVG file and render", "[tvgPicture]")
     REQUIRE(pictureTest->load(TEST_DIR"/test.tvg") == Result::Success);
     REQUIRE(canvas->push(std::move(pictureTest)) == Result::Success);
 
-    REQUIRE(Initializer::term(CanvasEngine::Sw) == Result::Success);
+    REQUIRE(Initializer::term() == Result::Success);
 
     delete[] buffer;
 }
@@ -548,7 +548,7 @@ TEST_CASE("Load WEBP file from data", "[tvgPicture]")
 
 TEST_CASE("Load WEBP file and render", "[tvgPicture]")
 {
-    REQUIRE(Initializer::init(CanvasEngine::Sw, 0) == Result::Success);
+    REQUIRE(Initializer::init(0) == Result::Success);
 
     auto canvas = SwCanvas::gen();
     REQUIRE(canvas);
@@ -565,7 +565,7 @@ TEST_CASE("Load WEBP file and render", "[tvgPicture]")
 
     REQUIRE(canvas->push(std::move(picture)) == Result::Success);
 
-    REQUIRE(Initializer::term(CanvasEngine::Sw) == Result::Success);
+    REQUIRE(Initializer::term() == Result::Success);
 }
 
 #endif

test/testSavers.cpp

@@ -49,7 +49,7 @@ TEST_CASE("Save empty shape", "[tvgSavers]")
 
 TEST_CASE("Save svg into tvg", "[tvgSavers]")
 {
-    REQUIRE(Initializer::init(CanvasEngine::Sw, 0) == Result::Success);
+    REQUIRE(Initializer::init(0) == Result::Success);
 
     auto picture = Picture::gen();
     REQUIRE(picture);
@@ -61,12 +61,12 @@ TEST_CASE("Save svg into tvg", "[tvgSavers]")
     REQUIRE(saver->save(std::move(picture), TEST_DIR"/tag.tvg") == Result::Success);
     REQUIRE(saver->sync() == Result::Success);
 
-    REQUIRE(Initializer::term(CanvasEngine::Sw) == Result::Success);
+    REQUIRE(Initializer::term() == Result::Success);
 }
 
 TEST_CASE("Save scene into tvg", "[tvgSavers]")
 {
-    REQUIRE(Initializer::init(CanvasEngine::Sw, 0) == Result::Success);
+    REQUIRE(Initializer::init(0) == Result::Success);
 
     auto picture = tvg::Picture::gen();
     REQUIRE(picture);
@@ -92,7 +92,7 @@ TEST_CASE("Save scene into tvg", "[tvgSavers]")
     REQUIRE(saver->save(std::move(picture), TEST_DIR"/test.tvg") == Result::Success);
     REQUIRE(saver->sync() == Result::Success);
 
-    REQUIRE(Initializer::term(CanvasEngine::Sw) == Result::Success);
+    REQUIRE(Initializer::term() == Result::Success);
 
     free(data);
 }

test/testScene.cpp

@@ -84,7 +84,7 @@ TEST_CASE("Scene Clear", "[tvgScene]")
 
 TEST_CASE("Scene Clear And Reuse Shape", "[tvgScene]")
 {
-    REQUIRE(Initializer::init(CanvasEngine::Sw, 0) == Result::Success);
+    REQUIRE(Initializer::init(0) == Result::Success);
 
     auto canvas = SwCanvas::gen();
     REQUIRE(canvas);
@@ -107,5 +107,5 @@ TEST_CASE("Scene Clear And Reuse Shape", "[tvgScene]")
     //Reuse shape.
     REQUIRE(pScene->push(std::unique_ptr<Shape>(pShape)) == Result::Success);
 
-    REQUIRE(Initializer::term(CanvasEngine::Sw) == Result::Success);
+    REQUIRE(Initializer::term() == Result::Success);
 }

test/testSwCanvas.cpp

@@ -35,7 +35,7 @@ TEST_CASE("Missing Initialization", "[tvgSwCanvas]")
 
 TEST_CASE("Basic Creation", "[tvgSwCanvas]")
 {
-    REQUIRE(Initializer::init(CanvasEngine::Sw, 0) == Result::Success);
+    REQUIRE(Initializer::init(0, CanvasEngine::Sw) == Result::Success);
 
     auto canvas = SwCanvas::gen();
     REQUIRE(canvas);
@@ -51,7 +51,7 @@ TEST_CASE("Basic Creation", "[tvgSwCanvas]")
 
 TEST_CASE("Target Buffer", "[tvgSwCanvas]")
 {
-    REQUIRE(Initializer::init(CanvasEngine::Sw, 0) == Result::Success);
+    REQUIRE(Initializer::init(0, CanvasEngine::Sw) == Result::Success);
 
     auto canvas = SwCanvas::gen();
     REQUIRE(canvas);
@@ -71,7 +71,7 @@ TEST_CASE("Target Buffer", "[tvgSwCanvas]")
 
 TEST_CASE("Memory Pool", "[tvgSwCanvas]")
 {
-    REQUIRE(Initializer::init(CanvasEngine::Sw, 0) == Result::Success);
+    REQUIRE(Initializer::init(0, CanvasEngine::Sw) == Result::Success);
 
     auto canvas = SwCanvas::gen();
     REQUIRE(canvas);

test/testSwCanvasBase.cpp

@@ -29,7 +29,7 @@ using namespace tvg;
 
 TEST_CASE("Pushing Paints", "[tvgSwCanvasBase]")
 {
-    REQUIRE(Initializer::init(CanvasEngine::Sw, 0) == Result::Success);
+    REQUIRE(Initializer::init(0) == Result::Success);
 
     auto canvas = SwCanvas::gen();
     REQUIRE(canvas);
@@ -80,12 +80,12 @@ TEST_CASE("Pushing Paints", "[tvgSwCanvasBase]")
        ++idx;
     }
 
-    REQUIRE(Initializer::term(CanvasEngine::Sw) == Result::Success);
+    REQUIRE(Initializer::term() == Result::Success);
 }
 
 TEST_CASE("Clear", "[tvgSwCanvasBase]")
 {
-    REQUIRE(Initializer::init(CanvasEngine::Sw, 0) == Result::Success);
+    REQUIRE(Initializer::init(0) == Result::Success);
 
     auto canvas = SwCanvas::gen();
     REQUIRE(canvas);
@@ -134,12 +134,12 @@ TEST_CASE("Clear", "[tvgSwCanvasBase]")
     REQUIRE(canvas2->clear(false) == Result::Success);
     REQUIRE(canvas2->clear() == Result::Success);
 
-    REQUIRE(Initializer::term(CanvasEngine::Sw) == Result::Success);
+    REQUIRE(Initializer::term() == Result::Success);
 }
 
 TEST_CASE("Update", "[tvgSwCanvasBase]")
 {
-    REQUIRE(Initializer::init(CanvasEngine::Sw, 0) == Result::Success);
+    REQUIRE(Initializer::init(0) == Result::Success);
 
     auto canvas = SwCanvas::gen();
     REQUIRE(canvas);
@@ -168,12 +168,12 @@ TEST_CASE("Update", "[tvgSwCanvasBase]")
     //Invalid shape
     REQUIRE(canvas->update(ptr) == Result::InsufficientCondition);
 
-    REQUIRE(Initializer::term(CanvasEngine::Sw) == Result::Success);
+    REQUIRE(Initializer::term() == Result::Success);
 }
 
 TEST_CASE("Synchronized Drawing", "[tvgSwCanvasBase]")
 {
-    REQUIRE(Initializer::init(CanvasEngine::Sw, 0) == Result::Success);
+    REQUIRE(Initializer::init(0) == Result::Success);
 
     auto canvas = SwCanvas::gen();
     REQUIRE(canvas);
@@ -205,13 +205,13 @@ TEST_CASE("Synchronized Drawing", "[tvgSwCanvasBase]")
     REQUIRE(canvas->draw() == Result::Success);
     REQUIRE(canvas->sync() == Result::Success);
 
-    REQUIRE(Initializer::term(CanvasEngine::Sw) == Result::Success);
+    REQUIRE(Initializer::term() == Result::Success);
 }
 
 TEST_CASE("Asynchronized Drawing", "[tvgSwCanvasBase]")
 {
     //Use multi-threading
-    REQUIRE(Initializer::init(CanvasEngine::Sw, 2) == Result::Success);
+    REQUIRE(Initializer::init(2) == Result::Success);
 
     auto canvas = SwCanvas::gen();
     REQUIRE(canvas);
@@ -231,5 +231,5 @@ TEST_CASE("Asynchronized Drawing", "[tvgSwCanvasBase]")
     REQUIRE(canvas->draw() == Result::Success);
     REQUIRE(canvas->sync() == Result::Success);
 
-    REQUIRE(Initializer::term(CanvasEngine::Sw) == Result::Success);
+    REQUIRE(Initializer::term() == Result::Success);
 }

test/testSwEngine.cpp

@@ -32,7 +32,7 @@ using namespace std;
 
 TEST_CASE("Basic draw", "[tvgSwEngine]")
 {
-    REQUIRE(Initializer::init(CanvasEngine::Sw, 0) == Result::Success);
+    REQUIRE(Initializer::init(0) == Result::Success);
 
     auto canvas = SwCanvas::gen();
     REQUIRE(canvas);
@@ -90,12 +90,12 @@ TEST_CASE("Basic draw", "[tvgSwEngine]")
     REQUIRE(canvas->draw() == Result::Success);
     REQUIRE(canvas->sync() == Result::Success);
 
-    REQUIRE(Initializer::term(CanvasEngine::Sw) == Result::Success);
+    REQUIRE(Initializer::term() == Result::Success);
 }
 
 TEST_CASE("Image Draw", "[tvgSwEngine]")
 {
-    REQUIRE(Initializer::init(CanvasEngine::Sw, 0) == Result::Success);
+    REQUIRE(Initializer::init(0) == Result::Success);
 
     auto canvas = SwCanvas::gen();
     REQUIRE(canvas);
@@ -373,14 +373,14 @@ TEST_CASE("Image Draw", "[tvgSwEngine]")
     REQUIRE(canvas->draw() == Result::Success);
     REQUIRE(canvas->sync() == Result::Success);
 
-    REQUIRE(Initializer::term(CanvasEngine::Sw) == Result::Success);
+    REQUIRE(Initializer::term() == Result::Success);
 
     free(data);
 }
 
 TEST_CASE("Rect Draw", "[tvgSwEngine]")
 {
-    REQUIRE(Initializer::init(CanvasEngine::Sw, 0) == Result::Success);
+    REQUIRE(Initializer::init(0) == Result::Success);
 
     auto canvas = SwCanvas::gen();
     REQUIRE(canvas);
@@ -433,12 +433,12 @@ TEST_CASE("Rect Draw", "[tvgSwEngine]")
     REQUIRE(canvas->draw() == Result::Success);
     REQUIRE(canvas->sync() == Result::Success);
 
-    REQUIRE(Initializer::term(CanvasEngine::Sw) == Result::Success);
+    REQUIRE(Initializer::term() == Result::Success);
 }
 
 TEST_CASE("RLE Draw", "[tvgSwEngine]")
 {
-    REQUIRE(Initializer::init(CanvasEngine::Sw, 0) == Result::Success);
+    REQUIRE(Initializer::init(0) == Result::Success);
 
     auto canvas = SwCanvas::gen();
     REQUIRE(canvas);
@@ -491,12 +491,12 @@ TEST_CASE("RLE Draw", "[tvgSwEngine]")
     REQUIRE(canvas->draw() == Result::Success);
     REQUIRE(canvas->sync() == Result::Success);
 
-    REQUIRE(Initializer::term(CanvasEngine::Sw) == Result::Success);
+    REQUIRE(Initializer::term() == Result::Success);
 }
 
 TEST_CASE("Filling Draw", "[tvgSwEngine]")
 {
-    REQUIRE(Initializer::init(CanvasEngine::Sw, 0) == Result::Success);
+    REQUIRE(Initializer::init(0) == Result::Success);
 
     auto canvas = SwCanvas::gen();
     REQUIRE(canvas);
@@ -540,12 +540,12 @@ TEST_CASE("Filling Draw", "[tvgSwEngine]")
     REQUIRE(canvas->draw() == Result::Success);
     REQUIRE(canvas->sync() == Result::Success);
 
-    REQUIRE(Initializer::term(CanvasEngine::Sw) == Result::Success);
+    REQUIRE(Initializer::term() == Result::Success);
 }
 
 TEST_CASE("Filling Opaque Draw", "[tvgSwEngine]")
 {
-    REQUIRE(Initializer::init(CanvasEngine::Sw, 0) == Result::Success);
+    REQUIRE(Initializer::init(0) == Result::Success);
 
     auto canvas = SwCanvas::gen();
     REQUIRE(canvas);
@@ -589,12 +589,12 @@ TEST_CASE("Filling Opaque Draw", "[tvgSwEngine]")
     REQUIRE(canvas->draw() == Result::Success);
     REQUIRE(canvas->sync() == Result::Success);
 
-    REQUIRE(Initializer::term(CanvasEngine::Sw) == Result::Success);
+    REQUIRE(Initializer::term() == Result::Success);
 }
 
 TEST_CASE("Filling AlphaMask", "[tvgSwEngine]")
 {
-    REQUIRE(Initializer::init(CanvasEngine::Sw, 0) == Result::Success);
+    REQUIRE(Initializer::init(0) == Result::Success);
 
     auto canvas = SwCanvas::gen();
     REQUIRE(canvas);
@@ -648,12 +648,12 @@ TEST_CASE("Filling AlphaMask", "[tvgSwEngine]")
     REQUIRE(canvas->draw() == Result::Success);
     REQUIRE(canvas->sync() == Result::Success);
 
-    REQUIRE(Initializer::term(CanvasEngine::Sw) == Result::Success);
+    REQUIRE(Initializer::term() == Result::Success);
 }
 
 TEST_CASE("Filling InvAlphaMask", "[tvgSwEngine]")
 {
-    REQUIRE(Initializer::init(CanvasEngine::Sw, 0) == Result::Success);
+    REQUIRE(Initializer::init(0) == Result::Success);
 
     auto canvas = SwCanvas::gen();
     REQUIRE(canvas);
@@ -707,12 +707,12 @@ TEST_CASE("Filling InvAlphaMask", "[tvgSwEngine]")
     REQUIRE(canvas->draw() == Result::Success);
     REQUIRE(canvas->sync() == Result::Success);
 
-    REQUIRE(Initializer::term(CanvasEngine::Sw) == Result::Success);
+    REQUIRE(Initializer::term() == Result::Success);
 }
 
 TEST_CASE("Filling LumaMask", "[tvgSwEngine]")
 {
-    REQUIRE(Initializer::init(CanvasEngine::Sw, 0) == Result::Success);
+    REQUIRE(Initializer::init(0) == Result::Success);
 
     auto canvas = SwCanvas::gen();
     REQUIRE(canvas);
@@ -766,12 +766,12 @@ TEST_CASE("Filling LumaMask", "[tvgSwEngine]")
     REQUIRE(canvas->draw() == Result::Success);
     REQUIRE(canvas->sync() == Result::Success);
 
-    REQUIRE(Initializer::term(CanvasEngine::Sw) == Result::Success);
+    REQUIRE(Initializer::term() == Result::Success);
 }
 
 TEST_CASE("Filling ClipPath", "[tvgSwEngine]")
 {
-    REQUIRE(Initializer::init(CanvasEngine::Sw, 0) == Result::Success);
+    REQUIRE(Initializer::init(0) == Result::Success);
 
     auto canvas = SwCanvas::gen();
     REQUIRE(canvas);
@@ -825,12 +825,12 @@ TEST_CASE("Filling ClipPath", "[tvgSwEngine]")
     REQUIRE(canvas->draw() == Result::Success);
     REQUIRE(canvas->sync() == Result::Success);
 
-    REQUIRE(Initializer::term(CanvasEngine::Sw) == Result::Success);
+    REQUIRE(Initializer::term() == Result::Success);
 }
 
 TEST_CASE("RLE Filling Draw", "[tvgSwEngine]")
 {
-    REQUIRE(Initializer::init(CanvasEngine::Sw, 0) == Result::Success);
+    REQUIRE(Initializer::init(0) == Result::Success);
 
     auto canvas = SwCanvas::gen();
     REQUIRE(canvas);
@@ -874,12 +874,12 @@ TEST_CASE("RLE Filling Draw", "[tvgSwEngine]")
     REQUIRE(canvas->draw() == Result::Success);
     REQUIRE(canvas->sync() == Result::Success);
 
-    REQUIRE(Initializer::term(CanvasEngine::Sw) == Result::Success);
+    REQUIRE(Initializer::term() == Result::Success);
 }
 
 TEST_CASE("RLE Filling Opaque Draw", "[tvgSwEngine]")
 {
-    REQUIRE(Initializer::init(CanvasEngine::Sw, 0) == Result::Success);
+    REQUIRE(Initializer::init(0) == Result::Success);
 
     auto canvas = SwCanvas::gen();
     REQUIRE(canvas);
@@ -923,12 +923,12 @@ TEST_CASE("RLE Filling Opaque Draw", "[tvgSwEngine]")
     REQUIRE(canvas->draw() == Result::Success);
     REQUIRE(canvas->sync() == Result::Success);
 
-    REQUIRE(Initializer::term(CanvasEngine::Sw) == Result::Success);
+    REQUIRE(Initializer::term() == Result::Success);
 }
 
 TEST_CASE("RLE Filling AlphaMask", "[tvgSwEngine]")
 {
-    REQUIRE(Initializer::init(CanvasEngine::Sw, 0) == Result::Success);
+    REQUIRE(Initializer::init(0) == Result::Success);
 
     auto canvas = SwCanvas::gen();
     REQUIRE(canvas);
@@ -982,12 +982,12 @@ TEST_CASE("RLE Filling AlphaMask", "[tvgSwEngine]")
     REQUIRE(canvas->draw() == Result::Success);
     REQUIRE(canvas->sync() == Result::Success);
 
-    REQUIRE(Initializer::term(CanvasEngine::Sw) == Result::Success);
+    REQUIRE(Initializer::term() == Result::Success);
 }
 
 TEST_CASE("RLE Filling InvAlphaMask", "[tvgSwEngine]")
 {
-    REQUIRE(Initializer::init(CanvasEngine::Sw, 0) == Result::Success);
+    REQUIRE(Initializer::init(0) == Result::Success);
 
     auto canvas = SwCanvas::gen();
     REQUIRE(canvas);
@@ -1041,12 +1041,12 @@ TEST_CASE("RLE Filling InvAlphaMask", "[tvgSwEngine]")
     REQUIRE(canvas->draw() == Result::Success);
     REQUIRE(canvas->sync() == Result::Success);
 
-    REQUIRE(Initializer::term(CanvasEngine::Sw) == Result::Success);
+    REQUIRE(Initializer::term() == Result::Success);
 }
 
 TEST_CASE("RLE Filling LumaMask", "[tvgSwEngine]")
 {
-    REQUIRE(Initializer::init(CanvasEngine::Sw, 0) == Result::Success);
+    REQUIRE(Initializer::init(0) == Result::Success);
 
     auto canvas = SwCanvas::gen();
     REQUIRE(canvas);
@@ -1100,12 +1100,12 @@ TEST_CASE("RLE Filling LumaMask", "[tvgSwEngine]")
     REQUIRE(canvas->draw() == Result::Success);
     REQUIRE(canvas->sync() == Result::Success);
 
-    REQUIRE(Initializer::term(CanvasEngine::Sw) == Result::Success);
+    REQUIRE(Initializer::term() == Result::Success);
 }
 
 TEST_CASE("RLE Filling InvLumaMask", "[tvgSwEngine]")
 {
-    REQUIRE(Initializer::init(CanvasEngine::Sw, 0) == Result::Success);
+    REQUIRE(Initializer::init(0) == Result::Success);
 
     auto canvas = SwCanvas::gen();
     REQUIRE(canvas);
@@ -1159,12 +1159,12 @@ TEST_CASE("RLE Filling InvLumaMask", "[tvgSwEngine]")
     REQUIRE(canvas->draw() == Result::Success);
     REQUIRE(canvas->sync() == Result::Success);
 
-    REQUIRE(Initializer::term(CanvasEngine::Sw) == Result::Success);
+    REQUIRE(Initializer::term() == Result::Success);
 }
 
 TEST_CASE("RLE Filling ClipPath", "[tvgSwEngine]")
 {
-    REQUIRE(Initializer::init(CanvasEngine::Sw, 0) == Result::Success);
+    REQUIRE(Initializer::init(0) == Result::Success);
 
     auto canvas = SwCanvas::gen();
     REQUIRE(canvas);
@@ -1218,12 +1218,12 @@ TEST_CASE("RLE Filling ClipPath", "[tvgSwEngine]")
     REQUIRE(canvas->draw() == Result::Success);
     REQUIRE(canvas->sync() == Result::Success);
 
-    REQUIRE(Initializer::term(CanvasEngine::Sw) == Result::Success);
+    REQUIRE(Initializer::term() == Result::Success);
 }
 
 TEST_CASE("Blending Shapes", "[tvgSwEngine]")
 {
-    REQUIRE(Initializer::init(CanvasEngine::Sw, 0) == Result::Success);
+    REQUIRE(Initializer::init(0) == Result::Success);
 
     auto canvas = SwCanvas::gen();
     REQUIRE(canvas);
@@ -1271,12 +1271,12 @@ TEST_CASE("Blending Shapes", "[tvgSwEngine]")
     REQUIRE(canvas->draw() == Result::Success);
     REQUIRE(canvas->sync() == Result::Success);
 
-    REQUIRE(Initializer::term(CanvasEngine::Sw) == Result::Success);
+    REQUIRE(Initializer::term() == Result::Success);
 }
 
 TEST_CASE("Blending Images", "[tvgSwEngine]")
 {
-    REQUIRE(Initializer::init(CanvasEngine::Sw, 0) == Result::Success);
+    REQUIRE(Initializer::init(0) == Result::Success);
 
     auto canvas = SwCanvas::gen();
     REQUIRE(canvas);
@@ -1352,14 +1352,14 @@ TEST_CASE("Blending Images", "[tvgSwEngine]")
     REQUIRE(canvas->draw() == Result::Success);
     REQUIRE(canvas->sync() == Result::Success);
 
-    REQUIRE(Initializer::term(CanvasEngine::Sw) == Result::Success);
+    REQUIRE(Initializer::term() == Result::Success);
 
     free(data);
 }
 
 TEST_CASE("Blending with Gradient Filling", "[tvgSwEngine]")
 {
-    REQUIRE(Initializer::init(CanvasEngine::Sw, 0) == Result::Success);
+    REQUIRE(Initializer::init(0) == Result::Success);
 
     auto canvas = SwCanvas::gen();
     REQUIRE(canvas);
@@ -1476,7 +1476,7 @@ TEST_CASE("Blending with Gradient Filling", "[tvgSwEngine]")
     REQUIRE(canvas->draw() == Result::Success);
     REQUIRE(canvas->sync() == Result::Success);
 
-    REQUIRE(Initializer::term(CanvasEngine::Sw) == Result::Success);
+    REQUIRE(Initializer::term() == Result::Success);
 }
 
 #endif