From: subhransu mohanty Date: Thu, 30 May 2019 01:07:32 +0000 (+0900) Subject: rlottie: Optimize library size when logging is disabled X-Git-Tag: submit/tizen/20190619.051039~25 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=3c9f09de3df77ece52e1bdf2b2bb8652b2fbb08d;p=platform%2Fcore%2Fuifw%2Flottie-player.git rlottie: Optimize library size when logging is disabled --- diff --git a/src/vector/config.h b/src/vector/config.h index 2c2722a..6ac9159 100644 --- a/src/vector/config.h +++ b/src/vector/config.h @@ -5,7 +5,7 @@ #define LOTTIE_THREAD_SUPPORT //enable logging -#define LOTTIE_LOGGING_SUPPORT +//#define LOTTIE_LOGGING_SUPPORT //enable static building of image loader //#define LOTTIE_STATIC_IMAGE_LOADER diff --git a/src/vector/vbitmap.h b/src/vector/vbitmap.h index e40c52a..c7f4702 100644 --- a/src/vector/vbitmap.h +++ b/src/vector/vbitmap.h @@ -20,6 +20,7 @@ #define VBITMAP_H #include "vrect.h" +#include V_BEGIN_NAMESPACE diff --git a/src/vector/vdebug.cpp b/src/vector/vdebug.cpp index 8e9cc52..86d00c2 100644 --- a/src/vector/vdebug.cpp +++ b/src/vector/vdebug.cpp @@ -17,7 +17,9 @@ */ #include "vdebug.h" -#include "config.h" + +#ifdef LOTTIE_LOGGING_SUPPORT + #include #include #include @@ -740,19 +742,10 @@ void set_log_level(LogLevel level) loglevel.store(static_cast(level), std::memory_order_release); } -#ifdef LOTTIE_LOGGING_SUPPORT - bool is_logged(LogLevel level) { return static_cast(level) >= loglevel.load(std::memory_order_relaxed); } -#else - -bool is_logged(LogLevel) -{ - return false; -} - -#endif +#endif //LOTTIE_LOGGING_SUPPORT diff --git a/src/vector/vdebug.h b/src/vector/vdebug.h index 052dd8f..83ffdb0 100644 --- a/src/vector/vdebug.h +++ b/src/vector/vdebug.h @@ -18,6 +18,11 @@ #ifndef VDEBUG_H #define VDEBUG_H + +#include "config.h" + +#ifdef LOTTIE_LOGGING_SUPPORT + #include #include #include @@ -161,4 +166,18 @@ void initialize(NonGuaranteedLogger ngl, std::string const& log_directory, #define vWarning is_logged(LogLevel::WARN) && VDEBUG_LOG(LogLevel::WARN) #define vCritical is_logged(LogLevel::CRIT) && VDEBUG_LOG(LogLevel::CRIT) +#else + +struct VDebug +{ + template + VDebug& operator<<(const Args &){return *this;} +}; + +#define vDebug VDebug() +#define vWarning VDebug() +#define vCritical VDebug() + +#endif //LOTTIE_LOGGING_SUPPORT + #endif // VDEBUG_H diff --git a/src/vector/vdrawhelper.h b/src/vector/vdrawhelper.h index 9672613..0653772 100644 --- a/src/vector/vdrawhelper.h +++ b/src/vector/vdrawhelper.h @@ -20,6 +20,7 @@ #define VDRAWHELPER_H #include +#include #include "assert.h" #include "vbitmap.h" #include "vbrush.h"