From a5223736af315a23324656760b5c6a87b0eb60e8 Mon Sep 17 00:00:00 2001 From: "sub.mohanty@samsung.com" Date: Sat, 28 Jul 2018 17:02:37 +0900 Subject: [PATCH] lottie/render: fixed std::move copy elision warning Change-Id: I0eee41225dbc19ee958b7d747d2536532efb3445 --- src/lottie/lottieitem.cpp | 2 +- src/lottie/lottieplayer.cpp | 4 ++-- src/vector/vdrawable.cpp | 2 +- src/vector/vraster.cpp | 8 ++++---- src/vector/vtaskqueue.h | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/lottie/lottieitem.cpp b/src/lottie/lottieitem.cpp index db50b49..cc5c02e 100644 --- a/src/lottie/lottieitem.cpp +++ b/src/lottie/lottieitem.cpp @@ -188,7 +188,7 @@ void LOTMaskItem::update(int frameNo, const VMatrix &parentMatrix, VRle LOTMaskItem::rle() { if (mRleTask.valid()) { - mRle = std::move(mRleTask.get()); + mRle = mRleTask.get(); if (!vCompare(mCombinedAlpha, 1.0f)) mRle = mRle * (mCombinedAlpha * 255); if (mData->mInv) diff --git a/src/lottie/lottieplayer.cpp b/src/lottie/lottieplayer.cpp index e336139..f2264be 100644 --- a/src/lottie/lottieplayer.cpp +++ b/src/lottie/lottieplayer.cpp @@ -195,12 +195,12 @@ public: auto i = _index++; for (unsigned n = 0; n != _count; ++n) { - if (_q[(i + n) % _count].try_push(task)) return std::move(receiver); + if (_q[(i + n) % _count].try_push(task)) return receiver; } _q[i % _count].push(task); - return std::move(receiver); + return receiver; } std::future render(LOTPlayerPrivate *impl, diff --git a/src/vector/vdrawable.cpp b/src/vector/vdrawable.cpp index fdeebe8..f057c1f 100644 --- a/src/vector/vdrawable.cpp +++ b/src/vector/vdrawable.cpp @@ -23,7 +23,7 @@ void VDrawable::preprocess() VRle VDrawable::rle() { if (mRleTask.valid()) { - mRle = std::move(mRleTask.get()); + mRle = mRleTask.get(); } return mRle; } diff --git a/src/vector/vraster.cpp b/src/vector/vraster.cpp index e896932..3c17908 100644 --- a/src/vector/vraster.cpp +++ b/src/vector/vraster.cpp @@ -357,12 +357,12 @@ public: auto i = _index++; for (unsigned n = 0; n != _count; ++n) { - if (_q[(i + n) % _count].try_push(task)) return std::move(receiver); + if (_q[(i + n) % _count].try_push(task)) return receiver; } _q[i % _count].push(task); - return std::move(receiver); + return receiver; } std::future strokeRle(const VPath &path, @@ -407,7 +407,7 @@ VRaster::generateFillInfo(const VPath &path, FillRule fillRule) promise.set_value(VRle()); return promise.get_future(); } - return std::move(raster_scheduler.fillRle(path, fillRule)); + return raster_scheduler.fillRle(path, fillRule); } std::future @@ -419,7 +419,7 @@ VRaster::generateStrokeInfo(const VPath &path, CapStyle cap, JoinStyle join, promise.set_value(VRle()); return promise.get_future(); } - return std::move(raster_scheduler.strokeRle(path, cap, join, width, meterLimit)); + return raster_scheduler.strokeRle(path, cap, join, width, meterLimit); } V_END_NAMESPACE diff --git a/src/vector/vtaskqueue.h b/src/vector/vtaskqueue.h index 5318f0e..66bb693 100644 --- a/src/vector/vtaskqueue.h +++ b/src/vector/vtaskqueue.h @@ -15,7 +15,7 @@ public: bool try_pop(Task *&task) { lock_t lock{_mutex, std::try_to_lock}; if (!lock || _q.empty()) return false; - task = std::move(_q.front()); + task = _q.front(); _q.pop_front(); return true; } @@ -43,7 +43,7 @@ public: while (_q.empty() && !_done) _ready.wait(lock); if (_q.empty()) return false; - task = std::move(_q.front()); + task = _q.front(); _q.pop_front(); return true; } -- 2.34.1