From c6cbe507c1b741c145df015fe8fa73faa35c6c1a Mon Sep 17 00:00:00 2001
From: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Date: Mon, 23 Mar 2020 02:34:36 +0200
Subject: qcam: viewfinder: Embed QImage in ViewFinder

The QImage class is a thin wrapper that uses implicit sharing. We can
thus embed it in the ViewFinder class instead of allocating it
dynamically, and assign it at runtime. This simplifies the code.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
---
 src/qcam/viewfinder.cpp | 12 +++++-------
 src/qcam/viewfinder.h   |  3 ++-
 2 files changed, 7 insertions(+), 8 deletions(-)

(limited to 'src/qcam')

diff --git a/src/qcam/viewfinder.cpp b/src/qcam/viewfinder.cpp
index 2a35932e..e7b12015 100644
--- a/src/qcam/viewfinder.cpp
+++ b/src/qcam/viewfinder.cpp
@@ -16,13 +16,12 @@
 #include "format_converter.h"
 
 ViewFinder::ViewFinder(QWidget *parent)
-	: QWidget(parent), format_(0), image_(nullptr)
+	: QWidget(parent), format_(0)
 {
 }
 
 ViewFinder::~ViewFinder()
 {
-	delete image_;
 }
 
 void ViewFinder::render(libcamera::FrameBuffer *buffer, MappedBuffer *map)
@@ -41,7 +40,7 @@ void ViewFinder::render(libcamera::FrameBuffer *buffer, MappedBuffer *map)
 	 */
 
 	converter_.convert(static_cast<unsigned char *>(map->memory),
-			   buffer->metadata().planes[0].bytesused, image_);
+			   buffer->metadata().planes[0].bytesused, &image_);
 	update();
 
 	renderComplete(buffer);
@@ -51,7 +50,7 @@ QImage ViewFinder::getCurrentImage()
 {
 	QMutexLocker locker(&mutex_);
 
-	return image_->copy();
+	return image_.copy();
 }
 
 int ViewFinder::setFormat(const libcamera::PixelFormat &format,
@@ -66,8 +65,7 @@ int ViewFinder::setFormat(const libcamera::PixelFormat &format,
 	format_ = format;
 	size_ = size;
 
-	delete image_;
-	image_ = new QImage(size_, QImage::Format_RGB32);
+	image_ = QImage(size_, QImage::Format_RGB32);
 
 	updateGeometry();
 	return 0;
@@ -76,7 +74,7 @@ int ViewFinder::setFormat(const libcamera::PixelFormat &format,
 void ViewFinder::paintEvent(QPaintEvent *)
 {
 	QPainter painter(this);
-	painter.drawImage(rect(), *image_, image_->rect());
+	painter.drawImage(rect(), image_, image_.rect());
 }
 
 QSize ViewFinder::sizeHint() const
diff --git a/src/qcam/viewfinder.h b/src/qcam/viewfinder.h
index 784fcced..54c0fa9d 100644
--- a/src/qcam/viewfinder.h
+++ b/src/qcam/viewfinder.h
@@ -9,6 +9,7 @@
 
 #include <stddef.h>
 
+#include <QImage>
 #include <QMutex>
 #include <QSize>
 #include <QWidget>
@@ -51,7 +52,7 @@ private:
 	libcamera::PixelFormat format_;
 	QSize size_;
 
-	QImage *image_;
+	QImage image_;
 	QMutex mutex_; /* Prevent concurrent access to image_ */
 };
 
-- 
cgit v1.2.1