diff options
Diffstat (limited to 'src/gui/painting')
-rw-r--r-- | src/gui/painting/qpaintengine_raster.cpp | 4 | ||||
-rw-r--r-- | src/gui/painting/qtextureglyphcache.cpp | 27 | ||||
-rw-r--r-- | src/gui/painting/qtextureglyphcache_p.h | 5 |
3 files changed, 8 insertions, 28 deletions
diff --git a/src/gui/painting/qpaintengine_raster.cpp b/src/gui/painting/qpaintengine_raster.cpp index e49bd229e7..d5449a7eb5 100644 --- a/src/gui/painting/qpaintengine_raster.cpp +++ b/src/gui/painting/qpaintengine_raster.cpp @@ -2752,13 +2752,13 @@ bool QRasterPaintEngine::drawCachedGlyphs(int numGlyphs, const glyph_t *glyphs, const uchar *bits = image.bits(); for (int i=0; i<numGlyphs; ++i) { - QFixed subPixelPosition = cache->subPixelPositionForX(positions[i].x); + QFixed subPixelPosition = fontEngine->subPixelPositionForX(positions[i].x); QTextureGlyphCache::GlyphAndSubPixelPosition glyph(glyphs[i], subPixelPosition); const QTextureGlyphCache::Coord &c = cache->coords[glyph]; if (c.isNull()) continue; - int x = qFloor(positions[i].x + offs) + c.baseLineX - margin; + int x = qFloor(positions[i].x) + c.baseLineX - margin; int y = qFloor(positions[i].y + offs) - c.baseLineY - margin; // printf("drawing [%d %d %d %d] baseline [%d %d], glyph: %d, to: %d %d, pos: %d %d\n", diff --git a/src/gui/painting/qtextureglyphcache.cpp b/src/gui/painting/qtextureglyphcache.cpp index 5876f3bf93..1e0ed0f798 100644 --- a/src/gui/painting/qtextureglyphcache.cpp +++ b/src/gui/painting/qtextureglyphcache.cpp @@ -99,23 +99,6 @@ int QTextureGlyphCache::calculateSubPixelPositionCount(glyph_t glyph) const return images.size(); } -QFixed QTextureGlyphCache::subPixelPositionForX(QFixed x) const -{ - if (m_subPixelPositionCount <= 1) - return QFixed(); - - QFixed subPixelPosition; - if (x != 0) { - subPixelPosition = x - x.floor(); - QFixed fraction = (subPixelPosition / QFixed::fromReal(1.0 / m_subPixelPositionCount)).floor(); - - // Compensate for precision loss in fixed point to make sure we are always drawing at a subpixel position over - // the lower boundary for the selected rasterization by adding 1/64. - subPixelPosition = fraction / QFixed(m_subPixelPositionCount) + QFixed::fromReal(0.015625); - } - return subPixelPosition; -} - bool QTextureGlyphCache::populate(QFontEngine *fontEngine, int numGlyphs, const glyph_t *glyphs, const QFixedPoint *positions) { @@ -129,13 +112,13 @@ bool QTextureGlyphCache::populate(QFontEngine *fontEngine, int numGlyphs, const const int paddingDoubled = glyphPadding() * 2; bool supportsSubPixelPositions = fontEngine->supportsSubPixelPositions(); - if (m_subPixelPositionCount == 0) { + if (fontEngine->m_subPixelPositionCount == 0) { if (!supportsSubPixelPositions) { - m_subPixelPositionCount = 1; + fontEngine->m_subPixelPositionCount = 1; } else { int i = 0; - while (m_subPixelPositionCount == 0 && i < numGlyphs) - m_subPixelPositionCount = calculateSubPixelPositionCount(glyphs[i++]); + while (fontEngine->m_subPixelPositionCount == 0 && i < numGlyphs) + fontEngine->m_subPixelPositionCount = calculateSubPixelPositionCount(glyphs[i++]); } } @@ -156,7 +139,7 @@ bool QTextureGlyphCache::populate(QFontEngine *fontEngine, int numGlyphs, const QFixed subPixelPosition; if (supportsSubPixelPositions) { QFixed x = positions != 0 ? positions[i].x : QFixed(); - subPixelPosition = subPixelPositionForX(x); + subPixelPosition = fontEngine->subPixelPositionForX(x); } if (coords.contains(GlyphAndSubPixelPosition(glyph, subPixelPosition))) diff --git a/src/gui/painting/qtextureglyphcache_p.h b/src/gui/painting/qtextureglyphcache_p.h index bc5eebbecb..d9d57f41ab 100644 --- a/src/gui/painting/qtextureglyphcache_p.h +++ b/src/gui/painting/qtextureglyphcache_p.h @@ -81,7 +81,7 @@ class Q_GUI_EXPORT QTextureGlyphCache : public QFontEngineGlyphCache public: QTextureGlyphCache(QFontEngineGlyphCache::Type type, const QTransform &matrix) : QFontEngineGlyphCache(matrix, type), m_current_fontengine(0), - m_w(0), m_h(0), m_cx(0), m_cy(0), m_currentRowHeight(0), m_subPixelPositionCount(0) + m_w(0), m_h(0), m_cx(0), m_cy(0), m_currentRowHeight(0) { } virtual ~QTextureGlyphCache() { } @@ -146,8 +146,6 @@ public: QImage textureMapForGlyph(glyph_t g, QFixed subPixelPosition) const; - QFixed subPixelPositionForX(QFixed x) const; - protected: int calculateSubPixelPositionCount(glyph_t) const; @@ -159,7 +157,6 @@ protected: int m_cx; // current x int m_cy; // current y int m_currentRowHeight; // Height of last row - int m_subPixelPositionCount; // Number of positions within a single pixel for this cache }; inline uint qHash(const QTextureGlyphCache::GlyphAndSubPixelPosition &g) |