From 3fc0189e209738f3119fbce62221aa2cc6afc8f2 Mon Sep 17 00:00:00 2001 From: Laurent Pinchart Date: Mon, 29 Apr 2019 20:41:46 +0300 Subject: libcamera: pipeline: Unify naming of configurations in pipeline handlers MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Name all instances of CameraConfiguration "config", and all instances of StreamConfiguration "cfg" accross all pipeline handlers. Signed-off-by: Laurent Pinchart Reviewed-by: Niklas Söderlund --- src/libcamera/camera.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/libcamera/camera.cpp') diff --git a/src/libcamera/camera.cpp b/src/libcamera/camera.cpp index 6b74eb8e..cb45bafe 100644 --- a/src/libcamera/camera.cpp +++ b/src/libcamera/camera.cpp @@ -129,10 +129,10 @@ bool CameraConfiguration::isValid() const return false; for (auto const &it : config_) { - const StreamConfiguration &conf = it.second; + const StreamConfiguration &cfg = it.second; - if (conf.size.width == 0 || conf.size.height == 0 || - conf.pixelFormat == 0 || conf.bufferCount == 0) + if (cfg.size.width == 0 || cfg.size.height == 0 || + cfg.pixelFormat == 0 || cfg.bufferCount == 0) return false; } -- cgit v1.2.1