Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8fe3efb6 authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Fix bugprone-use-after-move warnings" am: 1c7e6769 am: e59bd9e1 

Change-Id: Ib55852613336c4def111922b010f938fa7eec14b
parents 211430dc e59bd9e1

camera/device/3.2/default/CameraDeviceSession.cpp

+2 −1
Original line number Diff line number Diff line
@@ -790,8 +790,9 @@ void CameraDeviceSession::ResultBatcher::processCaptureResult(CaptureResult& res 
            auto it = batch->mBatchBufs.find(buffer.streamId);

            if (it != batch->mBatchBufs.end()) {

                InflightBatch::BufferBatch& bb = it->second;

                auto id = buffer.streamId;

                pushStreamBuffer(std::move(buffer), bb.mBuffers);

                filledStreams.push_back(buffer.streamId);

                filledStreams.push_back(id);

            } else {

                pushStreamBuffer(std::move(buffer), nonBatchedBuffers);

            }

camera/device/3.4/default/CameraDeviceSession.cpp

+2 −1
Original line number Diff line number Diff line
@@ -656,8 +656,9 @@ void CameraDeviceSession::ResultBatcher_3_4::processCaptureResult_3_4(CaptureRes 
            auto it = batch->mBatchBufs.find(buffer.streamId);

            if (it != batch->mBatchBufs.end()) {

                InflightBatch::BufferBatch& bb = it->second;

                auto id = buffer.streamId;

                pushStreamBuffer(std::move(buffer), bb.mBuffers);

                filledStreams.push_back(buffer.streamId);

                filledStreams.push_back(id);

            } else {

                pushStreamBuffer(std::move(buffer), nonBatchedBuffers);

            }