qcam: main_window: Explicitly name raw buffer
The buffer obtained for queuing to a raw stream shadows the buffer passed in for the main view finder stream. Prevent shadowing, and explicitly name the buffer as a separate variable. Suggested-by: Niklas Söderlund <niklas.soderlund@ragnatech.se> Signed-off-by: Kieran Bingham <kieran.bingham@ideasonboard.com> Reviewed-by: Niklas Söderlund <niklas.soderlund@ragnatech.se> Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
This commit is contained in:
@@ -769,16 +769,16 @@ void MainWindow::queueRequest(FrameBuffer *buffer)
|
||||
request->addBuffer(vfStream_, buffer);
|
||||
|
||||
if (captureRaw_) {
|
||||
FrameBuffer *buffer = nullptr;
|
||||
FrameBuffer *rawBuffer = nullptr;
|
||||
|
||||
{
|
||||
QMutexLocker locker(&mutex_);
|
||||
if (!freeBuffers_[rawStream_].isEmpty())
|
||||
buffer = freeBuffers_[rawStream_].dequeue();
|
||||
rawBuffer = freeBuffers_[rawStream_].dequeue();
|
||||
}
|
||||
|
||||
if (buffer) {
|
||||
request->addBuffer(rawStream_, buffer);
|
||||
if (rawBuffer) {
|
||||
request->addBuffer(rawStream_, rawBuffer);
|
||||
captureRaw_ = false;
|
||||
} else {
|
||||
qWarning() << "No free buffer available for RAW capture";
|
||||
|
||||
Reference in New Issue
Block a user