summaryrefslogtreecommitdiffstats
path: root/src/gui/painting/qtextureglyphcache_p.h
diff options
context:
space:
mode:
authorGunnar Sletta <gunnar@trolltech.com>2009-12-09 14:15:35 (GMT)
committerGunnar Sletta <gunnar@trolltech.com>2009-12-09 14:15:35 (GMT)
commit0c30418556d978f730c33aa3bb066961981ccc9b (patch)
tree68a65f43d1152a4e96ae3736edae89309ca608cf /src/gui/painting/qtextureglyphcache_p.h
parent9f3cde38bffb79da82d6248a873a687d37177954 (diff)
downloadQt-0c30418556d978f730c33aa3bb066961981ccc9b.zip
Qt-0c30418556d978f730c33aa3bb066961981ccc9b.tar.gz
Qt-0c30418556d978f730c33aa3bb066961981ccc9b.tar.bz2
Fix crash when rotating cleartype text under gl engine.
Reviewed-by: Eskil
Diffstat (limited to 'src/gui/painting/qtextureglyphcache_p.h')
-rw-r--r--src/gui/painting/qtextureglyphcache_p.h5
1 files changed, 1 insertions, 4 deletions
diff --git a/src/gui/painting/qtextureglyphcache_p.h b/src/gui/painting/qtextureglyphcache_p.h
index 57473d1..bb0c630 100644
--- a/src/gui/painting/qtextureglyphcache_p.h
+++ b/src/gui/painting/qtextureglyphcache_p.h
@@ -76,7 +76,7 @@ class Q_GUI_EXPORT QTextureGlyphCache : public QFontEngineGlyphCache
{
public:
QTextureGlyphCache(QFontEngineGlyphCache::Type type, const QTransform &matrix)
- : QFontEngineGlyphCache(matrix), m_w(0), m_h(0), m_cx(0), m_cy(0), m_type(type) { }
+ : QFontEngineGlyphCache(matrix, type), m_w(0), m_h(0), m_cx(0), m_cy(0) { }
virtual ~QTextureGlyphCache() { }
@@ -98,8 +98,6 @@ public:
virtual void resizeTextureData(int width, int height) = 0;
virtual int glyphMargin() const { return 0; }
- QFontEngineGlyphCache::Type cacheType() const { return m_type; }
-
virtual void fillTexture(const Coord &coord, glyph_t glyph) = 0;
inline void createCache(int width, int height) {
@@ -121,7 +119,6 @@ protected:
int m_h; // image height
int m_cx; // current x
int m_cy; // current y
- QFontEngineGlyphCache::Type m_type;
};