diff options
| author | Giuseppe D'Angelo <giuseppe.dangelo@kdab.com> | 2018-06-19 22:40:56 +0200 |
|---|---|---|
| committer | Giuseppe D'Angelo <giuseppe.dangelo@kdab.com> | 2018-10-14 22:00:26 +0000 |
| commit | 72fc65784d6e37804027ead10eb27b317a6f5ca1 (patch) | |
| tree | 6e3f3a6b5240da33584d3b80d93f2676ba645af4 /src | |
| parent | 8ec98fc2dc40237730f99af099dffe2920ef5bcc (diff) | |
QImageReader: add tracepoints for image loading
Change-Id: I5fe25793eeda01a4fa1658091890af23f66b7089
Reviewed-by: Rafael Roquetto <rafael@roquetto.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/gui/image/qimagereader.cpp | 14 | ||||
| -rw-r--r-- | src/gui/qtgui.tracepoints | 3 |
2 files changed, 16 insertions, 1 deletions
diff --git a/src/gui/image/qimagereader.cpp b/src/gui/image/qimagereader.cpp index 6d358984d6..0fb1d808e5 100644 --- a/src/gui/image/qimagereader.cpp +++ b/src/gui/image/qimagereader.cpp @@ -165,6 +165,7 @@ #endif #include <private/qimagereaderwriterhelpers_p.h> +#include <qtgui_tracepoints_p.h> #include <algorithm> @@ -1250,7 +1251,18 @@ bool QImageReader::read(QImage *image) d->handler->setOption(QImageIOHandler::Quality, d->quality); // read the image - if (!d->handler->read(image)) { + if (Q_TRACE_ENABLED(QImageReader_read_before_reading)) { + QString fileName = QStringLiteral("unknown"); + if (QFile *file = qobject_cast<QFile *>(d->device)) + fileName = file->fileName(); + Q_TRACE(QImageReader_read_before_reading, this, fileName); + } + + const bool result = d->handler->read(image); + + Q_TRACE(QImageReader_read_after_reading, this, result); + + if (!result) { d->imageReaderError = InvalidDataError; d->errorString = QImageReader::tr("Unable to read image data"); return false; diff --git a/src/gui/qtgui.tracepoints b/src/gui/qtgui.tracepoints index 2c232a0af8..aed6c35c03 100644 --- a/src/gui/qtgui.tracepoints +++ b/src/gui/qtgui.tracepoints @@ -8,3 +8,6 @@ QFontDatabase_addApplicationFont(const QString &filename) QFontDatabase_load(const QString &family, int pointSize) QFontDatabase_loadEngine(const QString &family, int pointSize) QFontDatabasePrivate_addAppFont(const QString &fileName) + +QImageReader_read_before_reading(QImageReader *reader, const QString &filename) +QImageReader_read_after_reading(QImageReader *reader, bool result) |