diff options
author | Laurent Pinchart <laurent.pinchart@ideasonboard.com> | 2020-03-22 12:53:13 +0200 |
---|---|---|
committer | Laurent Pinchart <laurent.pinchart@ideasonboard.com> | 2020-03-24 10:33:42 +0200 |
commit | acd02afab0298bc91099fa280f13775e8e5e315b (patch) | |
tree | 9108fc21b0e5b3d2d5239a97ab0d1e34b00b81b9 /src/qcam/viewfinder.h | |
parent | ac02d741dceb081d1166b78e13f180a3a375579d (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.h')
-rw-r--r-- | src/qcam/viewfinder.h | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/src/qcam/viewfinder.h b/src/qcam/viewfinder.h index 0549f038..a019c3a4 100644 --- a/src/qcam/viewfinder.h +++ b/src/qcam/viewfinder.h @@ -8,6 +8,7 @@ #define __QCAM_VIEWFINDER_H__ #include <QMutex> +#include <QSize> #include <QWidget> #include <libcamera/pixelformats.h> @@ -22,8 +23,7 @@ public: ViewFinder(QWidget *parent); ~ViewFinder(); - int setFormat(const libcamera::PixelFormat &format, unsigned int width, - unsigned int height); + int setFormat(const libcamera::PixelFormat &format, const QSize &size); void display(const unsigned char *rgb, size_t size); QImage getCurrentImage(); @@ -33,12 +33,11 @@ protected: QSize sizeHint() const override; private: - libcamera::PixelFormat format_; - unsigned int width_; - unsigned int height_; - FormatConverter converter_; + libcamera::PixelFormat format_; + QSize size_; + QImage *image_; QMutex mutex_; /* Prevent concurrent access to image_ */ }; |