PawletOS/external_libcamera
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

libcamera: pipeline: Use existing variable definitions

Browse Source 
Prevent variable shadowing by removing the redeclaration of variables
with the same name (and type) where the existing variable can be reused.

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:
Kieran Bingham
2020-10-13 15:58:26 +01:00
parent d3f60c8458
commit 4bd8d15f96
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/libcamera/pipeline/raspberrypi/raspberrypi.cpp
View File

@@ -1008,7 +1008,7 @@ int PipelineHandlerRPi::queueAllBuffers(Camera *camera)
*/
unsigned int i;
for (i = 0; i < data->dropFrameCount_; i++) {
int ret = stream->queueBuffer(nullptr);
ret = stream->queueBuffer(nullptr);
if (ret)
return ret;
}

4
src/libcamera/pipeline/simple/simple.cpp
View File

@@ -612,8 +612,8 @@ int SimplePipelineHandler::configure(Camera *camera, CameraConfiguration *c)
useConverter_ = config->needConversion();
if (useConverter_) {
int ret = converter_->configure(pipeConfig.pixelFormat,
pipeConfig.captureSize, &cfg);
ret = converter_->configure(pipeConfig.pixelFormat,
pipeConfig.captureSize, &cfg);
if (ret < 0) {
LOG(SimplePipeline, Error)
<< "Unable to configure converter";