summaryrefslogtreecommitdiffstats
path: root/src/gui/text/qfontengine_qpf.cpp
diff options
context:
space:
mode:
authorMarius Storm-Olsen <marius.storm-olsen@nokia.com>2009-11-09 11:38:17 (GMT)
committerMarius Storm-Olsen <marius.storm-olsen@nokia.com>2009-11-09 11:38:17 (GMT)
commite9a06e6f9765c9632103c86fe190e8154ce4a9f8 (patch)
treecc9fc9c931423674081b6ab843d22bc643a5df64 /src/gui/text/qfontengine_qpf.cpp
parent00aeefeeaff4d8c3e25c6f388c5e51c239541f87 (diff)
parenta2a3adf7de2ffc9784fea177a43f3124862a992a (diff)
downloadQt-e9a06e6f9765c9632103c86fe190e8154ce4a9f8.zip
Qt-e9a06e6f9765c9632103c86fe190e8154ce4a9f8.tar.gz
Qt-e9a06e6f9765c9632103c86fe190e8154ce4a9f8.tar.bz2
Merge branch '4.6-api-review' into 4.6
Diffstat (limited to 'src/gui/text/qfontengine_qpf.cpp')
-rw-r--r--src/gui/text/qfontengine_qpf.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gui/text/qfontengine_qpf.cpp b/src/gui/text/qfontengine_qpf.cpp
index 94974fc..f978bd8 100644
--- a/src/gui/text/qfontengine_qpf.cpp
+++ b/src/gui/text/qfontengine_qpf.cpp
@@ -938,7 +938,7 @@ void QFontEngineQPF::loadGlyph(glyph_t glyph)
g.advance = qRound(metrics.xoff);
QT_WRITE(fd, &g, sizeof(g));
- QT_WRITE(fd, img.bits(), img.numBytes());
+ QT_WRITE(fd, img.bits(), img.byteCount());
glyphPos = oldSize - glyphDataOffset;
#if 0 && defined(DEBUG_FONTENGINE)
@@ -948,7 +948,7 @@ void QFontEngineQPF::loadGlyph(glyph_t glyph)
quint32 *gmap = (quint32 *)(fontData + glyphMapOffset);
gmap[glyph] = qToBigEndian(glyphPos);
- glyphDataSize = glyphPos + sizeof(g) + img.numBytes();
+ glyphDataSize = glyphPos + sizeof(g) + img.byteCount();
quint32 *blockSizePtr = (quint32 *)(fontData + glyphDataOffset - 4);
*blockSizePtr = qToBigEndian(glyphDataSize);
}