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

Reset pointer to 0 after freeing

Browse Source 
set m_textureResource to 0 after freeing it, to
ensure we allocate a new one two lines below before
using it again 5 lines below.

Change-Id: Ib9c4de94aefed91f15d0fab0cd3c774a64f2f891
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
This commit is contained in:
Lars Knoll 2012-04-30 11:56:45 +02:00 committed by Qt by Nokia
parent 715e9caf19
commit c56e756aa9
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/gui/opengl/qopengltextureglyphcache.cpp
View File

@ -106,8 +106,10 @@ void QOpenGLTextureGlyphCache::createTextureData(int width, int height)
if (height < 16)
height = 16;
if (m_textureResource && !m_textureResource->m_texture)
if (m_textureResource && !m_textureResource->m_texture) {
delete m_textureResource;
m_textureResource = 0;
}
if (!m_textureResource)
m_textureResource = new QOpenGLGlyphTexture(ctx);

4
src/opengl/gl2paintengineex/qtextureglyphcache_gl.cpp
View File

@ -105,8 +105,10 @@ void QGLTextureGlyphCache::createTextureData(int width, int height)
if (height < 16)
height = 16;
if (m_textureResource && !m_textureResource->m_texture)
if (m_textureResource && !m_textureResource->m_texture) {
delete m_textureResource;
m_textureResource = 0;
}
if (!m_textureResource)
m_textureResource = new QGLGlyphTexture(ctx);