Don't use QPixmap in the worker thread.

Author: juzzlin

src/Editor.cpp

@@ -66,7 +66,7 @@ void Editor::setImage(QImage image)
     imageItem->setPos(m_pixmap.width() / 2, m_pixmap.height() / 2);
 
     // Renderer is a thread so use invokeMethod to safely set the input.
-    QMetaObject::invokeMethod(m_renderer, "setInput", Q_ARG(QPixmap, m_pixmap));
+    QMetaObject::invokeMethod(m_renderer, "setInput", Q_ARG(QImage, image));
 }
 
 void Editor::quit()

src/RenderPreview.cpp

@@ -30,7 +30,7 @@ RenderPreview::RenderPreview(Renderer & renderer, QWidget* parent)
     setScene(&m_scene);
     setBackgroundBrush(QBrush(Qt::black));
 
-    connect(&m_renderer, SIGNAL(processingFinished(const QPixmap &)), this, SLOT(updatePreview(const QPixmap &)));
+    connect(&m_renderer, SIGNAL(processingFinished(const QImage &)), this, SLOT(updatePreview(const QImage &)));
 }
 
 RenderPreview::~RenderPreview()
@@ -52,10 +52,12 @@ void RenderPreview::render()
     QMetaObject::invokeMethod(&m_renderer, "render");
 }
 
-void RenderPreview::updatePreview(const QPixmap & result)
+void RenderPreview::updatePreview(const QImage & result)
 {
     m_scene.clear();
-    QGraphicsPixmapItem* item = m_scene.addPixmap(result);
+    QPixmap pixmap;
+    pixmap.fromImage(result);
+    QGraphicsPixmapItem* item = m_scene.addPixmap(pixmap);
     item->setPos(0, 0);
 }
 

src/RenderPreview.hpp

@@ -40,7 +40,7 @@ public slots:
 
 private slots:
 
-    void updatePreview(const QPixmap & result);
+    void updatePreview(const QImage & result);
 
 signals:
 

src/Renderer.cpp

@@ -152,15 +152,14 @@ void Renderer::render()
         }
     }
 
-    m_output.convertFromImage(m_result);
-    emit processingFinished(m_output);
+    emit processingFinished(m_result);
 }
 
-void Renderer::setInput(const QPixmap & input)
+void Renderer::setInput(const QImage & input)
 {
     m_width  = input.width();
     m_height = input.height();
-    m_image  = input.toImage();
+    m_image  = input;
     m_result = QImage(m_width, m_height, QImage::Format_ARGB32);
     m_map    = buildHeightMap();
 }

src/Renderer.hpp

@@ -16,7 +16,6 @@
 #ifndef RENDERER_HPP
 #define RENDERER_HPP
 
-#include <QPixmap>
 #include <QImage>
 #include <QObject>
 #include <QVector3D>
@@ -43,15 +42,15 @@ public slots:
 
     void render();
 
-    void setInput(const QPixmap & input);
+    void setInput(const QImage & input);
 
     void setAmplitude(float amplitude);
 
     void setRadius(float radius);
 
 signals:
 
-    void processingFinished(const QPixmap & result);
+    void processingFinished(const QImage & result);
 
 private:
 
@@ -65,7 +64,6 @@ public slots:
 
     QImage              m_image;
     QImage              m_result;
-    QPixmap             m_output;
     Renderer::HeightMap m_map;
     int                 m_width;
     int                 m_height;