Mirror/libcamera
1
0
Fork 0
mirror of https://git.libcamera.org/libcamera/libcamera.git synced 2025-07-19 18:35:07 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

qcam: viewfinder: Reorder methods to match header file

Browse source 
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>
This commit is contained in:
Laurent Pinchart 2020-03-23 02:34:36 +02:00
parent dc830e0e5f
commit ac828f937e
1 changed files with 18 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

36
src/qcam/viewfinder.cpp
View file

@ -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) void ViewFinder::render(libcamera::FrameBuffer *buffer, MappedBuffer *map)
{ {
if (buffer->planes().size() != 1) { if (buffer->planes().size() != 1) {
@ -53,24 +71,6 @@ QImage ViewFinder::getCurrentImage()
return image_.copy(); 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 *) void ViewFinder::paintEvent(QPaintEvent *)
{ {
QPainter painter(this); QPainter painter(this);