X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fvideoglwidget.cpp;h=3da19948159ba2cb78ab9f571bfdb7e814c67f95;hb=ac8c99168f151e2f351043d13500741ce1ca8966;hp=52a698923d5e699da1021de8f63b1cfec8f1e063;hpb=25b8bcc770a70a6c2d17f9b94b6c5b9df0c845f4;p=kdenlive diff --git a/src/videoglwidget.cpp b/src/videoglwidget.cpp index 52a69892..3da19948 100644 --- a/src/videoglwidget.cpp +++ b/src/videoglwidget.cpp @@ -14,6 +14,10 @@ VideoGLWidget::VideoGLWidget(QWidget *parent) : QGLWidget(parent) + , x(0) + , y(0) + , w(width()) + , h(height()) , m_image_width(0) , m_image_height(0) , m_texture(0) @@ -125,7 +129,7 @@ void VideoGLWidget::paintGL() } } -void VideoGLWidget::showImage(QImage image) +void VideoGLWidget::showImage(const QImage &image) { m_image_width = image.width(); m_image_height = image.height(); @@ -138,7 +142,7 @@ void VideoGLWidget::showImage(QImage image) glBindTexture(GL_TEXTURE_RECTANGLE_EXT, m_texture); glTexParameteri(GL_TEXTURE_RECTANGLE_EXT, GL_TEXTURE_MIN_FILTER, GL_LINEAR); glTexParameterf(GL_TEXTURE_RECTANGLE_EXT, GL_TEXTURE_MAG_FILTER, GL_LINEAR); - glTexImage2D(GL_TEXTURE_RECTANGLE_EXT, 0, GL_RGBA8, m_image_width, m_image_height, 0, GL_RGBA, + glTexImage2D(GL_TEXTURE_RECTANGLE_EXT, 0, GL_RGBA8, m_image_width, m_image_height, 0, GL_RGB, GL_UNSIGNED_BYTE, image.bits()); updateGL(); } @@ -190,3 +194,5 @@ void VideoGLWidget::mouseDoubleClickEvent(QMouseEvent * event) event->accept(); } + +#include "videoglwidget.moc"