diff --git a/src/cameramanager.cpp b/src/cameramanager.cpp index 6490022..a370ffc 100644 --- a/src/cameramanager.cpp +++ b/src/cameramanager.cpp @@ -50,7 +50,8 @@ void CameraManager::connectCamera(unsigned int index) { // The capture callback is a wrapper to emit the frameCaptured signal. void CameraManager::captureCallback(FlyCapture2::Image* image, const void *camManager) { - QMutex mutex; + //thread Safe + static QMutex mutex; mutex.lock(); if(camManager) { diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp index c89df1d..cadaefe 100644 --- a/src/mainwindow.cpp +++ b/src/mainwindow.cpp @@ -138,12 +138,10 @@ void MainWindow::displayPreview(FlyCapture2::Image* last_capture) { qDebug() << 1; FlyCapture2::Image tmp_i; - qDebug() << last_capture->GetCols(); - //FlyCapture2::Error e = last_capture->Convert(FlyCapture2::PixelFormat::PIXEL_FORMAT_RGB16, &tmp_i); + FlyCapture2::Error e = last_capture->Convert(FlyCapture2::PixelFormat::PIXEL_FORMAT_RGB16, &tmp_i); - - /*qDebug() << 2; + qDebug() << 2; QImage tmp(tmp_i.GetData(), last_capture->GetCols(), last_capture->GetRows(), QImage::Format::Format_RGB16); qDebug() << 3; @@ -153,5 +151,4 @@ void MainWindow::displayPreview(FlyCapture2::Image* last_capture) { last_preview.convertFromImage(tmp); ui->preview_widget->setPixmap(last_preview); - */ }