1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix distance field rendering of very wide glyphs

Browse Source 
When glyph width more then 256 (8bits), this glyph
will be rendered with artefacts.

Task-number: QTBUG-51714
Change-Id: Id606c90c7968a8db75732abc502ca8dcd46b38ba
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
This commit is contained in:
Valery Volgutov 2017-02-01 16:53:40 +03:00
parent a9cb5e1ab6
commit 7190f2fd02
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/gui/text/qdistancefield.cpp
View File

@ -437,7 +437,7 @@ static void drawPolygons(qint32 *bits, int width, int height, const QPoint *vert
{ {
Q_ASSERT(indexCount != 0); Q_ASSERT(indexCount != 0);
Q_ASSERT(height <= 128); Q_ASSERT(height <= 128);
QVarLengthArray<quint8, 16> scans[128]; QVarLengthArray<quint16, 16> scans[128];
int first = 0; int first = 0;
for (int i = 1; i < indexCount; ++i) { for (int i = 1; i < indexCount; ++i) {
quint32 idx1 = indices[i - 1]; quint32 idx1 = indices[i - 1];
@ -461,16 +461,16 @@ static void drawPolygons(qint32 *bits, int width, int height, const QPoint *vert
for (int y = fromY; y < toY; ++y) { for (int y = fromY; y < toY; ++y) {
quint32 c = quint32(x >> 8); quint32 c = quint32(x >> 8);
if (c < quint32(width)) if (c < quint32(width))
scans[y].append(quint8(c)); scans[y].append(quint16(c));
x += dx; x += dx;
} }
} }
for (int i = 0; i < height; ++i) { for (int i = 0; i < height; ++i) {
quint8 *scanline = scans[i].data(); quint16 *scanline = scans[i].data();
int size = scans[i].size(); int size = scans[i].size();
for (int j = 1; j < size; ++j) { for (int j = 1; j < size; ++j) {
int k = j; int k = j;
quint8 value = scanline[k]; quint16 value = scanline[k];
for (; k != 0 && value < scanline[k - 1]; --k) for (; k != 0 && value < scanline[k - 1]; --k)
scanline[k] = scanline[k - 1]; scanline[k] = scanline[k - 1];
scanline[k] = value; scanline[k] = value;
@ -478,7 +478,7 @@ static void drawPolygons(qint32 *bits, int width, int height, const QPoint *vert
qint32 *line = bits + i * width; qint32 *line = bits + i * width;
int j = 0; int j = 0;
for (; j + 1 < size; j += 2) { for (; j + 1 < size; j += 2) {
for (quint8 x = scanline[j]; x < scanline[j + 1]; ++x) for (quint16 x = scanline[j]; x < scanline[j + 1]; ++x)
line[x] = value; line[x] = value;
} }
if (j < size) { if (j < size) {