From 80e236e19b61a1267948433fd6855da138d6f527 Mon Sep 17 00:00:00 2001 From: Laurent Pinchart Date: Fri, 29 Mar 2019 17:20:07 +0200 Subject: qcam: Add JPEG format support MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit When the camera provides MJPEG, use the QImage JPEG decompression code to convert that to RGB. Signed-off-by: Laurent Pinchart Tested-by: Kieran Bingham Reviewed-by: Kieran Bingham Reviewed-by: Niklas Söderlund --- src/qcam/viewfinder.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/qcam/viewfinder.cpp') diff --git a/src/qcam/viewfinder.cpp b/src/qcam/viewfinder.cpp index 5841dc03..224a227d 100644 --- a/src/qcam/viewfinder.cpp +++ b/src/qcam/viewfinder.cpp @@ -16,9 +16,9 @@ ViewFinder::ViewFinder(QWidget *parent) { } -void ViewFinder::display(const unsigned char *raw) +void ViewFinder::display(const unsigned char *raw, size_t size) { - converter_.convert(raw, image_->bits()); + converter_.convert(raw, size, image_); QPixmap pixmap = QPixmap::fromImage(*image_); setPixmap(pixmap); -- cgit v1.2.1