Make QPF's implementation of alphaMapForGlyph() consistent.

The QPF implementation of alphaMapForGlyph() was returning
color values of RGBA = (a, a, a, 255) instead of (0, 0, 0, a),
which was inconsistent with all the other font engines.

This inconsistency caused some QPF-specific workarounds in the
OpenGL and OpenVG paint engines.  This change removes the workarounds
and makes QPF generate the right colors from the start.  Paint
engines that ignore the color table or which don't use the
alphaMapForGlyph() function (e.g. raster) are not affected.

Reviewed-by: Paul

1 files changed, 2 insertions, 2 deletions

diff --git a/src/gui/text/qfontengine_qpf.cpp b/src/gui/text/qfontengine_qpf.cpp
index 996e471ca3..ef3f2ae594 100644
--- a/src/gui/text/qfontengine_qpf.cpp
+++ b/src/gui/text/qfontengine_qpf.cpp
@@ -628,13 +628,13 @@ QImage QFontEngineQPF::alphaMapForGlyph(glyph_t g)
 {
     const Glyph *glyph = findGlyph(g);
     if (!glyph)
-	QImage();
+	return QImage();
 
     const uchar *bits = ((const uchar *) glyph) + sizeof(Glyph);
 
     QImage image(glyph->width, glyph->height, QImage::Format_Indexed8);
     for (int j=0; j<256; ++j)
-	image.setColor(j, 0xff000000 | j | (j<<8) | (j<<16));
+	image.setColor(j, qRgba(0, 0, 0, j));
 
     for (int i=0; i<glyph->height; ++i) {
 	memcpy(image.scanLine(i), bits, glyph->bytesPerLine);