From b54ccdac1f36b71c0769b8e182e47b4e5493c14f Mon Sep 17 00:00:00 2001 From: "Robert C. Helling" Date: Tue, 3 Mar 2015 11:12:07 +0100 Subject: [PATCH] Use QUrl::fromUserInput for image files ... as suggested by Thiago. Signed-off-by: Robert C. Helling --- qt-ui/divepicturewidget.cpp | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/qt-ui/divepicturewidget.cpp b/qt-ui/divepicturewidget.cpp index 9c5ac4f..178f389 100644 --- a/qt-ui/divepicturewidget.cpp +++ b/qt-ui/divepicturewidget.cpp @@ -18,8 +18,11 @@ void loadPicuture(struct picture *picture) download.load(); } -SHashedImage::SHashedImage(struct picture *picture) : QImage(picture->filename) +SHashedImage::SHashedImage(struct picture *picture) : QImage() { + QUrl url = QUrl::fromUserInput(QString(picture->filename)); + if(url.isLocalFile()) + load(url.toLocalFile()); if (isNull()) { // Hash lookup. load(fileFromHash(picture->hash)); @@ -29,7 +32,7 @@ SHashedImage::SHashedImage(struct picture *picture) : QImage(picture->filename) QtConcurrent::run(loadPicuture, picture); } } else { - QByteArray hash = hashFile(QString(picture->filename)); + QByteArray hash = hashFile(url.toLocalFile()); free(picture->hash); picture->hash = strdup(hash.toHex().data()); } @@ -41,7 +44,7 @@ ImageDownloader::ImageDownloader(struct picture *pic) } void ImageDownloader::load(){ - QUrl url(picture->filename); + QUrl url = QUrl::fromUserInput(QString(picture->filename)); if (url.isValid()) { QEventLoop loop; QNetworkRequest request(url); -- 1.9.3 (Apple Git-50)