QImage::byteCount -> QImage::sizeInByes

This commit is contained in:
Albert Astals Cid 2019-07-04 22:26:53 +02:00
parent bff22e2a76
commit 75ef81a109
3 changed files with 6 additions and 6 deletions

View File

@ -210,11 +210,11 @@ private Q_SLOTS:
QFile picDumpFile(fileNameBase + QStringLiteral("-expected.data")); QFile picDumpFile(fileNameBase + QStringLiteral("-expected.data"));
QVERIFY2(picDumpFile.open(QIODevice::WriteOnly), qPrintable(picDumpFile.errorString())); QVERIFY2(picDumpFile.open(QIODevice::WriteOnly), qPrintable(picDumpFile.errorString()));
picDumpFile.write(reinterpret_cast<const char *>(inputImage.bits()), picDumpFile.write(reinterpret_cast<const char *>(inputImage.bits()),
inputImage.byteCount()); inputImage.sizeInBytes());
QFile pngDumpFile(fileNameBase + QStringLiteral("-actual.data")); QFile pngDumpFile(fileNameBase + QStringLiteral("-actual.data"));
QVERIFY2(pngDumpFile.open(QIODevice::WriteOnly), qPrintable(pngDumpFile.errorString())); QVERIFY2(pngDumpFile.open(QIODevice::WriteOnly), qPrintable(pngDumpFile.errorString()));
pngDumpFile.write(reinterpret_cast<const char *>(expImage.bits()), pngDumpFile.write(reinterpret_cast<const char *>(expImage.bits()),
expImage.byteCount()); expImage.sizeInBytes());
QString msg = QStringLiteral("Read image (") QString msg = QStringLiteral("Read image (")
+ picDumpFile.fileName() + picDumpFile.fileName()
+ QStringLiteral(") differed from expected image (") + QStringLiteral(") differed from expected image (")

View File

@ -35,8 +35,8 @@ static void writeImageData(const char *name, const QString &filename, const QIma
{ {
QFile file(filename); QFile file(filename);
if (file.open(QIODevice::WriteOnly)) { if (file.open(QIODevice::WriteOnly)) {
qint64 written = file.write(reinterpret_cast<const char *>(image.bits()), image.byteCount()); qint64 written = file.write(reinterpret_cast<const char *>(image.bits()), image.sizeInBytes());
if (written == image.byteCount()) { if (written == image.sizeInBytes()) {
QTextStream(stdout) << " " << name QTextStream(stdout) << " " << name
<< " written to " << filename << "\n"; << " written to " << filename << "\n";
} else { } else {

View File

@ -116,8 +116,8 @@ int main(int argc, char **argv)
} }
img = img.convertToFormat(qformat); img = img.convertToFormat(qformat);
} }
qint64 written = output.write(reinterpret_cast<const char *>(img.bits()), img.byteCount()); qint64 written = output.write(reinterpret_cast<const char *>(img.bits()), img.sizeInBytes());
if (written != img.byteCount()) { if (written != img.sizeInBytes()) {
QTextStream(stderr) << "Could not write image data to " << files.at(1) QTextStream(stderr) << "Could not write image data to " << files.at(1)
<< ":" << output.errorString() << "\n"; << ":" << output.errorString() << "\n";
return 5; return 5;