From 8032423bb8fa91c623ece61bff528adfd49e8685 Mon Sep 17 00:00:00 2001 From: Eskil Abrahamsen Blomfeldt Date: Wed, 10 Feb 2010 12:28:27 +0100 Subject: Revert 004b09ffd423cd3100e346825dd7d730fc86d366 Changing the height here will make the coords out of sync with the ' buffer, causing broken drawing. I revert this change to prepare QStaticText for integration, and will revisit it later on. --- src/opengl/gl2paintengineex/qtextureglyphcache_gl.cpp | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/src/opengl/gl2paintengineex/qtextureglyphcache_gl.cpp b/src/opengl/gl2paintengineex/qtextureglyphcache_gl.cpp index 53c627f..6cb76ee 100644 --- a/src/opengl/gl2paintengineex/qtextureglyphcache_gl.cpp +++ b/src/opengl/gl2paintengineex/qtextureglyphcache_gl.cpp @@ -70,12 +70,8 @@ QGLTextureGlyphCache::~QGLTextureGlyphCache() } } -void QGLTextureGlyphCache::createTextureData(int width, int unalteredHeight) +void QGLTextureGlyphCache::createTextureData(int width, int height) { - extern int qt_next_power_of_two(int v); - // Set height to lowest POT number which is higher than or equal to height - int height = qt_next_power_of_two(unalteredHeight); - glGenTextures(1, &m_texture); glBindTexture(GL_TEXTURE_2D, m_texture); -- cgit v0.12