summaryrefslogtreecommitdiff
path: root/src/qcam/viewfinder.cpp
diff options
context:
space:
mode:
authorLaurent Pinchart <laurent.pinchart@ideasonboard.com>2020-03-22 12:53:13 +0200
committerLaurent Pinchart <laurent.pinchart@ideasonboard.com>2020-03-24 10:33:42 +0200
commitacd02afab0298bc91099fa280f13775e8e5e315b (patch)
tree9108fc21b0e5b3d2d5239a97ab0d1e34b00b81b9 /src/qcam/viewfinder.cpp
parentac02d741dceb081d1166b78e13f180a3a375579d (diff)
qcam: Use QSize through the code base
Qt has a QSize class to store sizes. Use it to replace width and height where applicable. Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
Diffstat (limited to 'src/qcam/viewfinder.cpp')
-rw-r--r--src/qcam/viewfinder.cpp13
1 files changed, 6 insertions, 7 deletions
diff --git a/src/qcam/viewfinder.cpp b/src/qcam/viewfinder.cpp
index f4602f07..066ac605 100644
--- a/src/qcam/viewfinder.cpp
+++ b/src/qcam/viewfinder.cpp
@@ -15,7 +15,7 @@
#include "format_converter.h"
ViewFinder::ViewFinder(QWidget *parent)
- : QWidget(parent), format_(0), width_(0), height_(0), image_(nullptr)
+ : QWidget(parent), format_(0), image_(nullptr)
{
}
@@ -46,20 +46,19 @@ QImage ViewFinder::getCurrentImage()
}
int ViewFinder::setFormat(const libcamera::PixelFormat &format,
- unsigned int width, unsigned int height)
+ const QSize &size)
{
int ret;
- ret = converter_.configure(format, width, height);
+ ret = converter_.configure(format, size);
if (ret < 0)
return ret;
format_ = format;
- width_ = width;
- height_ = height;
+ size_ = size;
delete image_;
- image_ = new QImage(width, height, QImage::Format_RGB32);
+ image_ = new QImage(size_, QImage::Format_RGB32);
updateGeometry();
return 0;
@@ -73,5 +72,5 @@ void ViewFinder::paintEvent(QPaintEvent *)
QSize ViewFinder::sizeHint() const
{
- return image_ ? image_->size() : QSize(640, 480);
+ return size_.isValid() ? size_ : QSize(640, 480);
}