From cd6e478b9fab9aa7874630c974f559acbf15ad91 Mon Sep 17 00:00:00 2001 From: subhransu mohanty Date: Tue, 14 May 2019 09:43:11 +0900 Subject: [PATCH] rlottie: remove remaining warnings --- src/lottie/lottieitem.cpp | 2 +- src/lottie/lottieitem.h | 2 +- src/lottie/lottieparser.cpp | 2 +- src/vector/stb/stb_image.h | 2 +- src/vector/vdebug.cpp | 10 ++++++---- 5 files changed, 10 insertions(+), 8 deletions(-) diff --git a/src/lottie/lottieitem.cpp b/src/lottie/lottieitem.cpp index 39d54ca..8af434b 100644 --- a/src/lottie/lottieitem.cpp +++ b/src/lottie/lottieitem.cpp @@ -1238,7 +1238,7 @@ void LOTPolystarItem::updatePath(VPath& path, int frameNo) LOTPaintDataItem::LOTPaintDataItem(bool staticContent):mDrawable(std::make_unique()), mStaticContent(staticContent){} -void LOTPaintDataItem::update(int frameNo, const VMatrix &parentMatrix, +void LOTPaintDataItem::update(int frameNo, const VMatrix &/*parentMatrix*/, float parentAlpha, const DirtyFlag &flag) { mRenderNodeUpdate = true; diff --git a/src/lottie/lottieitem.h b/src/lottie/lottieitem.h index bf59614..eeb87f9 100644 --- a/src/lottie/lottieitem.h +++ b/src/lottie/lottieitem.h @@ -260,7 +260,7 @@ public: virtual void renderList(std::vector &){} void setParent(LOTContentItem *parent) {mParent = parent;} LOTContentItem *parent() const {return mParent;} - virtual bool resolveKeyPath(LOTKeyPath &keyPath, uint depth, LOTVariant &value) {return false;} + virtual bool resolveKeyPath(LOTKeyPath &, uint, LOTVariant &) {return false;} private: LOTContentItem *mParent{nullptr}; }; diff --git a/src/lottie/lottieparser.cpp b/src/lottie/lottieparser.cpp index 2e08aa8..c9249b0 100644 --- a/src/lottie/lottieparser.cpp +++ b/src/lottie/lottieparser.cpp @@ -498,7 +498,7 @@ int LottieParserImpl::PeekType() return -1; } -void LottieParserImpl::Skip(const char *key) +void LottieParserImpl::Skip(const char */*key*/) { if (PeekType() == kArrayType) { EnterArray(); diff --git a/src/vector/stb/stb_image.h b/src/vector/stb/stb_image.h index b52db63..b8ab055 100644 --- a/src/vector/stb/stb_image.h +++ b/src/vector/stb/stb_image.h @@ -969,7 +969,7 @@ STBIDEF void stbi_set_flip_vertically_on_load(int flag_true_if_should_flip) stbi__vertically_flip_on_load = flag_true_if_should_flip; } -static void *stbi__load_main(stbi__context *s, int *x, int *y, int *comp, int req_comp, stbi__result_info *ri, int bpc) +static void *stbi__load_main(stbi__context *s, int *x, int *y, int *comp, int req_comp, stbi__result_info *ri, int /*bpc*/) { memset(ri, 0, sizeof(*ri)); // make sure it's initialized if we add new fields ri->bits_per_channel = 8; // default is 8 so most paths don't have to be changed diff --git a/src/vector/vdebug.cpp b/src/vector/vdebug.cpp index 7002bd0..8e9cc52 100644 --- a/src/vector/vdebug.cpp +++ b/src/vector/vdebug.cpp @@ -161,7 +161,7 @@ void VDebug::stringify(std::ostream& os) } template -char* decode(std::ostream& os, char* b, Arg* dummy) +char* decode(std::ostream& os, char* b, Arg* /*dummy*/) { Arg arg = *reinterpret_cast(b); os << arg; @@ -169,7 +169,7 @@ char* decode(std::ostream& os, char* b, Arg* dummy) } template <> -char* decode(std::ostream& os, char* b, VDebug::string_literal_t* dummy) +char* decode(std::ostream& os, char* b, VDebug::string_literal_t* /*dummy*/) { VDebug::string_literal_t s = *reinterpret_cast(b); @@ -178,7 +178,7 @@ char* decode(std::ostream& os, char* b, VDebug::string_literal_t* dummy) } template <> -char* decode(std::ostream& os, char* b, char** dummy) +char* decode(std::ostream& os, char* b, char** /*dummy*/) { while (*b != '\0') { os << *b; @@ -454,7 +454,9 @@ private: size_t const m_size; Item* m_ring; std::atomic m_write_index; +public: char pad[64]; +private: unsigned int m_read_index; }; @@ -654,7 +656,7 @@ public: m_state.store(State::READY, std::memory_order_release); } - NanoLogger(GuaranteedLogger gl, std::string const& log_directory, + NanoLogger(GuaranteedLogger /*gl*/, std::string const& log_directory, std::string const& log_file_name, uint32_t log_file_roll_size_mb) : m_state(State::INIT), m_buffer_base(new QueueBuffer()), -- 2.7.4