diff options
| author | Laurent Pinchart <laurent.pinchart@ideasonboard.com> | 2020-06-26 05:12:28 +0300 |
|---|---|---|
| committer | Laurent Pinchart <laurent.pinchart@ideasonboard.com> | 2020-07-08 20:55:13 +0300 |
| commit | b5f6a2ce2fae423f40c4bdaf1be43ad5070b3868 (patch) | |
| tree | 6f6f6f2f47a17890a145a0afbb5f93a3f2edb4d3 /src | |
| parent | 61f4296ac749f39896f151221ea0e20876842803 (diff) | |
libcamera: Use Size::isNull()
Use the new Size::isNull() function through the code base to replace
manual checks. While the new code isn't equivalent, as isNull() checks
that both width and height are zero, it catches the same conditions in
practice.
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Umang Jain <email@uajain.com>
Reviewed-by: Niklas Söderlund <niklas.soderlund@ragnatech.se>
Diffstat (limited to 'src')
| -rw-r--r-- | src/libcamera/pipeline/ipu3/ipu3.cpp | 2 | ||||
| -rw-r--r-- | src/libcamera/pipeline/rkisp1/rkisp1.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/libcamera/pipeline/ipu3/ipu3.cpp b/src/libcamera/pipeline/ipu3/ipu3.cpp index 00559ce3..af51fb2d 100644 --- a/src/libcamera/pipeline/ipu3/ipu3.cpp +++ b/src/libcamera/pipeline/ipu3/ipu3.cpp @@ -185,7 +185,7 @@ void IPU3CameraConfiguration::adjustStream(StreamConfiguration &cfg, bool scale) * Provide a suitable default that matches the sensor aspect * ratio. */ - if (!cfg.size.width || !cfg.size.height) { + if (cfg.size.isNull()) { cfg.size.width = 1280; cfg.size.height = 1280 * cio2Configuration_.size.height / cio2Configuration_.size.width; diff --git a/src/libcamera/pipeline/rkisp1/rkisp1.cpp b/src/libcamera/pipeline/rkisp1/rkisp1.cpp index 3c3f3f3a..051d77a6 100644 --- a/src/libcamera/pipeline/rkisp1/rkisp1.cpp +++ b/src/libcamera/pipeline/rkisp1/rkisp1.cpp @@ -506,7 +506,7 @@ CameraConfiguration::Status RkISP1CameraConfiguration::validate() MEDIA_BUS_FMT_SGRBG8_1X8, MEDIA_BUS_FMT_SRGGB8_1X8 }, cfg.size); - if (!sensorFormat_.size.width || !sensorFormat_.size.height) + if (sensorFormat_.size.isNull()) sensorFormat_.size = sensor->resolution(); /* @@ -517,7 +517,7 @@ CameraConfiguration::Status RkISP1CameraConfiguration::validate() */ const Size size = cfg.size; - if (!cfg.size.width || !cfg.size.height) { + if (cfg.size.isNull()) { cfg.size.width = 1280; cfg.size.height = 1280 * sensorFormat_.size.height / sensorFormat_.size.width; |