lottie/render: fixed std::move copy elision warning

Change-Id: I0eee41225dbc19ee958b7d747d2536532efb3445

diff --git a/src/lottie/lottieitem.cpp b/src/lottie/lottieitem.cpp
index db50b49bfb46602d5e6899caf763c770e1b0e87a..cc5c02ea6acdd181521d2511cf4345ed7e948ea0 100644 (file)
--- 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 e33613991dc7f03b2f65d41fbc3b20c4000c36b8..f2264be686d05d20aa3edcdf7fede3c64591e959 100644 (file)
--- 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<bool> render(LOTPlayerPrivate *impl,

diff --git a/src/vector/vdrawable.cpp b/src/vector/vdrawable.cpp
index fdeebe87dc1292b70638aa4072811f04ea646b97..f057c1f4abc3dd1cae59f4c22e3a326aab2a6810 100644 (file)
--- 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 e896932b85c93cecff978ec1bc933663799cf195..3c17908998224f84db52aa28d8acced2d23d7b88 100644 (file)
--- 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<VRle> 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<VRle>
@@ -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 5318f0edd2bd828673b287f88dc331db26ca4211..66bb6931fe39999345d6d97d40104e766a60b6e0 100644 (file)
--- 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;
     }