projects
/
profile
/
ivi
/
qtbase.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
db6db2f
)
Fixed crash due to uninitialized pointer in OpenGL texture glyph cache.
author
Samuel Rødal
<samuel.rodal@nokia.com>
Thu, 6 Oct 2011 10:50:22 +0000
(12:50 +0200)
committer
Qt by Nokia
<qt-info@nokia.com>
Fri, 7 Oct 2011 10:13:34 +0000
(12:13 +0200)
Change-Id: I384f82f1549a81e19566484e12c75ce8df1f314f
Reviewed-on: http://codereview.qt-project.org/6149
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
src/gui/opengl/qopengltextureglyphcache.cpp
patch
|
blob
|
history
diff --git
a/src/gui/opengl/qopengltextureglyphcache.cpp
b/src/gui/opengl/qopengltextureglyphcache.cpp
index
ffce6f5
..
bfeef5a
100644
(file)
--- a/
src/gui/opengl/qopengltextureglyphcache.cpp
+++ b/
src/gui/opengl/qopengltextureglyphcache.cpp
@@
-53,6
+53,7
@@
QBasicAtomicInt qopengltextureglyphcache_serial_number = Q_BASIC_ATOMIC_INITIALI
QOpenGLTextureGlyphCache::QOpenGLTextureGlyphCache(QFontEngineGlyphCache::Type type, const QTransform &matrix)
: QImageTextureGlyphCache(type, matrix)
+ , m_textureResource(0)
, pex(0)
, m_blitProgram(0)
, m_filterMode(Nearest)