Revert "Add LOTTIE_RASTER_THREAD option."

This reverts commit 91e706bee9d86aa97aea87c576a12d620820748c.

Change-Id: Ia2a769a67bf609af0f454258d0b549246abde5e1

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 940a9e436e7a3596a9cc3571125e72dc24625934..38a986225bc8ddb853c79c2692dd61edcb7123ea 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -30,7 +30,6 @@ add_library(rlottie::rlottie ALIAS rlottie)
 
 option(LOTTIE_MODULE "Enable LOTTIE MODULE SUPPORT" ON)
 option(LOTTIE_THREAD "Enable LOTTIE THREAD SUPPORT" ON)
-option(LOTTIE_RASTER_THREAD "Enable LOTTIE RASTER THREAD SUPPORT" OFF)
 option(LOTTIE_CACHE "Enable LOTTIE CACHE SUPPORT" ON)
 option(LOTTIE_TEST "Build LOTTIE AUTOTESTS" OFF)
 option(LOTTIE_CCACHE "Enable LOTTIE ccache SUPPORT" OFF)

diff --git a/cmake/config.h.in b/cmake/config.h.in
index e4c0c3edec0df996b56253f6e8c917739a071c24..ca42a9e1d407e08ba2256cdfb274d5a903fbe07a 100644 (file)
--- a/cmake/config.h.in
+++ b/cmake/config.h.in
@@ -17,9 +17,3 @@
 #ifdef LOTTIE_CACHE
 #define LOTTIE_CACHE_SUPPORT
 #endif
-
-#cmakedefine LOTTIE_RASTER_THREAD
-
-#ifdef LOTTIE_RASTER_THREAD
-#define LOTTIE_RASTER_THREAD_SUPPORT
-#endif

diff --git a/meson.build b/meson.build
index 46b1ec4c864692504d49fd1c5b8362ff78c8fa02..50404c58679ab3142dac1c286020a00a39d02f5e 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -18,10 +18,6 @@ if get_option('thread') == true
     config_h.set10('LOTTIE_THREAD_SUPPORT', true)
 endif
 
-if get_option('raster_thread') == true
-  config_h.set10('LOTTIE_RASTER_THREAD_SUPPORT', true)
-endif
-
 if get_option('module') == true
     config_h.set10('LOTTIE_IMAGE_MODULE_SUPPORT', true)
 
@@ -120,3 +116,6 @@ Summary:
     )
 
 message(summary)
+
+
+

diff --git a/meson_options.txt b/meson_options.txt
index acc79d218dabf40f4a29a2bf17bfae6142ece5f4..c81dfbc4f4e92a5986943638013a9241cfd15344 100644 (file)
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -3,11 +3,6 @@ option('thread',
    value: true,
    description: 'Enable threading in rlottie')
 
-option('raster_thread',
-   type: 'boolean',
-   value: false,
-   description: 'Enable raster threading in rlottie')
-
 option('cache',
    type: 'boolean',
    value: true,
@@ -46,3 +41,6 @@ option('cmake',
   type: 'boolean',
   value: false,
   description: 'Enable Generating  CMake config files')
+
+
+

diff --git a/src/vector/vraster.cpp b/src/vector/vraster.cpp
index 632fb6568ad5fa427ee96fdf43b083b129ca7d92..8ef7b57132593d011a135ce2520efd06131f96bb 100644 (file)
--- a/src/vector/vraster.cpp
+++ b/src/vector/vraster.cpp
@@ -415,7 +415,7 @@ struct VRleTask {
 
 using VTask = std::shared_ptr<VRleTask>;
 
-#if defined(LOTTIE_THREAD_SUPPORT) && defined(LOTTIE_RASTER_THREAD_SUPPORT)
+#ifdef LOTTIE_THREAD_SUPPORT
 
 #include <thread>
 #include "vtaskqueue.h"