mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Use QUrl::fromUserInput for image files

Browse source 
... as suggested by Thiago.

Signed-off-by: Robert C. Helling <helling@atdotde.de>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Robert C. Helling 2015-03-03 11:12:07 +01:00 • committed by Dirk Hohndel
parent 6b3b50cc2f
commit e0490f3055
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
qt-ui/divepicturewidget.cpp
View file

@ -20,8 +20,11 @@ void loadPicuture(struct picture *picture)
download.load(); 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()) { if (isNull()) {
// Hash lookup. // Hash lookup.
load(fileFromHash(picture->hash)); load(fileFromHash(picture->hash));
@ -31,7 +34,7 @@ SHashedImage::SHashedImage(struct picture *picture) : QImage(picture->filename)
QtConcurrent::run(loadPicuture, picture); QtConcurrent::run(loadPicuture, picture);
} }
} else { } else {
QByteArray hash = hashFile(QString(picture->filename)); QByteArray hash = hashFile(url.toLocalFile());
free(picture->hash); free(picture->hash);
picture->hash = strdup(hash.toHex().data()); picture->hash = strdup(hash.toHex().data());
} }
@ -43,7 +46,7 @@ ImageDownloader::ImageDownloader(struct picture *pic)
} }
void ImageDownloader::load(){ void ImageDownloader::load(){
QUrl url(picture->filename); QUrl url = QUrl::fromUserInput(QString(picture->filename));
if (url.isValid()) { if (url.isValid()) {
QEventLoop loop; QEventLoop loop;
QNetworkRequest request(url); QNetworkRequest request(url);