[libcamera-devel,v2,18/21] qcam: viewfinder: Reorder methods to match header file
diff mbox series

Message ID 20200323173559.21109-19-laurent.pinchart@ideasonboard.com
State Accepted
Headers show
Series
  • qcam: Bypass format conversion when not required
Related show

Commit Message

Laurent Pinchart March 23, 2020, 5:35 p.m. UTC 
Reorder the methods in viewfinder.cpp to match the order in
viewfinder.h. No code change.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
---
 src/qcam/viewfinder.cpp | 36 ++++++++++++++++++------------------
 1 file changed, 18 insertions(+), 18 deletions(-)

Patch
diff mbox series 

diff --git a/src/qcam/viewfinder.cpp b/src/qcam/viewfinder.cpp
index c4471ffa4a06..31b358da47dc 100644
--- a/src/qcam/viewfinder.cpp
+++ b/src/qcam/viewfinder.cpp
@@ -24,6 +24,24 @@  ViewFinder::~ViewFinder()
 {
 }
 
+int ViewFinder::setFormat(const libcamera::PixelFormat &format,
+			  const QSize &size)
+{
+	int ret;
+
+	ret = converter_.configure(format, size);
+	if (ret < 0)
+		return ret;
+
+	format_ = format;
+	size_ = size;
+
+	image_ = QImage(size_, QImage::Format_RGB32);
+
+	updateGeometry();
+	return 0;
+}
+
 void ViewFinder::render(libcamera::FrameBuffer *buffer, MappedBuffer *map)
 {
 	if (buffer->planes().size() != 1) {
@@ -53,24 +71,6 @@  QImage ViewFinder::getCurrentImage()
 	return image_.copy();
 }
 
-int ViewFinder::setFormat(const libcamera::PixelFormat &format,
-			  const QSize &size)
-{
-	int ret;
-
-	ret = converter_.configure(format, size);
-	if (ret < 0)
-		return ret;
-
-	format_ = format;
-	size_ = size;
-
-	image_ = QImage(size_, QImage::Format_RGB32);
-
-	updateGeometry();
-	return 0;
-}
-
 void ViewFinder::paintEvent(QPaintEvent *)
 {
 	QPainter painter(this);