summaryrefslogtreecommitdiffstats
path: root/src/gui
diff options
context:
space:
mode:
authorKonstantin Ritt <ritt.ks@gmail.com>2012-10-08 18:20:50 +0300
committerThe Qt Project <gerrit-noreply@qt-project.org>2012-10-10 13:24:17 +0200
commit34c31cd74cde7a1c36f3603a625fb0d28c259a6e (patch)
tree64fafbc160b5a32ffafdca035932d83098f21701 /src/gui
parent06332df7438c8d2215b02f1e01ce2ed28a49a320 (diff)
Avoid warnings about an unreachable code
Change-Id: I57c2967db4c1bd2c39ecb3eac9b18eb7455c6a50 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Diffstat (limited to 'src/gui')
-rw-r--r--src/gui/painting/qtextureglyphcache.cpp5
1 files changed, 1 insertions, 4 deletions
diff --git a/src/gui/painting/qtextureglyphcache.cpp b/src/gui/painting/qtextureglyphcache.cpp
index ed0e92ecea..43243b7c34 100644
--- a/src/gui/painting/qtextureglyphcache.cpp
+++ b/src/gui/painting/qtextureglyphcache.cpp
@@ -275,10 +275,7 @@ QImage QTextureGlyphCache::textureMapForGlyph(glyph_t g, QFixed subPixelPosition
{
if (m_type == QFontEngineGlyphCache::Raster_RGBMask)
return m_current_fontengine->alphaRGBMapForGlyph(g, subPixelPosition, m_transform);
- else
- return m_current_fontengine->alphaMapForGlyph(g, subPixelPosition, m_transform);
-
- return QImage();
+ return m_current_fontengine->alphaMapForGlyph(g, subPixelPosition, m_transform);
}
/************************************************************************