AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Don't crash when source or target is null

Browse Source 
Change-Id: I4992867ad764bd1bd175478c6be1094ca8a72812
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
This commit is contained in:
Gunnar Sletta 2012-01-26 11:15:02 +01:00 committed by Qt by Nokia
parent 65733af6aa
commit 3fe3d1dfdd
1 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/gui/opengl/qopenglframebufferobject.cpp
View File

@ -1142,8 +1142,24 @@ void QOpenGLFramebufferObject::blitFramebuffer(QOpenGLFramebufferObject *target,
QOpenGLFramebufferObject *source, QOpenGLFramebufferObject *source,
GLbitfield buffers, GLenum filter) GLbitfield buffers, GLenum filter)
{ {
blitFramebuffer(target, QRect(QPoint(0, 0), target->size()), if (!target && !source)
source, QRect(QPoint(0, 0), source->size()), return;
QSize targetSize;
QSize sourceSize;
if (target)
targetSize = target->size();
if (source)
sourceSize = source->size();
if (targetSize.isEmpty())
targetSize = sourceSize;
else if (sourceSize.isEmpty())
sourceSize = targetSize;
blitFramebuffer(target, QRect(QPoint(0, 0), targetSize),
source, QRect(QPoint(0, 0), sourceSize),
buffers, filter); buffers, filter);
} }