diff options
| author | Frans Englich <frans.englich@nokia.com> | 2009-11-16 12:00:14 (GMT) |
|---|---|---|
| committer | Frans Englich <frans.englich@nokia.com> | 2009-11-16 12:00:14 (GMT) |
| commit | 6df2f295c7efddac12de87f8bfa347ab28761a6b (patch) | |
| tree | 10c66cf4e407b3c05ba96b441b72bb00b7be1fc4 /tools/makeqpf/qpf2.cpp | |
| parent | 15e2b2d753250bbe01a78d9ece37f0f0b08cd21c (diff) | |
| parent | 2b60b542a5f51cb983e4ad99c5fdf4e962b59b89 (diff) | |
| download | Qt-6df2f295c7efddac12de87f8bfa347ab28761a6b.zip Qt-6df2f295c7efddac12de87f8bfa347ab28761a6b.tar.gz Qt-6df2f295c7efddac12de87f8bfa347ab28761a6b.tar.bz2 | |
Merge commit 's60/4.6' into mmfphonon
Diffstat (limited to 'tools/makeqpf/qpf2.cpp')
| -rw-r--r-- | tools/makeqpf/qpf2.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/makeqpf/qpf2.cpp b/tools/makeqpf/qpf2.cpp index 23006f0..a0af1a0 100644 --- a/tools/makeqpf/qpf2.cpp +++ b/tools/makeqpf/qpf2.cpp @@ -519,7 +519,7 @@ void QPF::addGlyphs(QFontEngine *fe, const QList<CharacterRange> &ranges) glyph_metrics_t metrics = fe->boundingBox(glyphIndex); const quint32 oldSize = glyphs.size(); - glyphs.resize(glyphs.size() + sizeof(QFontEngineQPF::Glyph) + img.numBytes()); + glyphs.resize(glyphs.size() + sizeof(QFontEngineQPF::Glyph) + img.byteCount()); uchar *data = reinterpret_cast<uchar *>(glyphs.data() + oldSize); uchar *gmapPtr = reinterpret_cast<uchar *>(gmap.data() + glyphIndex * sizeof(quint32)); @@ -543,7 +543,7 @@ void QPF::addGlyphs(QFontEngine *fe, const QList<CharacterRange> &ranges) ; } - qMemCopy(data, img.bits(), img.numBytes()); + qMemCopy(data, img.bits(), img.byteCount()); } } } |