diff -r 56cd8111b7f7 -r 41300fa6a67c tools/makeqpf/qpf2.cpp --- a/tools/makeqpf/qpf2.cpp Tue Jan 26 12:42:25 2010 +0200 +++ b/tools/makeqpf/qpf2.cpp Tue Feb 02 00:43:10 2010 +0200 @@ -519,7 +519,7 @@ 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(glyphs.data() + oldSize); uchar *gmapPtr = reinterpret_cast(gmap.data() + glyphIndex * sizeof(quint32)); @@ -543,7 +543,7 @@ ; } - qMemCopy(data, img.bits(), img.numBytes()); + qMemCopy(data, img.bits(), img.byteCount()); } } }